Added wxPopupWindow to GTK port, wxComboBox had to

[wxWidgets.git] / configure

diff --git a/configure b/configure
index bff31c003dc6bb9bd305446192996ed11adeef35..c61f8d86533c142066b91d0a403a9f4337bd32cc 100755 (executable)
--- a/configure
+++ b/configure
@@ -33,6 +33,11 @@
 
 
 
 
 
 

+
+
+
+# Configure paths for GTK+
+# Owen Taylor     97-11-3

 
 
 
 
 
 


@@ -51,11 +56,15 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$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-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
 ac_help="$ac_help
   --with-wine             use WINE"
 ac_help="$ac_help


@@ -65,223 +74,295 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-pm               use OS/2 Presentation Manager"
 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 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-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-burnt_name     create set name in shared library "
+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 exceptions information"
+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 wxWin 2.0 compatibility"
+ac_help="$ac_help
+  --enable-compat22       enable wxWin 2.2 compatibility"
+ac_help="$ac_help
+  --enable-intl           use internationalization system"
+ac_help="$ac_help
+  --enable-config         use wxConfig (and derived) classes"

 ac_help="$ac_help
 ac_help="$ac_help

-  --with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed"
+  --enable-sockets        use socket/network classes"

 ac_help="$ac_help
 ac_help="$ac_help

---with-libpng           use libpng (PNG image format)"
+  --enable-ipc            use interprocess communication (wxSocket etc.)"

 ac_help="$ac_help
 ac_help="$ac_help

---with-libjpeg          use libjpeg (JPEG file format)"
+  --enable-cmdline        use wxCmdLineParser class"

 ac_help="$ac_help
 ac_help="$ac_help

---with-libtiff          use libtiff (TIFF file format)"
+  --enable-datetime       use wxDateTime class"

 ac_help="$ac_help
 ac_help="$ac_help

---with-opengl           use OpenGL (or Mesa)"
+  --enable-timedate       use obsolete wxDate/wxTime classes"

 ac_help="$ac_help
 ac_help="$ac_help

---with-dmalloc          use dmalloc library (www.letters.com/dmalloc)"
+  --enable-stopwatch      use wxStopWatch class"

 ac_help="$ac_help
 ac_help="$ac_help

---with-zlib             use zlib for LZW compression"
+  --enable-dialupman      use dialup network classes"

 ac_help="$ac_help
 ac_help="$ac_help

---with-odbc             use the IODBC and wxODBC classes"
+  --enable-apple_ieee     use the Apple IEEE codec"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-shared         create shared library code"
+  --enable-timer          use wxTimer class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-burnt_name     create set name in shared library "
+  --enable-wave           use wxWave class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-optimise       create optimised code"
+  --enable-fraction       use wxFraction class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-debug          same as debug_flag and debug_info"
+  --enable-dynlib         use wxLibrary class for DLL loading"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)"
+  --enable-longlong       use wxLongLong class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-debug_info     create code with debugging information"
+  --enable-geometry       use geometry class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-debug_gdb      create code with extra GDB debugging information"
+  --enable-log            use logging system"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-debug_cntxt    use wxDebugContext"
+  --enable-streams        use wxStream etc classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-mem_tracing    create code with memory tracing"
+  --enable-file           use wxFile classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-profile        create code with profiling information"
+  --enable-ffile          use wxFFile classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-no_rtti        create code without RTTI information"
+  --enable-textfile       use wxTextFile classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-no_exceptions  create code without exceptions information"
+  --enable-fontmap        use font encodings conversion classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-permissive     compile code disregarding strict ANSI"
+  --enable-unicode        compile wxString with Unicode support"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-no_deps        create code without dependency information"
+  --enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-intl           use internationalization system"
+  --enable-wxprintfv      use wxWindows implementation of vprintf()"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-config         use wxConfig (and derived) classes"
+  --enable-std_iostreams  use standard C++ stream classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-sockets        use socket/network classes"
+  --enable-filesystem     use virtual file systems classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-ipc            use interprocess communication (wxSocket etc.)"
+  --enable-fs_inet        use virtual HTTP/FTP filesystems"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-dialupman      use dialup network classes"
+  --enable-fs_zip         use virtual ZIP filesystems"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-apple_ieee     use the Apple IEEE codec"
+  --enable-zipstream      use wxZipInputStream"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-timedate       use date/time classes"
+  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-wave           use wxWave class"
+  --enable-snglinst       use wxSingleInstanceChecker class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-fraction       use wxFraction class"
+  --enable-mimetypes      use wxMimeTypesManager"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-dynlib         use wxLibrary class for DLL loading"
+  --enable-threads        use threads"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-longlong       use wxLongLong class"
+  --enable-serial         use class serialization"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-log            use logging system"
+  --enable-docview        use document view architecture"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-streams        use wxStream etc classes"
+  --enable-help           use help subsystem"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-file           use wxFile classes"
+  --enable-html           use wxHTML sub-library"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-textfile       use wxTextFile classes"
+  --enable-htmlhelp       use wxHTML-based help"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-unicode        compile wxString with Unicode support"
+  --enable-constraints    use layout-constraints system"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
+  --enable-printarch      use printing architecture"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-wxprintfv      use wxWindows implementation of vprintf()"
+  --enable-mdi            use multiple document interface architecture"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-joystick       compile in joystick support (Linux only)"
+  --enable-loggui         use standard GUI logger"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-std_iostreams  use standard C++ stream classes"
+  --enable-logwin         use wxLogWindow"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-filesystem     use virtual file systems classes"
+  --enable-postscript     use wxPostscriptDC device context (default for gtk+)"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-fs_inet        use virtual HTTP/FTP filesystems"
+  --enable-prologio       use Prolog IO library"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-fs_zip         use virtual ZIP filesystems"
+  --enable-resources      use wxWindows resources"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-zipstream      use wxZipInputStream"
+  --enable-xresources     use X resources for save (default for gtk+)"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException"
+  --enable-clipboard      use wxClipboard classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-threads        use threads"
+  --enable-dnd            use Drag'n'Drop classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-serial         use class serialization"
+  --enable-metafile       use win32 metafiles"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-docview        use document view architecture"
+  --enable-wxtree         make wxTree library"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-help           use help (using external browser at present)"
+  --enable-controls       use all usual controls"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-constraints    use layout-constraints system"
+  --enable-accel          use accelerators"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-printarch      use printing architecture"
+  --enable-button         use wxButton class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-mdi            use multiple document interface architecture"
+  --enable-bmpbutton      use wxBitmapButton class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-postscript     use wxPostscriptDC device context (default for gtk+)"
+  --enable-calendar       use wxCalendarCtrl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-prologio       use Prolog IO library"
+  --enable-caret          use wxCaret class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-resources      use wxWindows resources"
+  --enable-checkbox       use wxCheckBox class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-xresources     use X resources for save (default for gtk+)"
+  --enable-checklst       use wxCheckListBox (listbox with checkboxes) class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-clipboard      use wxClipboard classes"
+  --enable-choice         use wxChoice class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-dnd            use Drag'n'Drop classes"
+  --enable-combobox       use wxComboBox classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-wxtree         make wxTree library"
+  --enable-gauge          use wxGauge class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-controls       use all usual controls"
+  --enable-grid           use wxGrid class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-accel          use accelerators"
+  --enable-newgrid        use new wxGrid class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-caret          use wxCaret class"
+  --enable-imaglist       use wxImageList class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-bmpbutton      use wxBitmapButton class"
+  --enable-listbox        use wxListBox class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-checkbox       use wxCheckBox class"
+  --enable-listctrl       use wxListCtrl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-checklst       use wxCheckListBox (listbox with checkboxes) class"
+  --enable-notebook       use wxNotebook class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-choice         use wxChoice class"
+  --enable-radiobox       use wxRadioBox class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-combobox       use wxComboBox classes"
+  --enable-radiobtn       use wxRadioButton class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-gauge          use wxGauge class"
+  --enable-sash           use wxSashWindow class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-grid           use wxGrid class"
+  --enable-scrollbar      use wxScrollBar class and scrollable windows"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-newgrid        use new wxGrid class"
+  --enable-slider         use wxSlider class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-imaglist       use wxImageList class"
+  --enable-spinbtn        use wxSpinButton class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-listbox        use wxListBox class"
+  --enable-spinctrl       use wxSpinCtrl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-listctrl       use wxListCtrl class"
+  --enable-splitter       use wxSplitterWindow class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-notebook       use wxNotebook class"
+  --enable-statbmp        use wxStaticBitmap class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-radiobox       use wxRadioBox class"
+  --enable-statbox        use wxStaticBox class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-radiobtn       use wxRadioButton class"
+  --enable-statline       use wxStaticLine class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-sash           use wxSashWindow class"
+  --enable-stattext       use wxStaticText class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-scrollbar      use wxScrollBar class and scrollable windows"
+  --enable-statusbar      use wxStatusBar class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-slider         use wxSlider class"
+  --enable-tabdialog      use wxTabControl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-spinbtn        use wxSpinButton class"
+  --enable-textctrl       use wxTextCtrl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-spinctrl       use wxSpinCtrl class"
+  --enable-togglebtn      use wxToggleButton class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-splitter       use wxSplitterWindow class"
+  --enable-toolbar        use wxToolBar class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-statbmp        use wxStaticBitmap class"
+  --enable-tbarnative     use native wxToolBar class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-statbox        use wxStaticBox class"
+  --enable-tbarsmpl       use wxToolBarSimple class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-statline       use wxStaticLine class"
+  --enable-treectrl       use wxTreeCtrl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-statusbar      use wxStatusBar class"
+  --enable-popupwin       use wxPopUpWindow class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-tabdialog      use wxTabControl class"
+  --enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-toolbar        use wxToolBar class"
+  --enable-choicedlg      use wxChoiceDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-tbarnative     use native wxToolBar class"
+  --enable-coldlg         use wxColourDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-tbarsmpl       use wxToolBarSimple class"
+  --enable-filedlg        use wxFileDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-treectrl       use wxTreeCtrl class"
+  --enable-fontdlg        use wxFontDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
+  --enable-dirdlg         use wxDirDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-dirdlg         use wxDirDialog"
+  --enable-msgdlg         use wxMessageDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-textdlg        use wxTextDialog"
+  --enable-numberdlg      use wxNumberEntryDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-tipdlg         use startup tips"
+  --enable-textdlg        use wxTextDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-progressdlg    use wxProgressDialog"
+  --enable-tipdlg         use startup tips"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-miniframe      use wxMiniFrame class"
+  --enable-progressdlg    use wxProgressDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-html           use wxHTML sub-library"
+  --enable-wizarddlg      use wxWizard"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-tooltips       use wxToolTip class"
+  --enable-menus          use wxMenu/wxMenuBar/wxMenuItem classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-splines        use spline drawing code"
+  --enable-miniframe      use wxMiniFrame class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-validators     use wxValidator and derived classes"
+  --enable-tooltips       use wxToolTip class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-busyinfo       use wxBusyInfo"
+  --enable-splines        use spline drawing code"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-plot           use wxPlot"
+  --enable-validators     use wxValidator and derived classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-gif            use gif images (GIF file format)"
+  --enable-busyinfo       use wxBusyInfo"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-pcx            use pcx images (PCX file format)"
+  --enable-joystick       compile in joystick support (Linux only)"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-pnm            use pnm images (PNM file format)"
+  --enable-metafiles      use wxMetaFile (Windows only)"
+ac_help="$ac_help
+  --enable-dragimage      use wxDragImage"
+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"
 
 ac_help="$ac_help
   --with-x                use the X Window System"
 


@@ -842,7 +923,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
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6

-echo "configure:846: checking host system type" >&5
+echo "configure:927: checking host system type" >&5

 
 host_alias=$host
 case "$host_alias" in
 
 host_alias=$host
 case "$host_alias" in


@@ -863,7 +944,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 "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6

-echo "configure:867: checking target system type" >&5
+echo "configure:948: checking target system type" >&5

 
 target_alias=$target
 case "$target_alias" in
 
 target_alias=$target
 case "$target_alias" in


@@ -881,7 +962,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 "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6

-echo "configure:885: checking build system type" >&5
+echo "configure:966: checking build system type" >&5

 
 build_alias=$build
 case "$build_alias" in
 
 build_alias=$build
 case "$build_alias" in


@@ -906,23 +987,22 @@ test "$host_alias" != "$target_alias" &&
 
 
 WX_MAJOR_VERSION_NUMBER=2
 
 
 WX_MAJOR_VERSION_NUMBER=2

-WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=14
-
-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_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER

-

 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_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_UNIX=1
 USE_WIN32=0
 USE_BEOS=0

+USE_MAC=0

 
 USE_LINUX=
 USE_SGI=
 
 USE_LINUX=
 USE_SGI=


@@ -937,6 +1017,8 @@ USE_ALPHA=
 USE_OSF=
 USE_BSD=
 USE_FREEBSD=
 USE_OSF=
 USE_BSD=
 USE_FREEBSD=

+USE_OPENBSD=
+USE_NETBSD=

 USE_VMS=
 USE_ULTRIX=
 USE_CYGWIN=
 USE_VMS=
 USE_ULTRIX=
 USE_CYGWIN=


@@ -945,19 +1027,23 @@ USE_DATA_GENERAL=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
 
 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_GTK=0

+DEFAULT_wxUSE_MAC=0
+DEFAULT_wxUSE_MGL=0

 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0

-DEFAULT_wxUSE_WINE=0

 DEFAULT_wxUSE_PM=0
 DEFAULT_wxUSE_PM=0

+DEFAULT_wxUSE_WINE=0

 
 DEFAULT_DEFAULT_wxUSE_GTK=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_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0

-DEFAULT_DEFAULT_wxUSE_WINE=0

 DEFAULT_DEFAULT_wxUSE_PM=0
 DEFAULT_DEFAULT_wxUSE_PM=0

+DEFAULT_DEFAULT_wxUSE_WINE=0

 
 PROGRAM_EXT=
 
 
 PROGRAM_EXT=
 


@@ -1037,7 +1123,7 @@ EOF
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;

-  *-*-freebsd* | *-*-netbsd*)
+  *-*-freebsd*)

     USE_BSD=1
     USE_FREEBSD=1
     cat >> confdefs.h <<\EOF
     USE_BSD=1
     USE_FREEBSD=1
     cat >> confdefs.h <<\EOF


@@ -1046,6 +1132,32 @@ EOF
 
     cat >> confdefs.h <<\EOF
 #define __BSD__ 1
 
     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
 EOF
 
     DEFAULT_DEFAULT_wxUSE_GTK=1


@@ -1062,6 +1174,7 @@ EOF
 EOF
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1

+    NEEDS_D_REENTRANT_FOR_R_FUNCS=1

   ;;
   *-*-dgux5* )
     USE_ALPHA=1
   ;;
   *-*-dgux5* )
     USE_ALPHA=1


@@ -1108,7 +1221,7 @@ EOF
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 

-  *-*-cygwin32* | *-*-mingw32* )
+  *-*-cygwin* | *-*-mingw32* )

     USE_UNIX=0
     USE_WIN32=1
     cat >> confdefs.h <<\EOF
     USE_UNIX=0
     USE_WIN32=1
     cat >> confdefs.h <<\EOF


@@ -1148,6 +1261,24 @@ EOF
     DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 
     DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 

+  *-*-darwin* )
+    USE_BSD=1
+    USE_MAC=1
+    cat >> confdefs.h <<\EOF
+#define __MAC__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __BSD__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __UNIX__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_MAC=1
+  ;;
+

   *-*-beos* )
         USE_BEOS=1
     cat >> confdefs.h <<\EOF
   *-*-beos* )
         USE_BEOS=1
     cat >> confdefs.h <<\EOF


@@ -1178,7 +1309,7 @@ fi
 
 if test "$USE_LINUX" = 1; then
   echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
 
 if test "$USE_LINUX" = 1; then
   echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6

-echo "configure:1182: checking for gettext in -lc" >&5
+echo "configure:1313: 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 "(cached) $ac_c" 1>&6
 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 "(cached) $ac_c" 1>&6


@@ -1186,7 +1317,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1190 "configure"
+#line 1321 "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
 #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


@@ -1197,7 +1328,7 @@ int main() {
 gettext()
 ; return 0; }
 EOF
 gettext()
 ; return 0; }
 EOF

-if { (eval echo configure:1201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1332: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -1234,11 +1365,13 @@ fi
 
 DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then
 
 DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then

+  DEFAULT_wxUSE_UNIVERSAL=no
+

   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_BURNT_NAME=no
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_BURNT_NAME=no

-  DEFAULT_wxUSE_OPTIMISE=yes
+  DEFAULT_wxUSE_OPTIMISE=no

   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_NO_RTTI=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_NO_RTTI=no


@@ -1253,24 +1386,35 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes

+  DEFAULT_wxUSE_LOGWINDOW=no
+  DEFAULT_wxUSE_LOGGUI=no

 
   DEFAULT_wxUSE_GUI=yes
 
   DEFAULT_wxUSE_GUI=yes

+  DEFAULT_wxUSE_CONTROLS=no

 
   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
   DEFAULT_wxUSE_LIBJPEG=no
   DEFAULT_wxUSE_LIBTIFF=no
   DEFAULT_wxUSE_ODBC=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_OPENGL=no
 
   DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no

+  DEFAULT_wxUSE_SNGLINST_CHECKER=no

   DEFAULT_wxUSE_STD_IOSTREAM=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_FILE=no

+  DEFAULT_wxUSE_FFILE=no

   DEFAULT_wxUSE_TEXTFILE=no
   DEFAULT_wxUSE_TEXTFILE=no

-  DEFAULT_wxUSE_TIMEDATE=no

   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=no
   DEFAULT_wxUSE_CONFIG=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
   DEFAULT_wxUSE_STREAMS=no
   DEFAULT_wxUSE_SOCKETS=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no


@@ -1278,6 +1422,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_JOYSTICK=no
   DEFAULT_wxUSE_DYNLIB_CLASS=no
   DEFAULT_wxUSE_LONGLONG=no
   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
 
   DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no


@@ -1287,6 +1432,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CLIPBOARD=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAG_AND_DROP=no
   DEFAULT_wxUSE_CLIPBOARD=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAG_AND_DROP=no

+  DEFAULT_wxUSE_DRAGIMAGE=no

   DEFAULT_wxUSE_SPLINES=no
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=no
   DEFAULT_wxUSE_SPLINES=no
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=no


@@ -1298,14 +1444,25 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CONSTRAINTS=no
   DEFAULT_wxUSE_IPC=no
   DEFAULT_wxUSE_HELP=no
   DEFAULT_wxUSE_CONSTRAINTS=no
   DEFAULT_wxUSE_IPC=no
   DEFAULT_wxUSE_HELP=no

+  DEFAULT_wxUSE_WXHTML_HELP=no

   DEFAULT_wxUSE_WXTREE=no
   DEFAULT_wxUSE_METAFILE=no
   DEFAULT_wxUSE_WXTREE=no
   DEFAULT_wxUSE_METAFILE=no

+  DEFAULT_wxUSE_MIMETYPE=no

 
   DEFAULT_wxUSE_COMMONDLGS=no
 
   DEFAULT_wxUSE_COMMONDLGS=no

+  DEFAULT_wxUSE_CHOICEDLG=no
+  DEFAULT_wxUSE_COLOURDLG=no

   DEFAULT_wxUSE_DIRDLG=no
   DEFAULT_wxUSE_DIRDLG=no

+  DEFAULT_wxUSE_FILEDLG=no
+  DEFAULT_wxUSE_FONTDLG=no
+  DEFAULT_wxUSE_MSGDLG=no
+  DEFAULT_wxUSE_NUMBERDLG=no

   DEFAULT_wxUSE_TEXTDLG=no
   DEFAULT_wxUSE_STARTUP_TIPS=no
   DEFAULT_wxUSE_PROGRESSDLG=no
   DEFAULT_wxUSE_TEXTDLG=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_MINIFRAME=no
   DEFAULT_wxUSE_HTML=no
   DEFAULT_wxUSE_FILESYSTEM=no


@@ -1313,14 +1470,16 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ZIPSTREAM=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_ACCEL=no

-  DEFAULT_wxUSE_CARET=no
+  DEFAULT_wxUSE_BUTTON=no

   DEFAULT_wxUSE_BMPBUTTON=no
   DEFAULT_wxUSE_BMPBUTTON=no

+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_CARET=no

   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLST=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
   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no


@@ -1329,7 +1488,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no

-  DEFAULT_wxUSE_PLOT=no

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


@@ -1341,20 +1499,28 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_STATBMP=no
   DEFAULT_wxUSE_STATBOX=no
   DEFAULT_wxUSE_STATLINE=no
   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_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_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_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 

+  DEFAULT_wxUSE_IMAGE=no

   DEFAULT_wxUSE_GIF=no
   DEFAULT_wxUSE_PCX=no
   DEFAULT_wxUSE_PNM=no
   DEFAULT_wxUSE_GIF=no
   DEFAULT_wxUSE_PCX=no
   DEFAULT_wxUSE_PNM=no

+  DEFAULT_wxUSE_XPM=no

 else
 else

+  DEFAULT_wxUSE_UNIVERSAL=no
+

   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes


@@ -1374,6 +1540,8 @@ else
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes

+  DEFAULT_wxUSE_LOGWINDOW=yes
+  DEFAULT_wxUSE_LOGGUI=yes

 
   DEFAULT_wxUSE_GUI=yes
 
 
   DEFAULT_wxUSE_GUI=yes
 


@@ -1382,16 +1550,24 @@ else
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_LIBTIFF=yes
   DEFAULT_wxUSE_ODBC=no
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_LIBTIFF=yes
   DEFAULT_wxUSE_ODBC=no

+  DEFAULT_wxUSE_FREETYPE=no

   DEFAULT_wxUSE_OPENGL=no
 
   DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
   DEFAULT_wxUSE_OPENGL=no
 
   DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes

+  DEFAULT_wxUSE_SNGLINST_CHECKER=yes

   DEFAULT_wxUSE_STD_IOSTREAM=no
   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_FILE=yes

+  DEFAULT_wxUSE_FFILE=yes

   DEFAULT_wxUSE_TEXTFILE=yes
   DEFAULT_wxUSE_TEXTFILE=yes

-  DEFAULT_wxUSE_TIMEDATE=yes

   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=yes
   DEFAULT_wxUSE_CONFIG=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
   DEFAULT_wxUSE_STREAMS=yes
   DEFAULT_wxUSE_SOCKETS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes


@@ -1399,6 +1575,7 @@ else
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_DYNLIB_CLASS=yes
   DEFAULT_wxUSE_LONGLONG=yes
   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
 
   DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes


@@ -1408,6 +1585,7 @@ else
   DEFAULT_wxUSE_CLIPBOARD=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_DRAG_AND_DROP=yes
   DEFAULT_wxUSE_CLIPBOARD=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_DRAG_AND_DROP=yes

+  DEFAULT_wxUSE_DRAGIMAGE=yes

   DEFAULT_wxUSE_SPLINES=yes
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
   DEFAULT_wxUSE_SPLINES=yes
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=yes


@@ -1419,14 +1597,25 @@ else
   DEFAULT_wxUSE_CONSTRAINTS=yes
   DEFAULT_wxUSE_IPC=yes
   DEFAULT_wxUSE_HELP=yes
   DEFAULT_wxUSE_CONSTRAINTS=yes
   DEFAULT_wxUSE_IPC=yes
   DEFAULT_wxUSE_HELP=yes

+  DEFAULT_wxUSE_WXHTML_HELP=yes

   DEFAULT_wxUSE_WXTREE=yes
   DEFAULT_wxUSE_METAFILE=yes
   DEFAULT_wxUSE_WXTREE=yes
   DEFAULT_wxUSE_METAFILE=yes

+  DEFAULT_wxUSE_MIMETYPE=yes

 
   DEFAULT_wxUSE_COMMONDLGS=yes
 
   DEFAULT_wxUSE_COMMONDLGS=yes

+  DEFAULT_wxUSE_CHOICEDLG=yes
+  DEFAULT_wxUSE_COLOURDLG=yes

   DEFAULT_wxUSE_DIRDLG=yes
   DEFAULT_wxUSE_DIRDLG=yes

+  DEFAULT_wxUSE_FILEDLG=yes
+  DEFAULT_wxUSE_FONTDLG=yes
+  DEFAULT_wxUSE_MSGDLG=yes
+  DEFAULT_wxUSE_NUMBERDLG=yes

   DEFAULT_wxUSE_TEXTDLG=yes
   DEFAULT_wxUSE_STARTUP_TIPS=yes
   DEFAULT_wxUSE_PROGRESSDLG=yes
   DEFAULT_wxUSE_TEXTDLG=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_MINIFRAME=yes
   DEFAULT_wxUSE_HTML=yes
   DEFAULT_wxUSE_FILESYSTEM=yes


@@ -1437,8 +1626,10 @@ else
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes

-  DEFAULT_wxUSE_CARET=yes
+  DEFAULT_wxUSE_BUTTON=yes

   DEFAULT_wxUSE_BMPBUTTON=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_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLST=yes
   DEFAULT_wxUSE_CHOICE=yes


@@ -1450,7 +1641,6 @@ else
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes

-  DEFAULT_wxUSE_PLOT=yes

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


@@ -1462,19 +1652,25 @@ else
   DEFAULT_wxUSE_STATBMP=yes
   DEFAULT_wxUSE_STATBOX=yes
   DEFAULT_wxUSE_STATLINE=yes
   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_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_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_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 

+  DEFAULT_wxUSE_IMAGE=yes

   DEFAULT_wxUSE_GIF=yes
   DEFAULT_wxUSE_PCX=yes
   DEFAULT_wxUSE_PNM=yes
   DEFAULT_wxUSE_GIF=yes
   DEFAULT_wxUSE_PCX=yes
   DEFAULT_wxUSE_PNM=yes

+  DEFAULT_wxUSE_XPM=yes

 fi
 
 
 fi
 
 


@@ -1490,8 +1686,8 @@ done
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6
-echo "configure:1495: checking "for --enable-gui"" >&5
+          echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
+echo "configure:1691: checking for --enable-gui" >&5

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


@@ -1531,6 +1727,45 @@ fi
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then
 

+
+          echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
+echo "configure:1733: 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"
 # Check whether --with-gtk or --without-gtk was given.
 if test "${with_gtk+set}" = set; then
   withval="$with_gtk"


@@ -1543,6 +1778,12 @@ if test "${with_motif+set}" = set; then
   wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1
 fi
 
   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"
 # Check whether --with-wine or --without-wine was given.
 if test "${with_wine+set}" = set; then
   withval="$with_wine"


@@ -1567,27 +1808,25 @@ if test "${with_pm+set}" = set; then
   wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
 fi
 
   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
 
 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
 else

-  gtk_config_exec_prefix=""
+  wxUSE_GTK2=0

 fi
 
 
 
 fi
 
 
 

-          echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6
-echo "configure:1591: checking "for --with-libpng"" >&5
+          echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
+echo "configure:1830: checking for --with-libpng" >&5

           no_cache=0
           # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then
           no_cache=0
           # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then


@@ -1633,8 +1872,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6
-echo "configure:1638: checking "for --with-libjpeg"" >&5
+          echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
+echo "configure:1877: checking for --with-libjpeg" >&5

           no_cache=0
           # Check whether --with-libjpeg or --without-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then
           no_cache=0
           # Check whether --with-libjpeg or --without-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then


@@ -1680,8 +1919,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6
-echo "configure:1685: checking "for --with-libtiff"" >&5
+          echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
+echo "configure:1924: checking for --with-libtiff" >&5

           no_cache=0
           # Check whether --with-libtiff or --without-libtiff was given.
 if test "${with_libtiff+set}" = set; then
           no_cache=0
           # Check whether --with-libtiff or --without-libtiff was given.
 if test "${with_libtiff+set}" = set; then


@@ -1727,8 +1966,55 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6
-echo "configure:1732: checking "for --with-opengl"" >&5
+          echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
+echo "configure:1971: 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:2018: checking for --with-opengl" >&5

           no_cache=0
           # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then
           no_cache=0
           # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then


@@ -1769,8 +2055,8 @@ fi
 fi
 
 
 fi
 
 

-          echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6
-echo "configure:1774: checking "for --with-dmalloc"" >&5
+          echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
+echo "configure:2060: checking for --with-dmalloc" >&5

           no_cache=0
           # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
           no_cache=0
           # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then


@@ -1808,8 +2094,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6
-echo "configure:1813: checking "for --with-zlib"" >&5
+          echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
+echo "configure:2099: checking for --with-zlib" >&5

           no_cache=0
           # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
           no_cache=0
           # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then


@@ -1855,8 +2141,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6
-echo "configure:1860: checking "for --with-odbc"" >&5
+          echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
+echo "configure:2146: checking for --with-odbc" >&5

           no_cache=0
           # Check whether --with-odbc or --without-odbc was given.
 if test "${with_odbc+set}" = set; then
           no_cache=0
           # Check whether --with-odbc or --without-odbc was given.
 if test "${with_odbc+set}" = set; then


@@ -1897,8 +2183,8 @@ fi
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6
-echo "configure:1902: checking "for --enable-shared"" >&5
+          echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
+echo "configure:2188: checking for --enable-shared" >&5

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


@@ -1936,8 +2222,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-burnt_name"""... $ac_c" 1>&6
-echo "configure:1941: checking "for --enable-burnt_name"" >&5
+          echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6
+echo "configure:2227: checking for --enable-burnt_name" >&5

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


@@ -1975,8 +2261,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6
-echo "configure:1980: checking "for --enable-optimise"" >&5
+          echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
+echo "configure:2266: checking for --enable-optimise" >&5

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


@@ -2014,8 +2300,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6
-echo "configure:2019: checking "for --enable-debug"" >&5
+          echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
+echo "configure:2305: checking for --enable-debug" >&5

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


@@ -2062,8 +2348,8 @@ elif test "$wxUSE_DEBUG" = "no"; then
 fi
 
 
 fi
 
 

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


@@ -2101,8 +2387,8 @@ fi
           fi
         
 
           fi
         
 

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


@@ -2140,8 +2426,8 @@ fi
           fi
         
 
           fi
         
 

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


@@ -2179,8 +2465,8 @@ fi
           fi
         
 
           fi
         
 

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


@@ -2218,8 +2504,8 @@ fi
           fi
         
 
           fi
         
 

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


@@ -2257,8 +2543,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6
-echo "configure:2262: checking "for --enable-profile"" >&5
+          echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
+echo "configure:2548: checking for --enable-profile" >&5

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


@@ -2296,8 +2582,8 @@ fi
           fi
         
 
           fi
         
 

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


@@ -2335,8 +2621,8 @@ fi
           fi
         
 
           fi
         
 

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


@@ -2374,8 +2660,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6
-echo "configure:2379: checking "for --enable-permissive"" >&5
+          echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
+echo "configure:2665: checking for --enable-permissive" >&5

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


@@ -2413,8 +2699,8 @@ fi
           fi
         
 
           fi
         
 

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


@@ -2453,9 +2739,88 @@ fi
         
 
 
         
 
 

+          echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6
+echo "configure:2744: 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:2783: 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:2459: checking "for --enable-intl"" >&5
+          echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
+echo "configure:2824: checking for --enable-intl" >&5

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


@@ -2493,8 +2858,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6
-echo "configure:2498: checking "for --enable-config"" >&5
+          echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
+echo "configure:2863: checking for --enable-config" >&5

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


@@ -2533,8 +2898,8 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6
-echo "configure:2538: checking "for --enable-sockets"" >&5
+          echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
+echo "configure:2903: checking for --enable-sockets" >&5

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


@@ -2573,8 +2938,8 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6
-echo "configure:2578: checking "for --enable-ipc"" >&5
+          echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
+echo "configure:2943: checking for --enable-ipc" >&5

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


@@ -2613,86 +2978,86 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6
-echo "configure:2618: checking "for --enable-dialupman"" >&5
+          echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
+echo "configure:2983: checking for --enable-cmdline" >&5

           no_cache=0
           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-cmdline or --disable-cmdline was given.
+if test "${enable_cmdline+set}" = set; then
+  enableval="$enable_cmdline"

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

-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'

                           else
                           else

-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_DIALUP_MANAGER" ${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
 
                           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_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_dialupman"
+          eval "$ac_cv_use_cmdline"

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

-            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_DIALUP_MANAGER" = 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_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:2657: checking "for --enable-apple_ieee"" >&5
+          echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
+echo "configure:3022: checking for --enable-datetime" >&5

           no_cache=0
           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
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
+                            ac_cv_use_datetime='wxUSE_DATETIME=yes'

                           else
                           else

-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+                            ac_cv_use_datetime='wxUSE_DATETIME=no'

                           fi
                         
 else
   
                           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
 
                           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
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_apple_ieee"
+          eval "$ac_cv_use_datetime"

           if test "$no_cache" != 1; then
           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
 
           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_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:2696: checking "for --enable-timedate"" >&5
+          echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
+echo "configure:3061: checking for --enable-timedate" >&5

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


@@ -2730,49 +3095,205 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6
-echo "configure:2735: checking "for --enable-wave"" >&5
+          echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
+echo "configure:3100: checking for --enable-stopwatch" >&5

           no_cache=0
           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
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_wave='wxUSE_WAVE=yes'
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'

                           else
                           else

-                            ac_cv_use_wave='wxUSE_WAVE=no'
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'

                           fi
                         
 else
   
                           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
 
                           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
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_wave"
+          eval "$ac_cv_use_stopwatch"

           if test "$no_cache" != 1; then
           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
 
           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_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:2774: checking "for --enable-fraction"" >&5
+          echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
+echo "configure:3139: checking for --enable-dialupman" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-fraction or --disable-fraction was given.
+          # Check whether --enable-dialupman or --disable-dialupman was given.
+if test "${enable_dialupman+set}" = set; then
+  enableval="$enable_dialupman"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
+                          else
+                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+                          fi
+                        
+else
+  
+                          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_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
+                        
+fi
+
+
+          eval "$ac_cv_use_dialupman"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-apple_ieee""... $ac_c" 1>&6
+echo "configure:3178: checking for --enable-apple_ieee" >&5
+          no_cache=0
+          # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
+if test "${enable_apple_ieee+set}" = set; then
+  enableval="$enable_apple_ieee"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
+                          else
+                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+                          fi
+                        
+else
+  
+                          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_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
+                        
+fi
+
+
+          eval "$ac_cv_use_apple_ieee"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-timer""... $ac_c" 1>&6
+echo "configure:3217: checking for --enable-timer" >&5
+          no_cache=0
+          # Check whether --enable-timer or --disable-timer was given.
+if test "${enable_timer+set}" = set; then
+  enableval="$enable_timer"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_timer='wxUSE_TIMER=yes'
+                          else
+                            ac_cv_use_timer='wxUSE_TIMER=no'
+                          fi
+                        
+else
+  
+                          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_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
+                        
+fi
+
+
+          eval "$ac_cv_use_timer"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-wave""... $ac_c" 1>&6
+echo "configure:3256: checking for --enable-wave" >&5
+          no_cache=0
+          # Check whether --enable-wave or --disable-wave was given.
+if test "${enable_wave+set}" = set; then
+  enableval="$enable_wave"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_wave='wxUSE_WAVE=yes'
+                          else
+                            ac_cv_use_wave='wxUSE_WAVE=no'
+                          fi
+                        
+else
+  
+                          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_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+                        
+fi
+
+
+          eval "$ac_cv_use_wave"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-fraction""... $ac_c" 1>&6
+echo "configure:3295: checking for --enable-fraction" >&5
+          no_cache=0
+          # Check whether --enable-fraction or --disable-fraction was given.

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


@@ -2808,8 +3329,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6
-echo "configure:2813: checking "for --enable-dynlib"" >&5
+          echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
+echo "configure:3334: checking for --enable-dynlib" >&5

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


@@ -2847,8 +3368,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6
-echo "configure:2852: checking "for --enable-longlong"" >&5
+          echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
+echo "configure:3373: checking for --enable-longlong" >&5

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


@@ -2886,8 +3407,47 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6
-echo "configure:2891: checking "for --enable-log"" >&5
+          echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
+echo "configure:3412: checking for --enable-geometry" >&5
+          no_cache=0
+          # Check whether --enable-geometry or --disable-geometry was given.
+if test "${enable_geometry+set}" = set; then
+  enableval="$enable_geometry"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_geometry='wxUSE_GEOMETRY=yes'
+                          else
+                            ac_cv_use_geometry='wxUSE_GEOMETRY=no'
+                          fi
+                        
+else
+  
+                          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_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY
+                        
+fi
+
+
+          eval "$ac_cv_use_geometry"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-log""... $ac_c" 1>&6
+echo "configure:3451: checking for --enable-log" >&5

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


@@ -2925,8 +3485,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6
-echo "configure:2930: checking "for --enable-streams"" >&5
+          echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
+echo "configure:3490: checking for --enable-streams" >&5

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


@@ -2964,8 +3524,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6
-echo "configure:2969: checking "for --enable-file"" >&5
+          echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
+echo "configure:3529: checking for --enable-file" >&5

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


@@ -3003,8 +3563,47 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6
-echo "configure:3008: checking "for --enable-textfile"" >&5
+          echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
+echo "configure:3568: checking for --enable-ffile" >&5
+          no_cache=0
+          # Check whether --enable-ffile or --disable-ffile was given.
+if test "${enable_ffile+set}" = set; then
+  enableval="$enable_ffile"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_ffile='wxUSE_FFILE=yes'
+                          else
+                            ac_cv_use_ffile='wxUSE_FFILE=no'
+                          fi
+                        
+else
+  
+                          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_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE
+                        
+fi
+
+
+          eval "$ac_cv_use_ffile"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-textfile""... $ac_c" 1>&6
+echo "configure:3607: checking for --enable-textfile" >&5

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


@@ -3042,8 +3641,47 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6
-echo "configure:3047: checking "for --enable-unicode"" >&5
+          echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
+echo "configure:3646: checking for --enable-fontmap" >&5
+          no_cache=0
+          # Check whether --enable-fontmap or --disable-fontmap was given.
+if test "${enable_fontmap+set}" = set; then
+  enableval="$enable_fontmap"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
+                          else
+                            ac_cv_use_fontmap='wxUSE_FONTMAP=no'
+                          fi
+                        
+else
+  
+                          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_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
+                        
+fi
+
+
+          eval "$ac_cv_use_fontmap"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-unicode""... $ac_c" 1>&6
+echo "configure:3685: checking for --enable-unicode" >&5

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


@@ -3081,8 +3719,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6
-echo "configure:3086: checking "for --enable-wcsrtombs"" >&5
+          echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6
+echo "configure:3724: checking for --enable-wcsrtombs" >&5

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


@@ -3120,8 +3758,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6
-echo "configure:3125: checking "for --enable-wxprintfv"" >&5
+          echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
+echo "configure:3763: checking for --enable-wxprintfv" >&5

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


@@ -3159,112 +3797,73 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6
-echo "configure:3164: checking "for --enable-joystick"" >&5
+          echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
+echo "configure:3802: checking for --enable-std_iostreams" >&5

           no_cache=0
           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-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
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_joystick='wxUSE_JOYSTICK=yes'
+                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'

                           else
                           else

-                            ac_cv_use_joystick='wxUSE_JOYSTICK=no'
+                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_JOYSTICK" ${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
 
                           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_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_joystick"
+          eval "$ac_cv_use_std_iostreams"

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

-            echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_JOYSTICK" = yes; then
+          if test "$wxUSE_STD_IOSTREAM" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:3203: checking "for --enable-std_iostreams"" >&5
+          echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
+echo "configure:3841: checking for --enable-filesystem" >&5

           no_cache=0
           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-filesystem or --disable-filesystem was given.
+if test "${enable_filesystem+set}" = set; then
+  enableval="$enable_filesystem"

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

-                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
+                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'

                           else
                           else

-                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
+                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_STD_IOSTREAM" ${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
 
                           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_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_std_iostreams"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_STD_IOSTREAM" = yes; then
-            echo "$ac_t""yes" 1>&6
-          else
-            echo "$ac_t""no" 1>&6
-          fi
-        
-
-          echo $ac_n "checking "for --enable-filesystem"""... $ac_c" 1>&6
-echo "configure:3242: checking "for --enable-filesystem"" >&5
-          no_cache=0
-          # Check whether --enable-filesystem or --disable-filesystem was given.
-if test "${enable_filesystem+set}" = set; then
-  enableval="$enable_filesystem"
-  
-                          if test "$enableval" = yes; then
-                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
-                          else
-                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
-                          fi
-                        
-else
-  
-                          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_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM
-                        
-fi
-
-
-          eval "$ac_cv_use_filesystem"
+          eval "$ac_cv_use_filesystem"

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


@@ -3276,8 +3875,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6
-echo "configure:3281: checking "for --enable-fs_inet"" >&5
+          echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
+echo "configure:3880: checking for --enable-fs_inet" >&5

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


@@ -3315,8 +3914,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6
-echo "configure:3320: checking "for --enable-fs_zip"" >&5
+          echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
+echo "configure:3919: checking for --enable-fs_zip" >&5

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


@@ -3354,8 +3953,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6
-echo "configure:3359: checking "for --enable-zipstream"" >&5
+          echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
+echo "configure:3958: checking for --enable-zipstream" >&5

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


@@ -3394,8 +3993,8 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-catch_segvs"""... $ac_c" 1>&6
-echo "configure:3399: checking "for --enable-catch_segvs"" >&5
+          echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
+echo "configure:3998: checking for --enable-catch_segvs" >&5

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


@@ -3433,10 +4032,89 @@ fi
           fi
         
 
           fi
         
 

+          echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
+echo "configure:4037: checking for --enable-snglinst" >&5
+          no_cache=0
+          # Check whether --enable-snglinst or --disable-snglinst was given.
+if test "${enable_snglinst+set}" = set; then
+  enableval="$enable_snglinst"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
+                          else
+                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
+                          fi
+                        
+else
+  
+                          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_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
+                        
+fi
+
+
+          eval "$ac_cv_use_snglinst"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SNGLINST_CHECKER" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+

 
 

+          echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
+echo "configure:4077: checking for --enable-mimetype" >&5
+          no_cache=0
+          # Check whether --enable-mimetype or --disable-mimetype was given.
+if test "${enable_mimetype+set}" = set; then
+  enableval="$enable_mimetype"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
+                          else
+                            ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
+                          fi
+                        
+else
+  
+                          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_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
+                        
+fi

 
 

-          echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6
-echo "configure:3440: checking "for --enable-threads"" >&5
+
+          eval "$ac_cv_use_mimetype"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-threads""... $ac_c" 1>&6
+echo "configure:4118: checking for --enable-threads" >&5

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


@@ -3474,8 +4152,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6
-echo "configure:3479: checking "for --enable-serial"" >&5
+          echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6
+echo "configure:4157: checking for --enable-serial" >&5

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


@@ -3517,8 +4195,8 @@ if test "$wxUSE_GUI" = "yes"; then
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6
-echo "configure:3522: checking "for --enable-docview"" >&5
+          echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
+echo "configure:4200: checking for --enable-docview" >&5

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


@@ -3556,8 +4234,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6
-echo "configure:3561: checking "for --enable-help"" >&5
+          echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
+echo "configure:4239: checking for --enable-help" >&5

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


@@ -3595,8 +4273,86 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6
-echo "configure:3600: checking "for --enable-constraints"" >&5
+          echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
+echo "configure:4278: checking for --enable-html" >&5
+          no_cache=0
+          # Check whether --enable-html or --disable-html was given.
+if test "${enable_html+set}" = set; then
+  enableval="$enable_html"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_html='wxUSE_HTML=yes'
+                          else
+                            ac_cv_use_html='wxUSE_HTML=no'
+                          fi
+                        
+else
+  
+                          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_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
+                        
+fi
+
+
+          eval "$ac_cv_use_html"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-htmlhelp""... $ac_c" 1>&6
+echo "configure:4317: checking for --enable-htmlhelp" >&5
+          no_cache=0
+          # Check whether --enable-htmlhelp or --disable-htmlhelp was given.
+if test "${enable_htmlhelp+set}" = set; then
+  enableval="$enable_htmlhelp"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
+                          else
+                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
+                          fi
+                        
+else
+  
+                          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_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP
+                        
+fi
+
+
+          eval "$ac_cv_use_htmlhelp"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-constraints""... $ac_c" 1>&6
+echo "configure:4356: checking for --enable-constraints" >&5

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


@@ -3634,8 +4390,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6
-echo "configure:3639: checking "for --enable-printarch"" >&5
+          echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
+echo "configure:4395: checking for --enable-printarch" >&5

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


@@ -3673,8 +4429,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6
-echo "configure:3678: checking "for --enable-mdi"" >&5
+          echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
+echo "configure:4434: checking for --enable-mdi" >&5

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


@@ -3712,9 +4468,87 @@ fi
           fi
         
 
           fi
         
 

+          echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
+echo "configure:4473: checking for --enable-loggui" >&5
+          no_cache=0
+          # Check whether --enable-loggui or --disable-loggui was given.
+if test "${enable_loggui+set}" = set; then
+  enableval="$enable_loggui"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_loggui='wxUSE_LOGGUI=yes'
+                          else
+                            ac_cv_use_loggui='wxUSE_LOGGUI=no'
+                          fi
+                        
+else
+  
+                          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_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI
+                        
+fi
+
+
+          eval "$ac_cv_use_loggui"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-logwin""... $ac_c" 1>&6
+echo "configure:4512: checking for --enable-logwin" >&5
+          no_cache=0
+          # Check whether --enable-logwin or --disable-logwin was given.
+if test "${enable_logwin+set}" = set; then
+  enableval="$enable_logwin"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_logwin='wxUSE_LOGWINDOW=yes'
+                          else
+                            ac_cv_use_logwin='wxUSE_LOGWINDOW=no'
+                          fi
+                        
+else
+  
+                          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_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW
+                        
+fi
+
+
+          eval "$ac_cv_use_logwin"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-postscript"""... $ac_c" 1>&6
-echo "configure:3718: checking "for --enable-postscript"" >&5
+          echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6
+echo "configure:4552: checking for --enable-postscript" >&5

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


@@ -3754,8 +4588,9 @@ fi
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6
-echo "configure:3759: checking "for --enable-prologio"" >&5
+
+          echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
+echo "configure:4594: checking for --enable-prologio" >&5

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


@@ -3793,8 +4628,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6
-echo "configure:3798: checking "for --enable-resources"" >&5
+          echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
+echo "configure:4633: checking for --enable-resources" >&5

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


@@ -3833,8 +4668,8 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6
-echo "configure:3838: checking "for --enable-xresources"" >&5
+          echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
+echo "configure:4673: checking for --enable-xresources" >&5

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


@@ -3874,8 +4709,8 @@ fi
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6
-echo "configure:3879: checking "for --enable-clipboard"" >&5
+          echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
+echo "configure:4714: checking for --enable-clipboard" >&5

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


@@ -3913,8 +4748,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6
-echo "configure:3918: checking "for --enable-dnd"" >&5
+          echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
+echo "configure:4753: checking for --enable-dnd" >&5

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


@@ -3952,9 +4787,48 @@ fi
           fi
         
 
           fi
         
 

+          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:4792: 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-wxtree"""... $ac_c" 1>&6
-echo "configure:3958: checking "for --enable-wxtree"" >&5
+          echo $ac_n "checking for --enable-wxtree""... $ac_c" 1>&6
+echo "configure:4832: checking for --enable-wxtree" >&5

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


@@ -3994,8 +4868,8 @@ fi
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6
-echo "configure:3999: checking "for --enable-controls"" >&5
+          echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
+echo "configure:4873: checking for --enable-controls" >&5

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


@@ -4035,9 +4909,11 @@ fi
 
 if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_ACCEL=yes
 
 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_CARET=yes
   DEFAULT_wxUSE_COMBOBOX=yes

-  DEFAULT_wxUSE_BMPBUTTON=yes

   DEFAULT_wxUSE_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLISTBOX=yes
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLISTBOX=yes
   DEFAULT_wxUSE_CHOICE=yes


@@ -4061,16 +4937,20 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_STATLINE=yes
   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TAB_DIALOG=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_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
 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_CARET=no
   DEFAULT_wxUSE_COMBOBOX=no

-  DEFAULT_wxUSE_BMPBUTTON=no

   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLISTBOX=no
   DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLISTBOX=no
   DEFAULT_wxUSE_CHOICE=no


@@ -4094,16 +4974,18 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_STATLINE=no
   DEFAULT_wxUSE_STATUSBAR=no
   DEFAULT_wxUSE_TAB_DIALOG=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_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
 
 
 fi
 
 

-          echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6
-echo "configure:4107: checking "for --enable-accel"" >&5
+          echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
+echo "configure:4989: checking for --enable-accel" >&5

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


@@ -4141,47 +5023,47 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6
-echo "configure:4146: checking "for --enable-caret"" >&5
+          echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
+echo "configure:5028: checking for --enable-button" >&5

           no_cache=0
           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-button or --disable-button was given.
+if test "${enable_button+set}" = set; then
+  enableval="$enable_button"

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

-                            ac_cv_use_caret='wxUSE_CARET=yes'
+                            ac_cv_use_button='wxUSE_BUTTON=yes'

                           else
                           else

-                            ac_cv_use_caret='wxUSE_CARET=no'
+                            ac_cv_use_button='wxUSE_BUTTON=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_CARET" ${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
 
                           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_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_caret"
+          eval "$ac_cv_use_button"

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

-            echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_CARET" = yes; then
+          if test "$wxUSE_BUTTON" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:4185: checking "for --enable-bmpbutton"" >&5
+          echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
+echo "configure:5067: checking for --enable-bmpbutton" >&5

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


@@ -4219,15 +5101,93 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6
-echo "configure:4224: checking "for --enable-checkbox"" >&5
+          echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
+echo "configure:5106: checking for --enable-calendar" >&5

           no_cache=0
           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-calendar or --disable-calendar was given.
+if test "${enable_calendar+set}" = set; then
+  enableval="$enable_calendar"

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

-                            ac_cv_use_checkbox='wxUSE_CHECKBOX=yes'
+                            ac_cv_use_calendar='wxUSE_CALCTRL=yes'
+                          else
+                            ac_cv_use_calendar='wxUSE_CALCTRL=no'
+                          fi
+                        
+else
+  
+                          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_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL
+                        
+fi
+
+
+          eval "$ac_cv_use_calendar"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_calendar >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-caret""... $ac_c" 1>&6
+echo "configure:5145: checking for --enable-caret" >&5
+          no_cache=0
+          # Check whether --enable-caret or --disable-caret was given.
+if test "${enable_caret+set}" = set; then
+  enableval="$enable_caret"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_caret='wxUSE_CARET=yes'
+                          else
+                            ac_cv_use_caret='wxUSE_CARET=no'
+                          fi
+                        
+else
+  
+                          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_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
+                        
+fi
+
+
+          eval "$ac_cv_use_caret"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-checkbox""... $ac_c" 1>&6
+echo "configure:5184: checking for --enable-checkbox" >&5
+          no_cache=0
+          # Check whether --enable-checkbox or --disable-checkbox was given.
+if test "${enable_checkbox+set}" = set; then
+  enableval="$enable_checkbox"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_checkbox='wxUSE_CHECKBOX=yes'

                           else
                             ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
                           fi
                           else
                             ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
                           fi


@@ -4258,8 +5218,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6
-echo "configure:4263: checking "for --enable-checklst"" >&5
+          echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
+echo "configure:5223: checking for --enable-checklst" >&5

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


@@ -4297,8 +5257,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6
-echo "configure:4302: checking "for --enable-choice"" >&5
+          echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
+echo "configure:5262: checking for --enable-choice" >&5

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


@@ -4336,8 +5296,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6
-echo "configure:4341: checking "for --enable-combobox"" >&5
+          echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
+echo "configure:5301: checking for --enable-combobox" >&5

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


@@ -4375,8 +5335,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6
-echo "configure:4380: checking "for --enable-gauge"" >&5
+          echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
+echo "configure:5340: checking for --enable-gauge" >&5

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


@@ -4414,8 +5374,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6
-echo "configure:4419: checking "for --enable-grid"" >&5
+          echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
+echo "configure:5379: checking for --enable-grid" >&5

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


@@ -4453,8 +5413,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6
-echo "configure:4458: checking "for --enable-newgrid"" >&5
+          echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
+echo "configure:5418: checking for --enable-newgrid" >&5

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


@@ -4492,8 +5452,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6
-echo "configure:4497: checking "for --enable-imaglist"" >&5
+          echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
+echo "configure:5457: checking for --enable-imaglist" >&5

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


@@ -4531,8 +5491,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6
-echo "configure:4536: checking "for --enable-listbox"" >&5
+          echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
+echo "configure:5496: checking for --enable-listbox" >&5

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


@@ -4570,8 +5530,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6
-echo "configure:4575: checking "for --enable-listctrl"" >&5
+          echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
+echo "configure:5535: checking for --enable-listctrl" >&5

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


@@ -4609,8 +5569,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6
-echo "configure:4614: checking "for --enable-notebook"" >&5
+          echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
+echo "configure:5574: checking for --enable-notebook" >&5

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


@@ -4648,8 +5608,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6
-echo "configure:4653: checking "for --enable-radiobox"" >&5
+          echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
+echo "configure:5613: checking for --enable-radiobox" >&5

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


@@ -4687,8 +5647,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6
-echo "configure:4692: checking "for --enable-radiobtn"" >&5
+          echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
+echo "configure:5652: checking for --enable-radiobtn" >&5

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


@@ -4726,8 +5686,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6
-echo "configure:4731: checking "for --enable-sash"" >&5
+          echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
+echo "configure:5691: checking for --enable-sash" >&5

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


@@ -4765,8 +5725,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6
-echo "configure:4770: checking "for --enable-scrollbar"" >&5
+          echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
+echo "configure:5730: checking for --enable-scrollbar" >&5

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


@@ -4804,8 +5764,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6
-echo "configure:4809: checking "for --enable-slider"" >&5
+          echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
+echo "configure:5769: checking for --enable-slider" >&5

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


@@ -4843,8 +5803,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6
-echo "configure:4848: checking "for --enable-spinbtn"" >&5
+          echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
+echo "configure:5808: checking for --enable-spinbtn" >&5

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


@@ -4882,8 +5842,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6
-echo "configure:4887: checking "for --enable-spinctrl"" >&5
+          echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
+echo "configure:5847: checking for --enable-spinctrl" >&5

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


@@ -4921,8 +5881,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6
-echo "configure:4926: checking "for --enable-splitter"" >&5
+          echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
+echo "configure:5886: checking for --enable-splitter" >&5

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


@@ -4960,8 +5920,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6
-echo "configure:4965: checking "for --enable-statbmp"" >&5
+          echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
+echo "configure:5925: checking for --enable-statbmp" >&5

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


@@ -4999,8 +5959,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6
-echo "configure:5004: checking "for --enable-statbox"" >&5
+          echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
+echo "configure:5964: checking for --enable-statbox" >&5

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


@@ -5014,777 +5974,1325 @@ if test "${enable_statbox+set}" = set; then
                         
 else
   
                         
 else
   

-                          LINE=`grep "wxUSE_STATBOX" ${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_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
+                        
+fi
+
+
+          eval "$ac_cv_use_statbox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-statline""... $ac_c" 1>&6
+echo "configure:6003: checking for --enable-statline" >&5
+          no_cache=0
+          # Check whether --enable-statline or --disable-statline was given.
+if test "${enable_statline+set}" = set; then
+  enableval="$enable_statline"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_statline='wxUSE_STATLINE=yes'
+                          else
+                            ac_cv_use_statline='wxUSE_STATLINE=no'
+                          fi
+                        
+else
+  
+                          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_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
+                        
+fi
+
+
+          eval "$ac_cv_use_statline"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-stattext""... $ac_c" 1>&6
+echo "configure:6042: checking for --enable-stattext" >&5
+          no_cache=0
+          # Check whether --enable-stattext or --disable-stattext was given.
+if test "${enable_stattext+set}" = set; then
+  enableval="$enable_stattext"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_stattext='wxUSE_STATTEXT=yes'
+                          else
+                            ac_cv_use_stattext='wxUSE_STATTEXT=no'
+                          fi
+                        
+else
+  
+                          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_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT
+                        
+fi
+
+
+          eval "$ac_cv_use_stattext"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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:6081: 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
+
+
+          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:6120: 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
+
+                          ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
+                        
+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 "$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:6159: 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
+  
+                          LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL
+                        
+fi
+
+
+          eval "$ac_cv_use_textctrl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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:6198: 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
+  
+                          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
+
+
+          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:6237: 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:6276: 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:6315: 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:6354: 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:6393: 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:6434: 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:6473: 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:6512: 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
 
                           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_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_statbox"
+          eval "$ac_cv_use_coldlg"

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

-            echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_STATBOX" = yes; then
+          if test "$wxUSE_COLOURDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5043: checking "for --enable-statline"" >&5
+          echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
+echo "configure:6551: checking for --enable-filedlg" >&5

           no_cache=0
           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-filedlg or --disable-filedlg was given.
+if test "${enable_filedlg+set}" = set; then
+  enableval="$enable_filedlg"

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

-                            ac_cv_use_statline='wxUSE_STATLINE=yes'
+                            ac_cv_use_filedlg='wxUSE_FILEDLG=yes'

                           else
                           else

-                            ac_cv_use_statline='wxUSE_STATLINE=no'
+                            ac_cv_use_filedlg='wxUSE_FILEDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}`

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

-                          ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
+                          ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_statline"
+          eval "$ac_cv_use_filedlg"

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

-            echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_STATLINE" = yes; then
+          if test "$wxUSE_FILEDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5082: checking "for --enable-statusbar"" >&5
+          echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
+echo "configure:6590: checking for --enable-fontdlg" >&5

           no_cache=0
           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-fontdlg or --disable-fontdlg was given.
+if test "${enable_fontdlg+set}" = set; then
+  enableval="$enable_fontdlg"

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

-                            ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
+                            ac_cv_use_fontdlg='wxUSE_FONTDLG=yes'

                           else
                           else

-                            ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
+                            ac_cv_use_fontdlg='wxUSE_FONTDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}`

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

-                          ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
+                          ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_statusbar"
+          eval "$ac_cv_use_fontdlg"

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

-            echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_STATUSBAR" = yes; then
+          if test "$wxUSE_FONTDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5121: checking "for --enable-tabdialog"" >&5
+          echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
+echo "configure:6629: checking for --enable-dirdlg" >&5

           no_cache=0
           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-dirdlg or --disable-dirdlg was given.
+if test "${enable_dirdlg+set}" = set; then
+  enableval="$enable_dirdlg"

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

-                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes'
+                            ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'

                           else
                           else

-                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
+                            ac_cv_use_dirdlg='wxUSE_DIRDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`

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

-                          ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
+                          ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_tabdialog"
+          eval "$ac_cv_use_dirdlg"

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

-            echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_TABDIALOG" = yes; then
+          if test "$wxUSE_DIRDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5160: checking "for --enable-toolbar"" >&5
+          echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
+echo "configure:6668: checking for --enable-msgdlg" >&5

           no_cache=0
           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-msgdlg or --disable-msgdlg was given.
+if test "${enable_msgdlg+set}" = set; then
+  enableval="$enable_msgdlg"

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

-                            ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+                            ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'

                           else
                           else

-                            ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
+                            ac_cv_use_msgdlg='wxUSE_MSGDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}`

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

-                          ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
+                          ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_toolbar"
+          eval "$ac_cv_use_msgdlg"

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

-            echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_TOOLBAR" = yes; then
+          if test "$wxUSE_MSGDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5199: checking "for --enable-tbarnative"" >&5
+          echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
+echo "configure:6707: checking for --enable-numberdlg" >&5

           no_cache=0
           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-numberdlg or --disable-numberdlg was given.
+if test "${enable_numberdlg+set}" = set; then
+  enableval="$enable_numberdlg"

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

-                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'

                           else
                           else

-                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}`

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

-                          ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
+                          ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_tbarnative"
+          eval "$ac_cv_use_numberdlg"

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

-            echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
+          if test "$wxUSE_NUMBERDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5238: checking "for --enable-tbarsmpl"" >&5
+          echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
+echo "configure:6746: checking for --enable-textdlg" >&5

           no_cache=0
           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-textdlg or --disable-textdlg was given.
+if test "${enable_textdlg+set}" = set; then
+  enableval="$enable_textdlg"

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

-                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
+                            ac_cv_use_textdlg='wxUSE_TEXTDLG=yes'

                           else
                           else

-                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
+                            ac_cv_use_textdlg='wxUSE_TEXTDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}`

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

-                          ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
+                          ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_tbarsmpl"
+          eval "$ac_cv_use_textdlg"

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

-            echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
+          if test "$wxUSE_TEXTDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5277: checking "for --enable-treectrl"" >&5
+          echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
+echo "configure:6785: checking for --enable-tipdlg" >&5

           no_cache=0
           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-tipdlg or --disable-tipdlg was given.
+if test "${enable_tipdlg+set}" = set; then
+  enableval="$enable_tipdlg"

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

-                            ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
+                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'

                           else
                           else

-                            ac_cv_use_treectrl='wxUSE_TREECTRL=no'
+                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}`

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

-                          ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
+                          ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_treectrl"
+          eval "$ac_cv_use_tipdlg"

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

-            echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_TREECTRL" = yes; then
+          if test "$wxUSE_STARTUP_TIPS" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5318: checking "for --enable-commondlg"" >&5
+          echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
+echo "configure:6824: checking for --enable-progressdlg" >&5

           no_cache=0
           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-progressdlg or --disable-progressdlg was given.
+if test "${enable_progressdlg+set}" = set; then
+  enableval="$enable_progressdlg"

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

-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
+                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'

                           else
                           else

-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
+                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}`

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

-                          ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
+                          ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_commondlg"
+          eval "$ac_cv_use_progressdlg"

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

-            echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_COMMONDLGS" = yes; then
+          if test "$wxUSE_PROGRESSDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5357: checking "for --enable-dirdlg"" >&5
+          echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
+echo "configure:6863: checking for --enable-wizarddlg" >&5

           no_cache=0
           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-wizarddlg or --disable-wizarddlg was given.
+if test "${enable_wizarddlg+set}" = set; then
+  enableval="$enable_wizarddlg"

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

-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
+                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'

                           else
                           else

-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
+                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}`

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

-                          ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
+                          ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_dirdlg"
+          eval "$ac_cv_use_wizarddlg"

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

-            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_DIRDLG" = yes; then
+          if test "$wxUSE_WIZARDDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5396: checking "for --enable-textdlg"" >&5
+
+
+          echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
+echo "configure:6904: checking for --enable-menus" >&5

           no_cache=0
           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-menus or --disable-menus was given.
+if test "${enable_menus+set}" = set; then
+  enableval="$enable_menus"

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

-                            ac_cv_use_textdlg='wxUSE_TEXTDLG=yes'
+                            ac_cv_use_menus='wxUSE_MENUS=yes'

                           else
                           else

-                            ac_cv_use_textdlg='wxUSE_TEXTDLG=no'
+                            ac_cv_use_menus='wxUSE_MENUS=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}`

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

-                          ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG
+                          ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_textdlg"
+          eval "$ac_cv_use_menus"

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

-            echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_TEXTDLG" = yes; then
+          if test "$wxUSE_MENUS" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5435: checking "for --enable-tipdlg"" >&5
+          echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
+echo "configure:6943: checking for --enable-miniframe" >&5

           no_cache=0
           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-miniframe or --disable-miniframe was given.
+if test "${enable_miniframe+set}" = set; then
+  enableval="$enable_miniframe"

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

-                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
+                            ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'

                           else
                           else

-                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
+                            ac_cv_use_miniframe='wxUSE_MINIFRAME=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`

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

-                          ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS
+                          ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_tipdlg"
+          eval "$ac_cv_use_miniframe"

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

-            echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_STARTUP_TIPS" = yes; then
+          if test "$wxUSE_MINIFRAME" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5474: checking "for --enable-progressdlg"" >&5
+          echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
+echo "configure:6982: checking for --enable-tooltips" >&5

           no_cache=0
           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-tooltips or --disable-tooltips was given.
+if test "${enable_tooltips+set}" = set; then
+  enableval="$enable_tooltips"

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

-                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
+                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes'

                           else
                           else

-                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
+                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}`

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

-                          ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG
+                          ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_progressdlg"
+          eval "$ac_cv_use_tooltips"

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

-            echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_PROGRESSDLG" = yes; then
+          if test "$wxUSE_TOOLTIPS" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5513: checking "for --enable-miniframe"" >&5
+          echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
+echo "configure:7021: checking for --enable-splines" >&5

           no_cache=0
           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-splines or --disable-splines was given.
+if test "${enable_splines+set}" = set; then
+  enableval="$enable_splines"

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

-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
+                            ac_cv_use_splines='wxUSE_SPLINES=yes'

                           else
                           else

-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
+                            ac_cv_use_splines='wxUSE_SPLINES=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}`

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

-                          ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
+                          ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_miniframe"
+          eval "$ac_cv_use_splines"

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

-            echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_MINIFRAME" = yes; then
+          if test "$wxUSE_SPLINES" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5552: checking "for --enable-html"" >&5
+          echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
+echo "configure:7060: checking for --enable-validators" >&5

           no_cache=0
           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-validators or --disable-validators was given.
+if test "${enable_validators+set}" = set; then
+  enableval="$enable_validators"

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

-                            ac_cv_use_html='wxUSE_HTML=yes'
+                            ac_cv_use_validators='wxUSE_VALIDATORS=yes'

                           else
                           else

-                            ac_cv_use_html='wxUSE_HTML=no'
+                            ac_cv_use_validators='wxUSE_VALIDATORS=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}`

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

-                          ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
+                          ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_html"
+          eval "$ac_cv_use_validators"

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

-            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_HTML" = yes; then
+          if test "$wxUSE_VALIDATORS" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5591: checking "for --enable-tooltips"" >&5
+          echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
+echo "configure:7099: checking for --enable-busyinfo" >&5

           no_cache=0
           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-busyinfo or --disable-busyinfo was given.
+if test "${enable_busyinfo+set}" = set; then
+  enableval="$enable_busyinfo"

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

-                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
+                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes'

                           else
                           else

-                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'
+                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}`

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

-                          ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS
+                          ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_tooltips"
+          eval "$ac_cv_use_busyinfo"

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

-            echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_TOOLTIPS" = yes; then
+          if test "$wxUSE_BUSYINFO" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5630: checking "for --enable-splines"" >&5
+          echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
+echo "configure:7138: checking for --enable-joystick" >&5

           no_cache=0
           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-joystick or --disable-joystick was given.
+if test "${enable_joystick+set}" = set; then
+  enableval="$enable_joystick"

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

-                            ac_cv_use_splines='wxUSE_SPLINES=yes'
+                            ac_cv_use_joystick='wxUSE_JOYSTICK=yes'

                           else
                           else

-                            ac_cv_use_splines='wxUSE_SPLINES=no'
+                            ac_cv_use_joystick='wxUSE_JOYSTICK=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}`

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

-                          ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES
+                          ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_splines"
+          eval "$ac_cv_use_joystick"

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

-            echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_SPLINES" = yes; then
+          if test "$wxUSE_JOYSTICK" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5669: checking "for --enable-validators"" >&5
+          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:7177: checking for --enable-metafile" >&5

           no_cache=0
           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-metafile or --disable-metafile was given.
+if test "${enable_metafile+set}" = set; then
+  enableval="$enable_metafile"

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

-                            ac_cv_use_validators='wxUSE_VALIDATORS=yes'
+                            ac_cv_use_metafile='wxUSE_METAFILE=yes'

                           else
                           else

-                            ac_cv_use_validators='wxUSE_VALIDATORS=no'
+                            ac_cv_use_metafile='wxUSE_METAFILE=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_VALIDATORS" ${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
 
                           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_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_validators"
+          eval "$ac_cv_use_metafile"

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

-            echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_VALIDATORS" = yes; then
+          if test "$wxUSE_METAFILE" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5708: checking "for --enable-busyinfo"" >&5
+          echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6
+echo "configure:7216: checking for --enable-dragimage" >&5

           no_cache=0
           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-dragimage or --disable-dragimage was given.
+if test "${enable_dragimage+set}" = set; then
+  enableval="$enable_dragimage"

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

-                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
+                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'

                           else
                           else

-                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'
+                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}`

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

-                          ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO
+                          ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_busyinfo"
+          eval "$ac_cv_use_dragimage"

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

-            echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_BUSYINFO" = yes; then
+          if test "$wxUSE_DRAGIMAGE" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-plot"""... $ac_c" 1>&6
-echo "configure:5747: checking "for --enable-plot"" >&5
+
+
+          echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
+echo "configure:7257: checking for --enable-image" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-plot or --disable-plot was given.
-if test "${enable_plot+set}" = set; then
-  enableval="$enable_plot"
+          # Check whether --enable-image or --disable-image was given.
+if test "${enable_image+set}" = set; then
+  enableval="$enable_image"

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

-                            ac_cv_use_plot='wxUSE_PLOT=yes'
+                            ac_cv_use_image='wxUSE_IMAGE=yes'

                           else
                           else

-                            ac_cv_use_plot='wxUSE_PLOT=no'
+                            ac_cv_use_image='wxUSE_IMAGE=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_PLOT" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}`

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

-                          ac_cv_use_plot='wxUSE_PLOT='$DEFAULT_wxUSE_PLOT
+                          ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_plot"
+          eval "$ac_cv_use_image"

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

-            echo $ac_cv_use_plot >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_PLOT" = yes; then
+          if test "$wxUSE_IMAGE" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             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:5788: checking "for --enable-gif"" >&5
+          echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
+echo "configure:7296: checking for --enable-gif" >&5

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


@@ -5822,8 +7330,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6
-echo "configure:5827: checking "for --enable-pcx"" >&5
+          echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
+echo "configure:7335: checking for --enable-pcx" >&5

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


@@ -5861,8 +7369,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6
-echo "configure:5866: checking "for --enable-pnm"" >&5
+          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7374: checking for --enable-pnm" >&5

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


@@ -5900,6 +7408,45 @@ fi
           fi
         
 
           fi
         
 

+          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7413: 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
 
 
 fi
 
 


@@ -5909,7 +7456,7 @@ fi
 
 
 echo $ac_n "checking for toolkit""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for toolkit""... $ac_c" 1>&6

-echo "configure:5913: checking for toolkit" >&5
+echo "configure:7460: checking for toolkit" >&5

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


@@ -5934,7 +7481,7 @@ else
   done
 fi
 
   done
 fi
 

-NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+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 )
 
 case "${host}" in
   *-pc-os2_emx )


@@ -5968,7 +7515,8 @@ for toolkit in `echo $ALL_TOOLKITS`; do
       echo "$var=$value" >> ${wx_arg_cache_file}
     fi
     if test "$value" = 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
+      toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
+      echo "$ac_t""$toolkit_echo" 1>&6

     fi
   fi
 done
     fi
   fi
 done


@@ -6042,7 +7590,7 @@ 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
 # 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:6046: checking for $ac_word" >&5
+echo "configure:7594: 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 eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6072,7 +7620,7 @@ 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
   # 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:6076: checking for $ac_word" >&5
+echo "configure:7624: 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 eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6123,7 +7671,7 @@ fi
       # 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
       # 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:6127: checking for $ac_word" >&5
+echo "configure:7675: 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 eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6155,7 +7703,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6

-echo "configure:6159: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:7707: 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_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.


@@ -6166,12 +7714,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
 
 cat > conftest.$ac_ext << EOF
 

-#line 6170 "configure"
+#line 7718 "configure"

 #include "confdefs.h"
 
 main(){return(0);}
 EOF
 #include "confdefs.h"
 
 main(){return(0);}
 EOF

-if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7723: \"$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_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then


@@ -6197,12 +7745,12 @@ 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: 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:6201: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:7749: 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 "$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:6206: checking whether we are using GNU C" >&5
+echo "configure:7754: 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
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6211,7 +7759,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:6215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:7763: \"$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
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no


@@ -6230,7 +7778,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6

-echo "configure:6234: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:7782: 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
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6265,7 +7813,7 @@ fi
 CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6

-echo "configure:6269: checking how to run the C preprocessor" >&5
+echo "configure:7817: checking how to run the C preprocessor" >&5

 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=


@@ -6280,13 +7828,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF

-#line 6284 "configure"
+#line 7832 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -6297,13 +7845,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF

-#line 6301 "configure"
+#line 7849 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -6314,13 +7862,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF

-#line 6318 "configure"
+#line 7866 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -6347,13 +7895,13 @@ 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
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6

-echo "configure:6351: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:7899: 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
 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 6357 "configure"
+#line 7905 "configure"

 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP


@@ -6371,7 +7919,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF

-#line 6375 "configure"
+#line 7923 "configure"

 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA


@@ -6407,7 +7955,7 @@ 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
 # 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:6411: checking for $ac_word" >&5
+echo "configure:7959: 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 eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6439,7 +7987,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6

-echo "configure:6443: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:7991: 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_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.


@@ -6450,12 +7998,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
 
 cat > conftest.$ac_ext << EOF
 

-#line 6454 "configure"
+#line 8002 "configure"

 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF

-if { (eval echo configure:6459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8007: \"$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_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then


@@ -6481,12 +8029,12 @@ 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: 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:6485: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8033: 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 "$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:6490: checking whether we are using GNU C++" >&5
+echo "configure:8038: 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
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6495,7 +8043,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8047: \"$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
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no


@@ -6514,7 +8062,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6

-echo "configure:6518: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:8066: 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
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6547,7 +8095,7 @@ fi
 
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
 
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6

-echo "configure:6551: checking how to run the C++ preprocessor" >&5
+echo "configure:8099: 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
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -6560,12 +8108,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF

-#line 6564 "configure"
+#line 8112 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -6603,7 +8151,7 @@ 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
 # 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:6607: checking for $ac_word" >&5
+echo "configure:8155: 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 eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6634,7 +8182,7 @@ 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
 # 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:6638: checking for $ac_word" >&5
+echo "configure:8186: 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 eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6674,7 +8222,7 @@ fi
 # 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
 # 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:6678: checking for a BSD compatible install" >&5
+echo "configure:8226: 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
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -6730,7 +8278,7 @@ 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
 # 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:6734: checking for $ac_word" >&5
+echo "configure:8282: 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 eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6758,8 +8306,8 @@ else
 fi
 
 
 fi
 
 

-echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:6763: checking "make for VPATH support"" >&5
+echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
+echo "configure:8311: checking make for VPATH support" >&5

 cat - << EOF > confMake
 check : file
        cp \$? \$@
 cat - << EOF > confMake
 check : file
        cp \$? \$@


@@ -6770,7 +8318,7 @@ if test ! -d sub ; then
   mkdir sub
 fi
 echo dummy > sub/file
   mkdir sub
 fi
 echo dummy > sub/file

-${MAKE-make} -f confMake VPATH=sub 2> config.log > /dev/null
+${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null

 RESULT=$?
 rm -f sub/file check final_file confMake
 rmdir sub
 RESULT=$?
 rm -f sub/file check final_file confMake
 rmdir sub


@@ -6778,9 +8326,17 @@ if test "$RESULT" = 0; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
   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
+  { echo "configure: error: 
+You need a make-utility that is able to use the variable

 VPATH correctly.
 VPATH correctly.

-If your version of make does not support VPATH correctly" 1>&2; exit 1; }
+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
 fi
 
 for ac_prog in 'bison -y' byacc


@@ -6788,7 +8344,7 @@ 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
 # 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:6792: checking for $ac_word" >&5
+echo "configure:8348: 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 eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6822,7 +8378,7 @@ 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
 # 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:6826: checking for $ac_word" >&5
+echo "configure:8382: 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 eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6856,7 +8412,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6

-echo "configure:6860: checking for yywrap in -l$ac_lib" >&5
+echo "configure:8416: 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
 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


@@ -6864,7 +8420,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 6868 "configure"
+#line 8424 "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
 #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


@@ -6875,7 +8431,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
 yywrap()
 ; return 0; }
 EOF

-if { (eval echo configure:6879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8435: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -6899,7 +8455,7 @@ fi
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6

-echo "configure:6903: checking whether ln -s works" >&5
+echo "configure:8459: 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
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -7043,31 +8599,27 @@ rm -f confcache
 AFMINSTALL=
 
 if test "$wxUSE_GUI" = "yes"; then
 AFMINSTALL=
 
 if test "$wxUSE_GUI" = "yes"; then

+    USE_GUI=1

 
 

-USE_GUI=1
-
-TOOLKIT=
-TOOLKIT_INCLUDE=
+    TOOLKIT=
+    TOOLKIT_INCLUDE=

 
 

-GUIOBJS=
-COMMONOBJS=
-GENERICOBJS=
+    GUI_TK_LIBRARY=
+    GUI_TK_LINK=

 
 

-GUI_TK_LIBRARY=
-GUI_TK_LINK=
+    WXGTK12=
+    WXGTK127=
+    WXGTK20=

 
 

-WXGTK12=
-WXGTK13=
+    WXWINE=

 
 

-WXWINE=
-
-if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
-    if test "$cross_compiling" = "yes" ; then
-                echo "configure: warning: skipping windows.h check for cross-compilation" 1>&2
-    else
-        echo $ac_n "checking for Windows headers""... $ac_c" 1>&6
-echo "configure:7070: checking for Windows headers" >&5
-        
+    if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
+        if test "$cross_compiling" = "yes" ; then
+                        echo "configure: warning: skipping windows.h check for cross-compilation" 1>&2
+        else
+            echo $ac_n "checking for Windows headers""... $ac_c" 1>&6
+echo "configure:8622: checking for Windows headers" >&5
+            

 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do


@@ -7077,48 +8629,455 @@ for ac_dir in $SEARCH_INCLUDE;
     fi
   done
 
     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; }
+            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
+
+        INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+                        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+
+                if test "$wxUSE_ODBC" = "yes" ; then
+            LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
+        fi
+
+                if test "$wxUSE_MINGW" = 1; then
+            LDFLAGS="$LDFLAGS -mwindows"

         fi
         fi

+
+        TOOLKIT=MSW
+        GUIDIST=MSW_DIST
+
+                RCINCSWITCH="--include-dir"
+        RCDEFSWITCH="--define"
+        RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\""
+        RCINPUTSWITCH="-i"
+        RCOUTPUTSWITCH="-o"
+        RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__"
+
+                RESPROGRAM="\$(RES_PROGRAM)"
+    fi
+
+    if test "$wxUSE_GTK" = 1; then
+        echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
+echo "configure:8668: 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:8730: 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:8765: 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 8788 "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:8866: \"$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 8900 "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:8910: \"$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:8968: 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
     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

 
 

-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
-            LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+  min_gtk_version=1.2.7
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:9003: 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 9016 "configure"
+#include "confdefs.h"

 
 

-               if test "$wxUSE_ODBC" = "yes" ; then
-               LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
-       fi
-       
-        if test "$wxUSE_MINGW" = 1; then
-        LDFLAGS="$LDFLAGS -mwindows"
-    fi
+#include <gtk/gtk.h>
+#include <gtk/gtkfeatures.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;

 
 

-    TOOLKIT=MSW
+  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }

 
 

-    GUIOBJS="\$(MSW_GUIOBJS)"
-    GUIHEADERS="\$(MSW_HEADERS)"
-    COMMONOBJS="\$(MSW_COMMONOBJS)"
-    GENERICOBJS="\$(MSW_GENERICOBJS)"
-    UNIXOBJS=
-    GUIDIST=MSW_DIST
+   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);
+   }

 
 

-        RCINCSWITCH="--include-dir"
-    RCDEFSWITCH="--define"
-    RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\""
-    RCINPUTSWITCH="-i"
-    RCOUTPUTSWITCH="-o"
-    RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__"
+   if (gtk_minor_version == 1) return FALSE;

 
 

-        RESPROGRAM="\$(RES_PROGRAM)"
+   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:9049: \"$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
 
 fi
 

-if test "$wxUSE_GTK" = 1; then
-            
+     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
   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


@@ -7135,7 +9094,7 @@ if test "$wxUSE_GTK" = 1; then
   # 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
   # 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:7139: checking for $ac_word" >&5
+echo "configure:9098: 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
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -7170,7 +9129,7 @@ fi
 
   min_gtk_version=1.2.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
 
   min_gtk_version=1.2.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6

-echo "configure:7174: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9133: checking for GTK - version >= $min_gtk_version" >&5

   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`


@@ -7183,7 +9142,7 @@ echo "configure:7174: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF

-#line 7187 "configure"
+#line 9146 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include "confdefs.h"
 
 #include <gtk/gtk.h>


@@ -7216,7 +9175,7 @@ main ()
 }
 
 EOF
 }
 
 EOF

-if { (eval echo configure:7220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   :
 else
 then
   :
 else


@@ -7235,7 +9194,7 @@ fi
   fi
   if test "x$no_gtk" = x ; then
      echo "$ac_t""yes" 1>&6
   fi
   if test "x$no_gtk" = x ; then
      echo "$ac_t""yes" 1>&6

-     WXGTK12=1
+     wx_cv_lib_gtk=1.2.3

   else
      echo "$ac_t""no" 1>&6
      GTK_CFLAGS=""
   else
      echo "$ac_t""no" 1>&6
      GTK_CFLAGS=""


@@ -7245,39 +9204,49 @@ fi
   
   
 
   
   
 

+                fi

 
 

-    if test "$WXGTK12" != 1; then
-        { 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; }
-    fi
-
-
-    TOOLKIT_INCLUDE="$GTK_CFLAGS"
+                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

 
 
 
 

-    GUI_TK_LIBRARY="$GTK_LIBS"
+                        if test "$gtk_version_cached" = 1; then
+            echo "$ac_t""$wx_cv_lib_gtk" 1>&6
+        fi

 
 

-    TOOLKIT=GTK
+        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

 
 

-    AFMINSTALL=afminstall
+        TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
+        GUI_TK_LIBRARY="$wx_cv_libs_gtk"

 
 

-    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
+        AFMINSTALL=afminstall
+        TOOLKIT=GTK
+        GUIDIST=GTK_DIST

 
 

-        echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:7281: checking for gdk_im_open in -lgdk" >&5
+                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+echo "configure:9250: 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
 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


@@ -7285,7 +9254,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgdk  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lgdk  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7289 "configure"
+#line 9258 "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
 #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


@@ -7296,7 +9265,7 @@ int main() {
 gdk_im_open()
 ; return 0; }
 EOF
 gdk_im_open()
 ; return 0; }
 EOF

-if { (eval echo configure:7300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9269: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7319,12 +9288,47 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
   echo "$ac_t""no" 1>&6
 fi
 

-fi
+    fi

 
 

-if test "$wxUSE_WINE" = 1; then
-    echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
-echo "configure:7327: checking for WINE includes" >&5
-    
+    if test "$wxUSE_MGL" = 1; then
+        
+        echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
+echo "configure:9297: 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
+        echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
+echo "configure:9331: checking for WINE includes" >&5
+        

 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do


@@ -7334,18 +9338,18 @@ for ac_dir in $SEARCH_INCLUDE;
     fi
   done
 
     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
+        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:7348: checking for Xpm library" >&5
-    
+        XPM_LINK=""
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:9352: checking for Xpm library" >&5
+        

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do


@@ -7357,23 +9361,23 @@ for ac_dir in $SEARCH_LIB;
     done
   done
 
     done
   done
 

-    if test "$ac_find_libraries" != "" ; then
-        GUI_TK_LIBRARY="-L$ac_find_libraries"
-        XPM_LINK="-lXpm"
-        cat >> confdefs.h <<\EOF
+        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
 
 #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
+            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:7376: checking for Mesa library" >&5
-    
+        MESA_LINK=""
+        echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
+echo "configure:9380: checking for Mesa library" >&5
+        

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do


@@ -7385,38 +9389,28 @@ for ac_dir in $SEARCH_LIB;
     done
   done
 
     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; }
+        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_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
+        WXWINE=1
+        TOOLKIT=MSW
+        GUIDIST=MSW_DIST

     fi
 
     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
+                
+    # 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
 # 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:7420: checking for X" >&5
+echo "configure:9414: checking for X" >&5

 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then


@@ -7478,12 +9472,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF

-#line 7482 "configure"
+#line 9476 "configure"

 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:7487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9481: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -7552,14 +9546,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7556 "configure"
+#line 9550 "configure"

 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF

-if { (eval echo configure:7563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9557: \"$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.
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.


@@ -7665,17 +9659,17 @@ else
     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
     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:7669: checking whether -R must be followed by a space" >&5
+echo "configure:9663: checking whether -R must be followed by a space" >&5

       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF

-#line 7672 "configure"
+#line 9666 "configure"

 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF

-if { (eval echo configure:7679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   ac_R_nospace=yes
 else
   rm -rf conftest*
   ac_R_nospace=yes
 else


@@ -7691,14 +9685,14 @@ rm -f conftest*
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        cat > conftest.$ac_ext <<EOF
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        cat > conftest.$ac_ext <<EOF

-#line 7695 "configure"
+#line 9689 "configure"

 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF

-if { (eval echo configure:7702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   ac_R_space=yes
 else
   rm -rf conftest*
   ac_R_space=yes
 else


@@ -7730,7 +9724,7 @@ rm -f conftest*
     # 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
     # 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:7734: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:9728: 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
 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


@@ -7738,7 +9732,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7742 "configure"
+#line 9736 "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
 #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


@@ -7749,7 +9743,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
 dnet_ntoa()
 ; return 0; }
 EOF

-if { (eval echo configure:7753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9747: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7771,7 +9765,7 @@ 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
 
     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:7775: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:9769: 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
 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


@@ -7779,7 +9773,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7783 "configure"
+#line 9777 "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
 #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


@@ -7790,7 +9784,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
 dnet_ntoa()
 ; return 0; }
 EOF

-if { (eval echo configure:7794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9788: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7819,12 +9813,12 @@ fi
     # 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
     # 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:7823: checking for gethostbyname" >&5
+echo "configure:9817: 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
 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 7828 "configure"
+#line 9822 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */


@@ -7847,7 +9841,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:7851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9845: \"$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
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else


@@ -7868,7 +9862,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6

-echo "configure:7872: checking for gethostbyname in -lnsl" >&5
+echo "configure:9866: 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
 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


@@ -7876,7 +9870,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7880 "configure"
+#line 9874 "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
 #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


@@ -7887,7 +9881,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
 gethostbyname()
 ; return 0; }
 EOF

-if { (eval echo configure:7891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9885: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7917,12 +9911,12 @@ fi
     # -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
     # -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:7921: checking for connect" >&5
+echo "configure:9915: 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
 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 7926 "configure"
+#line 9920 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */


@@ -7945,7 +9939,7 @@ connect();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:7949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9943: \"$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
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else


@@ -7966,7 +9960,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6

-echo "configure:7970: checking for connect in -lsocket" >&5
+echo "configure:9964: 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
 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


@@ -7974,7 +9968,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7978 "configure"
+#line 9972 "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
 #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


@@ -7985,7 +9979,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
 connect()
 ; return 0; }
 EOF

-if { (eval echo configure:7989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9983: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8009,12 +10003,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6

-echo "configure:8013: checking for remove" >&5
+echo "configure:10007: 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
 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 8018 "configure"
+#line 10012 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */


@@ -8037,7 +10031,7 @@ remove();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10035: \"$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
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else


@@ -8058,7 +10052,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6

-echo "configure:8062: checking for remove in -lposix" >&5
+echo "configure:10056: 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
 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


@@ -8066,7 +10060,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8070 "configure"
+#line 10064 "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
 #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


@@ -8077,7 +10071,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
 remove()
 ; return 0; }
 EOF

-if { (eval echo configure:8081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10075: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8101,12 +10095,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6

-echo "configure:8105: checking for shmat" >&5
+echo "configure:10099: 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
 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 8110 "configure"
+#line 10104 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */


@@ -8129,7 +10123,7 @@ shmat();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10127: \"$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
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else


@@ -8150,7 +10144,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6

-echo "configure:8154: checking for shmat in -lipc" >&5
+echo "configure:10148: 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
 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


@@ -8158,7 +10152,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8162 "configure"
+#line 10156 "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
 #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


@@ -8169,7 +10163,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
 shmat()
 ; return 0; }
 EOF

-if { (eval echo configure:8173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10167: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8202,7 +10196,7 @@ fi
   # 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
   # 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:8206: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:10200: 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
 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


@@ -8210,7 +10204,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8214 "configure"
+#line 10208 "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
 #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


@@ -8221,7 +10215,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
 IceConnectionNumber()
 ; return 0; }
 EOF

-if { (eval echo configure:8225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10219: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8245,22 +10239,25 @@ fi
 
 fi
 
 
 fi
 

+    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+    LDFLAGS="$LDFLAGS $X_LIBS"

 
 

-    if test "$no_x" = "yes"; then
-        { echo "configure: error: X11 not found" 1>&2; exit 1; }
-    fi
+    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"
+        GUI_TK_LIBRARY="$X_LIBS"
+        TOOLKIT_INCLUDE="$X_CFLAGS"

 
 

-    AFMINSTALL=afminstall
+        AFMINSTALL=afminstall

 
 

-                                                                                                
-    COMPILED_X_PROGRAM=0
+                                                                                                                                                                                                
+        COMPILED_X_PROGRAM=0

 
 

-    echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:8263: checking for Motif/Lesstif headers" >&5
-    
+        echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
+echo "configure:10260: checking for Motif/Lesstif headers" >&5
+        

 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do


@@ -8270,46 +10267,46 @@ for ac_dir in $SEARCH_INCLUDE;
     fi
   done
 
     fi
   done
 

-    if test "$ac_find_includes" != "" ; then
-        echo "$ac_t""found $ac_find_includes" 1>&6
-    else
-        cat > conftest.$ac_ext <<EOF
-#line 8278 "configure"
+        if test "$ac_find_includes" != "" ; then
+            echo "$ac_t""found $ac_find_includes" 1>&6
+        else
+            cat > conftest.$ac_ext <<EOF
+#line 10275 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-                #include <Xm/Xm.h>
-            
+                    #include <Xm/Xm.h>
+                

 int main() {
 
 int main() {
 

-                int version;
+                    int version;

 
 

-                version = xmUseVersion;
-            
+                    version = xmUseVersion;
+                

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:8291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
   rm -rf conftest*
   

-                echo "$ac_t""found in default search path" 1>&6
-                COMPILED_X_PROGRAM=1
-            
+                    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*
   
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   

-                echo "$ac_t""no" 1>&6
-                { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; }
+                    echo "$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
 rm -f conftest*

-    fi
+        fi

 
 

-    if test "$COMPILED_X_PROGRAM" = 0; then
-        echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:8312: checking for Motif/Lesstif library" >&5
-        
+        if test "$COMPILED_X_PROGRAM" = 0; then
+            echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
+echo "configure:10309: checking for Motif/Lesstif library" >&5
+            

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do


@@ -8321,8 +10318,8 @@ for ac_dir in $SEARCH_LIB;
     done
   done
 
     done
   done
 

-        if test "$ac_find_libraries" != "" ; then
-            
+            if test "$ac_find_libraries" != "" ; then
+                

   ac_path_to_include=$ac_find_includes
   echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
   result=$?
   ac_path_to_include=$ac_find_includes
   echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
   result=$?


@@ -8332,7 +10329,7 @@ for ac_dir in $SEARCH_LIB;
     ac_path_to_include="-I$ac_find_includes"
   fi
 
     ac_path_to_include="-I$ac_find_includes"
   fi
 

-            
+                

   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then
   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then


@@ -8342,49 +10339,49 @@ for ac_dir in $SEARCH_LIB;
   fi
 
 
   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 8351 "configure"
+                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 10348 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-                    #include <Xm/Xm.h>
-                
+                        #include <Xm/Xm.h>
+                    

 int main() {
 
 int main() {
 

-                    int version;
+                        int version;

 
 

-                    version = xmUseVersion;
-                
+                        version = xmUseVersion;
+                    

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:8364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
   rm -rf conftest*
   

-                    echo "$ac_t""found in default search path" 1>&6
-                    COMPILED_X_PROGRAM=1
-                
+                        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*
   
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   

-                    echo "$ac_t""no" 1>&6
-                    { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
+                        echo "$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
 rm -f conftest*

+            fi

         fi
         fi

-    fi

 
 

-                                                                                                                            
-    XPM_LINK=""
-    echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:8387: checking for Xpm library" >&5
-    
+                                                                                                                                                                                                                                                        
+        XPM_LINK=""
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:10384: checking for Xpm library" >&5
+        

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do


@@ -8396,8 +10393,8 @@ for ac_dir in $SEARCH_LIB;
     done
   done
 
     done
   done
 

-    if test "$ac_find_libraries" != "" ; then
-        
+        if test "$ac_find_libraries" != "" ; then
+            

   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then
   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then


@@ -8406,94 +10403,117 @@ for ac_dir in $SEARCH_LIB;
     ac_path_to_link="-L$ac_find_libraries"
   fi
 
     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
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+            XPM_LINK="-lXpm "
+            cat >> confdefs.h <<\EOF

 #define wxHAVE_LIB_XPM 1
 EOF
 
 #define wxHAVE_LIB_XPM 1
 EOF
 

-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        cat > conftest.$ac_ext <<EOF
-#line 8419 "configure"
+            echo "$ac_t""found at $ac_find_libraries" 1>&6
+        else
+            cat > conftest.$ac_ext <<EOF
+#line 10416 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-                #include <X11/xpm.h>
-            
+                    #include <X11/xpm.h>
+                

 int main() {
 
 int main() {
 

-                int version;
+                    int version;

 
 

-                version = XpmLibraryVersion();
-            
+                    version = XpmLibraryVersion();
+                

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:8432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
   rm -rf conftest*
   

-               XPM_LINK="-lXpm "
-               cat >> confdefs.h <<\EOF
+                XPM_LINK="-lXpm "
+                cat >> confdefs.h <<\EOF

 #define wxHAVE_LIB_XPM 1
 EOF
 
 #define wxHAVE_LIB_XPM 1
 EOF
 

-                echo "$ac_t""found in default search path" 1>&6
-                COMPILED_X_PROGRAM=0
-            
+                    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*
   
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   

-                echo "$ac_t""no" 1>&6
-                echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+                    echo "$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
 rm -f conftest*

+        fi
+
+        GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
+        TOOLKIT=MOTIF
+        GUIDIST=MOTIF_DIST

     fi
 
     fi
 

-    GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11 -lm"
-    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
-    TOOLKIT=MOTIF
+    if test "$wxUSE_MAC" = 1; then
+        TOOLKIT=MAC
+                GUIDIST=MACX_DIST
+    fi

 
 

-    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
+    if test "$wxUSE_PM" = 1; then
+        TOOLKIT=PM
+        GUIDIST=GTK_DIST
+    fi

 
 

-if test "$wxUSE_PM" = 1; then
-    TOOLKIT=PM
+        if test "$TOOLKIT" != "PM" ; then
+        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
+    else
+        TOOLKIT_DIR="os2"
+    fi

 
 

-    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
-fi
+        TOOLKIT_NAME="${TOOLKIT_DIR}"

 
 

-if test "$TOOLKIT" != "PM" ; then
-    TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
-else
-    TOOLKIT_DIR="os2"
-fi
+        TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
+
+        if test "$TOOLKIT_NAME" = "motif"; then
+        TOOLKIT_VPATH="${TOOLKIT_VPATH}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+    fi
+
+        if test "$wxUSE_UNIVERSAL" = "yes"; then
+        TOOLKIT_NAME="${TOOLKIT_NAME}univ"
+        UNIV_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes"
+        TOOLKIT_VPATH="${UNIV_VPATH}${PATH_IFS}${TOOLKIT_VPATH}"
+        SETUPH_DIR="univ"
+    else
+        SETUPH_DIR="${TOOLKIT_DIR}"
+    fi
+
+        if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+        TOOLKIT_NAME="${TOOLKIT_NAME}d"
+    fi

 
         TOOLKIT_DEF="-D__WX${TOOLKIT}__"
 
         TOOLKIT_DEF="-D__WX${TOOLKIT}__"

+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__"
+    fi
+
+        WX_LIBRARY="wx_${TOOLKIT_NAME}"
+
+        if test "$wxUSE_UNIVERSAL" = "yes"; then
+        ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+    else
+        ALL_OBJECTS="\$(GUIOBJS)"
+    fi

 
 

-        WX_LIBRARY="wx_${TOOLKIT_DIR}"
+    ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
+
+    if test "$TOOLKIT" != "MSW"; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
+    fi

 
 

-        ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)"
+    if test "$wxUSE_HTML" = "yes"; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)"
+    fi

 
         if test "$TOOLKIT" != "MSW"; then
         if test "$wxUSE_ODBC" = "yes" ; then
 
         if test "$TOOLKIT" != "MSW"; then
         if test "$wxUSE_ODBC" = "yes" ; then


@@ -8513,9 +10533,30 @@ fi
     if test "$wxUSE_ZLIB" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
     fi
     if test "$wxUSE_ZLIB" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
     fi

-    ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)"
+    if test "$wxUSE_FREETYPE" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
+    fi
+
+        if test "$wxUSE_UNIVERSAL" = "yes"; then
+        ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS) \$(UNIVDEPS)"
+    else
+        ALL_DEPFILES="\$(GUIDEPS)"
+    fi
+
+    ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS)"
+
+    if test "$TOOLKIT" != "MSW"; then
+        ALL_DEPFILES="${ALL_DEPFILES} \$(UNIXDEPS)"
+    fi

 
 

-    PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
+    if test "$wxUSE_HTML" = "yes"; then
+        ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)"
+    fi
+
+        PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
+    fi

     RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
     RPM_SPEC="wx\$(TOOLKIT).spec"
 
     RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
     RPM_SPEC="wx\$(TOOLKIT).spec"
 


@@ -8524,17 +10565,24 @@ fi
 else
     USE_GUI=0
 
 else
     USE_GUI=0
 

-    TOOLKIT_DIR="base"
+        TOOLKIT_DIR="base"
+
+        if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+        TOOLKIT_NAME="${TOOLKIT_DIR}d"
+    else
+        TOOLKIT_NAME="${TOOLKIT_DIR}"
+    fi
+

     TOOLKIT_DEF="-D__WXBASE__"
 
     TOOLKIT_DEF="-D__WXBASE__"
 

-        ALL_OBJECTS="\$(BASE_OBJS) \${BASE_UNIX_OBJS}"
-    ALL_DEPFILES="\${BASE_DEPS} \${BASE_UNIX_DEPS}"
+        ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)"
+    ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)"

 
     if test "$wxUSE_ZLIB" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
     fi
 
 
     if test "$wxUSE_ZLIB" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
     fi
 

-        WX_LIBRARY="wxbase"
+        WX_LIBRARY="wx_${TOOLKIT_NAME}"

 
     PORT_FILES="src/files.lst"
     RPM_FILES="src/rpmfiles.lst"
 
     PORT_FILES="src/files.lst"
     RPM_FILES="src/rpmfiles.lst"


@@ -8565,6 +10613,7 @@ PIC_FLAG=
 WX_ALL=
 WX_ALL_INSTALLED=
 BURNT_LIBRARY_NAME=
 WX_ALL=
 WX_ALL_INSTALLED=
 BURNT_LIBRARY_NAME=

+WX_TARGET_LIBRARY_SONAME=

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


@@ -8574,12 +10623,15 @@ if test "$wxUSE_SHARED" = "yes"; then
             SHARED_LD="${CC} -shared -fPIC -o"
             PIC_FLAG="-fPIC"
         else
             SHARED_LD="${CC} -shared -fPIC -o"
             PIC_FLAG="-fPIC"
         else

+                        LDFLAGS="-L/usr/lib"
+

             SHARED_LD="${CXX} -b -o"
             PIC_FLAG="+Z"
         fi
             SHARED_LD="${CXX} -b -o"
             PIC_FLAG="+Z"
         fi

-        WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
-        WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_DIR}_gl.sl"
+        WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_NAME}.sl"
+        WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_NAME}_gl.sl"

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

+            WX_ALL_INSTALLED="preinstall_gl"

             WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
         else
             WX_ALL="${WX_LIBRARY_NAME_SHARED}"
             WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
         else
             WX_ALL="${WX_LIBRARY_NAME_SHARED}"


@@ -8592,6 +10644,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         if test "$wxUSE_BURNT_NAME" = "yes" ; then
             BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
             BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
         if test "$wxUSE_BURNT_NAME" = "yes" ; then
             BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
             BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"

+                        WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"

         fi
         if test "$wxUSE_OPENGL" = "yes"; then
             WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
         fi
         if test "$wxUSE_OPENGL" = "yes"; then
             WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"


@@ -8620,6 +10673,8 @@ if test "$wxUSE_SHARED" = "yes"; then
         if test "$GCC" = yes ; then
             SHARED_LD="${CC} -shared -o"
             PIC_FLAG="-fPIC"
         if test "$GCC" = yes ; then
             SHARED_LD="${CC} -shared -o"
             PIC_FLAG="-fPIC"

+
+                                    CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"

         else
             SHARED_LD="${CXX} -G -o"
             PIC_FLAG="-KPIC"
         else
             SHARED_LD="${CXX} -G -o"
             PIC_FLAG="-KPIC"


@@ -8638,11 +10693,36 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
       ;;
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
       ;;

-      *-*-freebsd* | *-*-netbsd*)
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* )

         SHARED_LD="${CC} -shared -o"
         PIC_FLAG="-fPIC"
         SHARED_LD="${CC} -shared -o"
         PIC_FLAG="-fPIC"

-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+        else
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+            WX_ALL="CREATE_LINKS"
+        fi
+      ;;
+      *-*-darwin* )
+        SHARED_LD="${CXX} -dynamiclib -o"
+        PIC_FLAG="-dynamic -fPIC"
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+        else
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+            WX_ALL="CREATE_LINKS"
+        fi
+                WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
+                WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+                WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}"
+        WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.dylib"
+        WX_LIBRARY_LINK3="lib${WX_LIBRARY}.dylib"
+        WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}"
+        WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
+        WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"

       ;;
       *-*-osf* )
         SHARED_LD="${CXX} -shared -o"
       ;;
       *-*-osf* )
         SHARED_LD="${CXX} -shared -o"


@@ -8666,15 +10746,25 @@ if test "$wxUSE_SHARED" = "yes"; then
         SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
         WX_ALL=${WX_LIBRARY_NAME_SHARED}
       ;;
         SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
         WX_ALL=${WX_LIBRARY_NAME_SHARED}
       ;;

-      *-*-cygwin32* )
+      *-*-cygwin* )

                 WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
         WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
                 WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
         WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"

-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="preinstall_gl"
+            WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+        else
+            WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+        fi

       ;;
       *-*-mingw32* )
                 WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
         WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
       ;;
       *-*-mingw32* )
                 WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
         WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"

-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="preinstall_gl"
+            WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+        else
+            WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+        fi

       ;;
       *-pc-os2_emx )
                 WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
       ;;
       *-pc-os2_emx )
                 WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"


@@ -8698,7 +10788,18 @@ if test "$wxUSE_SHARED" = "yes"; then
 else
         WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
     WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
 else
         WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
     WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"

-    WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+
+    if test "$wxUSE_OPENGL" = "yes"; then
+        WX_ALL_INSTALLED="preinstall_gl"
+        WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+    else
+        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+    fi
+
+        if test "$wxUSE_GUI" = "no"; then
+                WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
+    fi
+

     WX_TARGET_LIBRARY_TYPE="a"
 fi
 
     WX_TARGET_LIBRARY_TYPE="a"
 fi
 


@@ -8707,17 +10808,57 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:8711: checking for $ac_hdr" >&5
+echo "configure:10812: 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 10817 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10822: \"$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
+
+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:10852: 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
 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 8716 "configure"
+#line 10857 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10862: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -8747,17 +10888,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:8751: checking for $ac_hdr" >&5
+echo "configure:10892: 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
 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 8756 "configure"
+#line 10897 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10902: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -8787,17 +10928,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:8791: checking for $ac_hdr" >&5
+echo "configure:10932: 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
 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 8796 "configure"
+#line 10937 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10942: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -8827,17 +10968,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:8831: checking for $ac_hdr" >&5
+echo "configure:10972: 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
 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 8836 "configure"
+#line 10977 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10982: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -8867,17 +11008,97 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:8871: checking for $ac_hdr" >&5
+echo "configure:11012: 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 11017 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11022: \"$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
+
+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:11052: 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 11057 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11062: \"$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
+
+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:11092: 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
 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 8876 "configure"
+#line 11097 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11102: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -8910,17 +11131,17 @@ if test "$wxUSE_GUI" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:8914: checking for $ac_hdr" >&5
+echo "configure:11135: 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
 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 8919 "configure"
+#line 11140 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11145: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -8951,12 +11172,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6

-echo "configure:8955: checking for ANSI C header files" >&5
+echo "configure:11176: checking for ANSI C header files" >&5

 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 8960 "configure"
+#line 11181 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -8964,7 +11185,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11189: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -8981,7 +11202,7 @@ 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
 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 8985 "configure"
+#line 11206 "configure"

 #include "confdefs.h"
 #include <string.h>
 EOF
 #include "confdefs.h"
 #include <string.h>
 EOF


@@ -8999,7 +11220,7 @@ 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
 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 9003 "configure"
+#line 11224 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 #include "confdefs.h"
 #include <stdlib.h>
 EOF


@@ -9020,7 +11241,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
   :
 else
   cat > conftest.$ac_ext <<EOF

-#line 9024 "configure"
+#line 11245 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')


@@ -9031,7 +11252,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
 exit (0); }
 
 EOF

-if { (eval echo configure:9035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   :
 else
 then
   :
 else


@@ -9055,12 +11276,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6

-echo "configure:9059: checking for mode_t" >&5
+echo "configure:11280: 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
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 9064 "configure"
+#line 11285 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -9088,12 +11309,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6

-echo "configure:9092: checking for off_t" >&5
+echo "configure:11313: checking for off_t" >&5

 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 9097 "configure"
+#line 11318 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -9121,12 +11342,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6

-echo "configure:9125: checking for pid_t" >&5
+echo "configure:11346: checking for pid_t" >&5

 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 9130 "configure"
+#line 11351 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -9154,12 +11375,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6

-echo "configure:9158: checking for size_t" >&5
+echo "configure:11379: 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
 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 9163 "configure"
+#line 11384 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -9184,52 +11405,214 @@ if test $ac_cv_type_size_t = no; then
 #define size_t unsigned
 EOF
 
 #define size_t unsigned
 EOF
 

-fi
-
-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:9191: checking for uid_t in sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+fi
+
+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+echo "configure:11412: 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 11417 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "uid_t" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_uid_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_uid_t=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_type_uid_t" 1>&6
+if test $ac_cv_type_uid_t = no; then
+  cat >> confdefs.h <<\EOF
+#define uid_t int
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define gid_t int
+EOF
+
+fi
+
+
+echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
+echo "configure:11447: 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 11453 "configure"
+#include "confdefs.h"
+#include <wchar.h>
+int main() {
+
+            wchar_t wc, *ws;
+            wc = L'a';
+            ws = L"Hello, world!";
+        
+; return 0; }
+EOF
+if { (eval echo configure:11464: \"$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 11472 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+int main() {
+
+                wchar_t wc, *ws;
+                wc = L'a';
+                ws = L"Hello, world!";
+            
+; return 0; }
+EOF
+if { (eval echo configure:11483: \"$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*
+
+fi
+
+echo "$ac_t""$wx_cv_type_wchar_t" 1>&6
+
+if test "$wx_cv_type_wchar_t" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_WCHAR_T 1
+EOF
+
+fi
+
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
+echo "configure:11517: 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 11522 "configure"
+#include "confdefs.h"
+#include <stddef.h>
+int main() {
+
+            return 0; }
+
+            struct Foo { void foo(size_t); void foo(unsigned int); };
+
+            int bar() {
+        
+; return 0; }
+EOF
+if { (eval echo configure:11535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_size_t_is_uint=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_size_t_is_uint=yes
+    
+fi
+rm -f conftest*
+
+fi
+
+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:11558: 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
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 9196 "configure"
+#line 11563 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <sys/types.h>
+#include <stddef.h>
+int main() {
+
+                return 0; }
+
+                struct Foo { void foo(size_t); void foo(unsigned long); };
+
+                int bar() {
+            
+; return 0; }

 EOF
 EOF

-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "uid_t" >/dev/null 2>&1; then
+if { (eval echo configure:11576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   rm -rf conftest*

-  ac_cv_type_uid_t=yes
+  wx_cv_size_t_is_ulong=no

 else
 else

+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5

   rm -rf conftest*
   rm -rf conftest*

-  ac_cv_type_uid_t=no
+  wx_cv_size_t_is_ulong=yes
+        

 fi
 rm -f conftest*
 fi
 rm -f conftest*

-
+    

 fi
 
 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
+echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&6

 
 

-  cat >> confdefs.h <<\EOF
-#define gid_t int
+    if test "$wx_cv_size_t_is_ulong" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxSIZE_T_IS_ULONG 1

 EOF
 
 EOF
 

+    fi

 fi
 
 fi
 

+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_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_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6

-echo "configure:9227: checking for pw_gecos in struct passwd" >&5
+echo "configure:11610: checking for pw_gecos in struct passwd" >&5

 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF

-#line 9233 "configure"
+#line 11616 "configure"

 #include "confdefs.h"
 #include <pwd.h>
 int main() {
 #include "confdefs.h"
 #include <pwd.h>
 int main() {


@@ -9240,7 +11623,7 @@ int main() {
              
 ; return 0; }
 EOF
              
 ; return 0; }
 EOF

-if { (eval echo configure:9244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                 wx_cv_struct_pw_gecos=yes
   rm -rf conftest*
   
                 wx_cv_struct_pw_gecos=yes


@@ -9270,12 +11653,12 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6

-echo "configure:9274: checking for working const" >&5
+echo "configure:11657: 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
 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 9279 "configure"
+#line 11662 "configure"

 #include "confdefs.h"
 
 int main() {
 #include "confdefs.h"
 
 int main() {


@@ -9324,7 +11707,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:9328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_c_const=yes
 else
   rm -rf conftest*
   ac_cv_c_const=yes
 else


@@ -9345,21 +11728,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6

-echo "configure:9349: checking for inline" >&5
+echo "configure:11732: checking for inline" >&5

 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF

-#line 9356 "configure"
+#line 11739 "configure"

 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF

-if { (eval echo configure:9363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else


@@ -9386,7 +11769,7 @@ esac
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6

-echo "configure:9390: checking size of char" >&5
+echo "configure:11773: 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 eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -9394,7 +11777,7 @@ else
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF

-#line 9398 "configure"
+#line 11781 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -9405,7 +11788,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:9409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11792: \"$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
 then
   ac_cv_sizeof_char=`cat conftestval`
 else


@@ -9425,7 +11808,7 @@ EOF
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6

-echo "configure:9429: checking size of short" >&5
+echo "configure:11812: 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 eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -9433,7 +11816,7 @@ else
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF

-#line 9437 "configure"
+#line 11820 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -9444,7 +11827,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:9448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11831: \"$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
 then
   ac_cv_sizeof_short=`cat conftestval`
 else


@@ -9464,7 +11847,7 @@ EOF
 
 
 echo $ac_n "checking size of int *""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of int *""... $ac_c" 1>&6

-echo "configure:9468: checking size of int *" >&5
+echo "configure:11851: 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 eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -9472,7 +11855,7 @@ else
   ac_cv_sizeof_int_p=4
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_int_p=4
 else
   cat > conftest.$ac_ext <<EOF

-#line 9476 "configure"
+#line 11859 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -9483,7 +11866,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:9487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11870: \"$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
 then
   ac_cv_sizeof_int_p=`cat conftestval`
 else


@@ -9503,7 +11886,7 @@ EOF
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6

-echo "configure:9507: checking size of int" >&5
+echo "configure:11890: 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 eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -9511,7 +11894,7 @@ else
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF

-#line 9515 "configure"
+#line 11898 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -9522,7 +11905,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:9526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11909: \"$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
 then
   ac_cv_sizeof_int=`cat conftestval`
 else


@@ -9542,7 +11925,7 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6

-echo "configure:9546: checking size of long" >&5
+echo "configure:11929: 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 eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -9550,7 +11933,7 @@ else
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF

-#line 9554 "configure"
+#line 11937 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -9561,7 +11944,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:9565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11948: \"$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
 then
   ac_cv_sizeof_long=`cat conftestval`
 else


@@ -9581,7 +11964,7 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6

-echo "configure:9585: checking size of long long" >&5
+echo "configure:11968: 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 eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -9589,7 +11972,7 @@ else
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF

-#line 9593 "configure"
+#line 11976 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -9600,7 +11983,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:9604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11987: \"$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
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else


@@ -9620,15 +12003,67 @@ EOF
 
 
 
 
 
 

+echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
+echo "configure:12008: 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
+  
+    if test "$cross_compiling" = yes; then
+  wx_cv_sizeof_wchar_t=4
+    
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12018 "configure"
+#include "confdefs.h"
+
+            #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:12037: \"$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 -fr conftest*
+  wx_cv_sizeof_wchar_t=0
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+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 $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6

-echo "configure:9625: checking whether byte ordering is bigendian" >&5
+echo "configure:12060: checking whether byte ordering is bigendian" >&5

 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF

-#line 9632 "configure"
+#line 12067 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>


@@ -9639,11 +12074,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
 #endif
 ; return 0; }
 EOF

-if { (eval echo configure:9643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12078: \"$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
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF

-#line 9647 "configure"
+#line 12082 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>


@@ -9654,7 +12089,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
 #endif
 ; return 0; }
 EOF

-if { (eval echo configure:9658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else


@@ -9674,7 +12109,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian=unknown
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_c_bigendian=unknown
 else
   cat > conftest.$ac_ext <<EOF

-#line 9678 "configure"
+#line 12113 "configure"

 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */


@@ -9687,7 +12122,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF

-if { (eval echo configure:9691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12126: \"$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
 then
   ac_cv_c_bigendian=no
 else


@@ -9734,17 +12169,17 @@ cross_compiling=$ac_cv_prog_cxx_cross
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9738: checking for $ac_hdr" >&5
+echo "configure:12173: 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
 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 9743 "configure"
+#line 12178 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12183: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9771,13 +12206,13 @@ fi
 done
 
 
 done
 
 

-    if test "x$HAVE_IOSTREAM" = x ; then
+    if test "$ac_cv_header_iostream" = "yes" ; then
+      :
+    else

       cat >> confdefs.h <<\EOF
 #define wxUSE_IOSTREAMH 1
 EOF
 
       cat >> confdefs.h <<\EOF
 #define wxUSE_IOSTREAMH 1
 EOF
 

-    else
-      :

     fi
 
     ac_ext=c
     fi
 
     ac_ext=c


@@ -9792,7 +12227,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 
   echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
 
 
   echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6

-echo "configure:9796: checking if C++ compiler supports bool" >&5
+echo "configure:12231: 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
 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -9807,7 +12242,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
     cat > conftest.$ac_ext <<EOF
 
 
     cat > conftest.$ac_ext <<EOF

-#line 9811 "configure"
+#line 12246 "configure"

 #include "confdefs.h"
 
       
 #include "confdefs.h"
 
       


@@ -9819,13 +12254,9 @@ int main() {
       
 ; return 0; }
 EOF
       
 ; return 0; }
 EOF

-if { (eval echo configure:9823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
   rm -rf conftest*
   

-        cat >> confdefs.h <<\EOF
-#define HAVE_BOOL 1
-EOF
-

         wx_cv_cpp_bool=yes
       
 else
         wx_cv_cpp_bool=yes
       
 else


@@ -9860,52 +12291,8 @@ EOF
 
 
 
 
 
 

-echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6
-echo "configure:9865: checking if you need GNU extensions" >&5
-if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 9871 "configure"
-#include "confdefs.h"
-#include <features.h>
-int main() {
-
-
-#ifndef __GNU_LIBRARY__
- Compile error wanted
-#endif
-
-
-; return 0; }
-EOF
-if { (eval echo configure:9884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  wx_cv_gnu_extensions=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_gnu_extensions=no
-fi
-rm -f conftest*
-
-fi
-
-
-echo "$ac_t""$wx_cv_gnu_extensions" 1>&6
-if test "$wx_cv_gnu_extensions" = "yes"; then
-  cat >> confdefs.h <<EOF
-#define _GNU_SOURCE 1
-EOF
-
-fi
-
-
-

 echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
 echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6

-echo "configure:9909: checking for wcslen in -lc" >&5
+echo "configure:12296: 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
 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


@@ -9913,7 +12300,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 9917 "configure"
+#line 12304 "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
 #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


@@ -9924,7 +12311,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
 wcslen()
 ; return 0; }
 EOF

-if { (eval echo configure:9928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12315: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -9950,7 +12337,7 @@ else
   echo "$ac_t""no" 1>&6
 
             echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
   echo "$ac_t""no" 1>&6
 
             echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6

-echo "configure:9954: checking for wcslen in -lw" >&5
+echo "configure:12341: 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
 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


@@ -9958,7 +12345,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 9962 "configure"
+#line 12349 "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
 #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


@@ -9969,7 +12356,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
 wcslen()
 ; return 0; }
 EOF

-if { (eval echo configure:9973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12360: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -10000,12 +12387,12 @@ fi
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6

-echo "configure:10004: checking for vprintf" >&5
+echo "configure:12391: checking for vprintf" >&5

 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 10009 "configure"
+#line 12396 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */


@@ -10028,92 +12415,312 @@ vprintf();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   rm -rf conftest*
   eval "ac_cv_func_vprintf=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_func_vprintf=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_VPRINTF 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test "$ac_cv_func_vprintf" != yes; then
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+echo "configure:12443: checking for _doprnt" >&5
+if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12448 "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();
+
+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
+
+; return 0; }
+EOF
+if { (eval echo configure:12471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func__doprnt=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func__doprnt=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_DOPRNT 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+
+
+
+
+
+echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
+echo "configure:12502: 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 12508 "configure"
+#include "confdefs.h"
+
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                 
+int main() {
+
+                    int wx_test_vsnprintf(const char *, ...);
+
+                    wx_test_vsnprintf("%s");
+                    return 0;
+                 }
+
+                 int wx_test_vsnprintf(const char *fmt, ...)
+                 {
+                    char *s;
+
+                    va_list argp;
+                    va_start(argp, fmt);
+                    vsnprintf(s, 42, fmt, argp);
+                    va_end(argp);
+                 
+; return 0; }
+EOF
+if { (eval echo configure:12533: \"$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 12544 "configure"
+#include "confdefs.h"
+
+                                      #include <stdio.h>
+                                      #include <stdarg.h>
+                                   
+int main() {
+
+                                      int wx_test_vsnprintf(const char *, ...);
+
+                                      wx_test_vsnprintf("%s");
+                                      return 0;
+                                   }
+
+                                   int wx_test_vsnprintf(const char *fmt, ...)
+                                   {
+                                      char *s;
+
+                                      va_list argp;
+                                      va_start(argp, fmt);
+                                      _vsnprintf(s, 42, fmt, argp);
+                                      va_end(argp);
+                                   
+; return 0; }
+EOF
+if { (eval echo configure:12569: \"$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*
+
+fi
+
+echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6
+
+if test "$wx_cv_func_vsnprintf" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF 1
+EOF
+
+else
+    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:12601: 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 12607 "configure"
+#include "confdefs.h"
+
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                
+int main() {
+
+                    int wx_test_vsscanf(const char *, ...);
+
+                    wx_test_vsscanf("%d");
+                    return 0;
+                }
+
+                int wx_test_vsscanf(const char *fmt, ...)
+                {
+                    va_list argp;
+                    va_start(argp, fmt);
+                    vsscanf("42", fmt, argp);
+                    va_end(argp);
+                
+; return 0; }
+EOF
+if { (eval echo configure:12630: \"$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*
 fi
 rm -f conftest*

+

 fi
 
 fi
 

-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_VPRINTF 1
+echo "$ac_t""$wx_cv_func_vsscanf" 1>&6
+
+if test "$wx_cv_func_vsscanf" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_VSSCANF 1

 EOF
 
 EOF
 

-else
-  echo "$ac_t""no" 1>&6

 fi
 
 fi
 

-if test "$ac_cv_func_vprintf" != yes; then
-echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:10056: checking for _doprnt" >&5
-if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+if test "$TOOLKIT" != "MSW"; then
+
+
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6
+echo "configure:12668: 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
   echo $ac_n "(cached) $ac_c" 1>&6
 else

-  cat > conftest.$ac_ext <<EOF
-#line 10061 "configure"
+  
+    cat > conftest.$ac_ext <<EOF
+#line 12674 "configure"

 #include "confdefs.h"
 #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();
-
+#include <iconv.h>

 int main() {
 
 int main() {
 

-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-_doprnt();
-#endif
-
+        char **inbuf, **outbuf;
+        iconv_t cd;
+        size_t insz, outsz;
+        iconv(cd, inbuf, &insz, outbuf, &outsz);
+    

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:10084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   rm -rf conftest*

-  eval "ac_cv_func__doprnt=yes"
+  wx_cv_iconv_takes_char=yes

 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*

-  eval "ac_cv_func__doprnt=no"
+  wx_cv_iconv_takes_char=no

 fi
 rm -f conftest*
 fi
 rm -f conftest*

+

 fi
 
 fi
 

-if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_DOPRNT 1
-EOF
+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

 
 

-else
-  echo "$ac_t""no" 1>&6
-fi
+if test "$wx_cv_iconv_takes_char" = yes ; then
+    cat >> confdefs.h <<\EOF
+#define WX_ICONV_TAKES_CHAR 1
+EOF

 
 fi
 
 
 
 fi
 
 

-for ac_func in vsnprintf
+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
+    for ac_func in sigaction

 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:10112: checking for $ac_func" >&5
+echo "configure:12719: 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
 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 10117 "configure"
+#line 12724 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -10136,7 +12743,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12747: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -10154,20 +12761,21 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF

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

 else
   echo "$ac_t""no" 1>&6
 else
   echo "$ac_t""no" 1>&6

-echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
-              

 fi
 done
 
 
 fi
 done
 
 

+    if test "$ac_cv_func_sigaction" = "no"; then
+        echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&2
+        wxUSE_ON_FATAL_EXCEPTION=no
+    fi

 
 

-ac_ext=C
+    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'
 # 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'


@@ -10175,68 +12783,45 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 
 cross_compiling=$ac_cv_prog_cxx_cross
 
 

-echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:10180: checking for vsscanf" >&5
-if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
+      echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6
+echo "configure:12788: 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
   
   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 10190 "configure"
+        cat > conftest.$ac_ext <<EOF
+#line 12794 "configure"

 #include "confdefs.h"
 #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);
+#include <signal.h>
+int main() {

 
 

-                  va_end(ap);
-                }
+                        extern void testSigHandler(int);

 
 

-                int main()
-                {
-                  int i;
-                  try_vsscanf("%d", &i);
-                  return i == 17 ? 0 : 1;
-                }
-             
+                        struct sigaction sa;
+                        sa.sa_handler = testSigHandler;
+                     
+; return 0; }

 EOF
 EOF

-if { (eval echo configure:10217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+if { (eval echo configure:12806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*

   
   

-                cat >> confdefs.h <<\EOF
-#define HAVE_VSSCANF 1
-EOF
-
-                wx_cv_func_vsscanf=yes
-             
+                        wx_cv_type_sa_handler=int
+                     

 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5

-  rm -fr conftest*
-  wx_cv_func_vsscanf=no
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  
+                        wx_cv_type_sa_handler=void
+                     

 fi
 fi

-
-
+rm -f conftest*
+      

 fi
 
 fi
 

-echo "$ac_t""$wx_cv_func_vsscanf" 1>&6
+echo "$ac_t""$wx_cv_type_sa_handler" 1>&6

 
 

-ac_ext=c
+      ac_ext=c

 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 # 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'


@@ -10244,18 +12829,22 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
 
 cross_compiling=$ac_cv_prog_cc_cross
 
 

-if test "$TOOLKIT" != "MSW"; then
+      cat >> confdefs.h <<EOF
+#define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler
+EOF

 
 

-if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
-    for ac_func in sigaction
+    fi
+fi
+
+for ac_func in vfork

 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:10254: checking for $ac_func" >&5
+echo "configure:12843: 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
 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 10259 "configure"
+#line 12848 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -10278,7 +12867,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12871: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -10303,21 +12892,78 @@ fi
 done
 
 
 done
 
 

-    if test "$ac_cv_func_sigaction" = "no"; then
-        echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&2
-        wxUSE_ON_FATAL_EXCEPTION=no
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+    for ac_func in fcntl flock
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:12900: 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 12905 "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:12928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ break
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+    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
 
     fi
 fi
 

-for ac_func in vfork
+for ac_func in timegm

 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:10316: checking for $ac_func" >&5
+echo "configure:12962: 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
 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 10321 "configure"
+#line 12967 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -10340,7 +12986,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12990: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -10365,15 +13011,15 @@ fi
 done
 
 
 done
 
 

-for ac_func in timegm
+for ac_func in putenv setenv

 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:10372: checking for $ac_func" >&5
+echo "configure:13018: 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
 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 10377 "configure"
+#line 13023 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -10396,7 +13042,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13046: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -10414,7 +13060,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF

- 
+ break

 else
   echo "$ac_t""no" 1>&6
 fi
 else
   echo "$ac_t""no" 1>&6
 fi


@@ -10430,17 +13076,25 @@ EOF
     HAVE_SOME_SLEEP_FUNC=1
 fi
 
     HAVE_SOME_SLEEP_FUNC=1
 fi
 

+if test "$USE_MAC" = 1; then
+            cat >> confdefs.h <<\EOF
+#define HAVE_USLEEP 1
+EOF
+
+    HAVE_SOME_SLEEP_FUNC=1
+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
 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:10439: checking for $ac_func" >&5
+echo "configure:13093: 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
 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 10444 "configure"
+#line 13098 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -10463,7 +13117,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13121: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -10488,7 +13142,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6

-echo "configure:10492: checking for nanosleep in -lposix4" >&5
+echo "configure:13146: 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
 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


@@ -10496,7 +13150,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 10500 "configure"
+#line 13154 "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
 #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


@@ -10507,7 +13161,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
 nanosleep()
 ; return 0; }
 EOF

-if { (eval echo configure:10511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13165: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -10535,12 +13189,12 @@ else
                     for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
                     for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:10539: checking for $ac_func" >&5
+echo "configure:13193: 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
 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 10544 "configure"
+#line 13198 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -10563,7 +13217,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13221: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -10581,13 +13235,17 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
   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
 else
   echo "$ac_t""no" 1>&6

+echo "configure: warning: wxSleep() function will not work" 1>&2
+                    

 fi
 done
 
 fi
 done
 

-                    echo "configure: warning: wxSleep() function will not work" 1>&2

                 
             
 fi
                 
             
 fi


@@ -10602,12 +13260,12 @@ fi
 for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:10606: checking for $ac_func" >&5
+echo "configure:13264: 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
 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 10611 "configure"
+#line 13269 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -10630,7 +13288,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13292: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -10667,12 +13325,12 @@ 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
 for ac_func in strtok_r
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:10671: checking for $ac_func" >&5
+echo "configure:13329: 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
 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 10676 "configure"
+#line 13334 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -10698,7 +13356,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13360: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -10735,12 +13393,12 @@ INET_LINK=
 for ac_func in inet_addr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in inet_addr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:10739: checking for $ac_func" >&5
+echo "configure:13397: 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
 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 10744 "configure"
+#line 13402 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -10763,7 +13421,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13425: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -10788,7 +13446,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6

-echo "configure:10792: checking for inet_addr in -lnsl" >&5
+echo "configure:13450: 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
 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


@@ -10796,7 +13454,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 10800 "configure"
+#line 13458 "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
 #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


@@ -10807,7 +13465,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
 inet_addr()
 ; return 0; }
 EOF

-if { (eval echo configure:10811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13469: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -10826,7 +13484,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6

-echo "configure:10830: checking for inet_addr in -lresolv" >&5
+echo "configure:13488: 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
 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


@@ -10834,7 +13492,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 10838 "configure"
+#line 13496 "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
 #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


@@ -10845,7 +13503,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
 inet_addr()
 ; return 0; }
 EOF

-if { (eval echo configure:10849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13507: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -10878,12 +13536,12 @@ done
 for ac_func in inet_aton
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in inet_aton
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:10882: checking for $ac_func" >&5
+echo "configure:13540: 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
 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 10887 "configure"
+#line 13545 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -10906,7 +13564,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13568: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -10931,7 +13589,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
             echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 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:10935: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:13593: 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
 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


@@ -10939,7 +13597,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$INET_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$INET_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 10943 "configure"
+#line 13601 "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
 #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


@@ -10950,7 +13608,7 @@ int main() {
 inet_aton()
 ; return 0; }
 EOF
 inet_aton()
 ; return 0; }
 EOF

-if { (eval echo configure:10954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13612: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11056,16 +13714,22 @@ fi
 
 if test "$wxUSE_THREADS" = "yes" ; then
     
 
 if test "$wxUSE_THREADS" = "yes" ; then
     

-                echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:11061: checking for pthread_create in -lpthread" >&5
-ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+        if test "$USE_AIX" = 1; then
+        THREADS_LIB=pthreads
+    else
+        THREADS_LIB=pthread
+    fi
+
+                echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
+echo "configure:13725: 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_save_LIBS="$LIBS"
 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="-l$THREADS_LIB  $LIBS"

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 11069 "configure"
+#line 13733 "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
 #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


@@ -11076,7 +13740,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
 pthread_create()
 ; return 0; }
 EOF

-if { (eval echo configure:11080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13744: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11093,13 +13757,13 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
             THREADS_OBJ="threadpsx.lo"
   echo "$ac_t""yes" 1>&6
   
             THREADS_OBJ="threadpsx.lo"

-            THREADS_LINK="pthread"
+            THREADS_LINK=$THREADS_LIB

         
 else
   echo "$ac_t""no" 1>&6
 
                         echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
         
 else
   echo "$ac_t""no" 1>&6
 
                         echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6

-echo "configure:11103: checking for pthread_create in -lc_r" >&5
+echo "configure:13767: 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
 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


@@ -11107,7 +13771,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 11111 "configure"
+#line 13775 "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
 #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


@@ -11118,7 +13782,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
 pthread_create()
 ; return 0; }
 EOF

-if { (eval echo configure:11122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13786: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11142,17 +13806,17 @@ else
 
                                 ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
 
                                 ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6

-echo "configure:11146: checking for sys/prctl.h" >&5
+echo "configure:13810: 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
 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 11151 "configure"
+#line 13815 "configure"

 #include "confdefs.h"
 #include <sys/prctl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <sys/prctl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:11156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13820: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -11192,12 +13856,12 @@ if test "$wxUSE_THREADS" = "yes" ; then
   for ac_func in thr_setconcurrency
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
   for ac_func in thr_setconcurrency
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11196: checking for $ac_func" >&5
+echo "configure:13860: 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
 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 11201 "configure"
+#line 13865 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -11220,7 +13884,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13888: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -11250,17 +13914,17 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:11254: checking for $ac_hdr" >&5
+echo "configure:13918: 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
 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 11259 "configure"
+#line 13923 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:11264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13928: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -11288,7 +13952,7 @@ done
 
 
   echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
 
 
   echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6

-echo "configure:11292: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:13956: 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
 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


@@ -11296,7 +13960,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 11300 "configure"
+#line 13964 "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
 #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


@@ -11307,7 +13971,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
 sched_yield()
 ; return 0; }
 EOF

-if { (eval echo configure:11311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13975: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11328,16 +13992,16 @@ EOF
 
 else
   echo "$ac_t""no" 1>&6
 
 else
   echo "$ac_t""no" 1>&6

-echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
-echo "configure:11333: checking for sched_yield in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
+echo "configure:13997: 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"
 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"
+LIBS="-lposix4  $LIBS"

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 11341 "configure"
+#line 14005 "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
 #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


@@ -11348,7 +14012,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
 sched_yield()
 ; return 0; }
 EOF

-if { (eval echo configure:11352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14016: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11373,31 +14037,102 @@ echo "configure: warning: wxThread::Yield will not work properly" 1>&2
                 
 fi
 
                 
 fi
 

-               
+               
+fi
+
+
+              HAVE_PRIOR_FUNCS=0
+  echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14047: 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 14055 "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:14066: \"$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
+  echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14082: 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 14090 "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:14101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+

 fi
 fi

-
-
-                echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:11382: 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`\" = 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:14117: 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
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
 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 11390 "configure"
+#line 14125 "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.  */
 #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();
+char sched_get_priority_max();

 
 int main() {
 
 int main() {

-pthread_attr_getschedpolicy()
+sched_get_priority_max()

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:11401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14136: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11412,33 +14147,30 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 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
-
+  HAVE_PRIOR_FUNCS=1

 else
   echo "$ac_t""no" 1>&6
 else
   echo "$ac_t""no" 1>&6

-echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6
-echo "configure:11423: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
+echo "configure:14155: 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
   ac_save_LIBS="$LIBS"
 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"
+LIBS="-lposix4  $LIBS"

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 11431 "configure"
+#line 14163 "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.  */
 #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();
+char sched_get_priority_max();

 
 int main() {
 
 int main() {

-pthread_attr_getschedpolicy()
+sched_get_priority_max()

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:11442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11453,22 +14185,39 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 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"
+  
+                            HAVE_PRIOR_FUNCS=1
+                            POSIX4_LINK="-lposix4"
+                         
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+                   
+fi
+
+                 

 else
   echo "$ac_t""no" 1>&6
 else
   echo "$ac_t""no" 1>&6

-echo "configure: warning: Setting thread priority will not work" 1>&2
-                

 fi
 
                
 fi
 
                

+else
+  echo "$ac_t""no" 1>&6

 fi
 
 
 fi
 
 

+  if test "$HAVE_PRIOR_FUNCS" = 1; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
+EOF
+
+  else
+    echo "configure: warning: Setting thread priority will not work" 1>&2
+  fi
+

   echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
   echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6

-echo "configure:11472: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:14221: 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
 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


@@ -11476,7 +14225,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 11480 "configure"
+#line 14229 "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
 #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


@@ -11487,7 +14236,7 @@ int main() {
 pthread_cancel()
 ; return 0; }
 EOF
 pthread_cancel()
 ; return 0; }
 EOF

-if { (eval echo configure:11491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14240: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11513,13 +14262,13 @@ fi
 
 
   echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
 
 
   echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6

-echo "configure:11517: checking for pthread_cleanup_push/pop" >&5
+echo "configure:14266: 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
 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 11523 "configure"
+#line 14272 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 #include "confdefs.h"
 #include <pthread.h>
 int main() {


@@ -11529,14 +14278,10 @@ int main() {
                  
 ; return 0; }
 EOF
                  
 ; return 0; }
 EOF

-if { (eval echo configure:11533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                     wx_cv_func_pthread_cleanup_push=yes
   rm -rf conftest*
   
                     wx_cv_func_pthread_cleanup_push=yes

-                    cat >> confdefs.h <<\EOF
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-EOF
-

                  
 else
   echo "configure: failed program was:" >&5
                  
 else
   echo "configure: failed program was:" >&5


@@ -11552,7 +14297,109 @@ fi
 
 echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6
 
 
 echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6
 

+  if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
+EOF
+
+  fi
+
+                
+  echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
+echo "configure:14310: 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 14316 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
+
+           pthread_mutexattr_t attr;
+           pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+        
+; return 0; }
+EOF
+if { (eval echo configure:14326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+           wx_cv_type_pthread_mutexattr_t=yes
+        
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+           wx_cv_type_pthread_mutexattr_t=no
+        
+    
+fi
+rm -f conftest*
+  
+fi
+
+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_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
+echo "configure:14353: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+        cat > conftest.$ac_ext <<EOF
+#line 14359 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
+
+                pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+            
+; return 0; }
+EOF
+if { (eval echo configure:14368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                wx_cv_type_pthread_rec_mutex_init=yes
+            
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                wx_cv_type_pthread_rec_mutex_init=no
+            
+        
+fi
+rm -f conftest*
+    
+fi
+
+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
+
+    else
+            echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2
+    fi
+  fi
+

   THREADS_LINK="-l$THREADS_LINK"
   THREADS_LINK="-l$THREADS_LINK"

+
+      if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
+      CFLAGS="${CFLAGS} -mt"
+      CXXFLAGS="${CXXFLAGS} -mt"
+      LDFLAGS="${LDFLAGS} -mt"
+  fi

 fi
 
 fi
 fi
 
 fi


@@ -11563,14 +14410,16 @@ if test "$wxUSE_THREADS" = "yes"; then
 EOF
 
 
 EOF
 
 

+    if test "$wxUSE_MAC" = "0"; then

     CFLAGS="${CFLAGS} -D_REENTRANT"
     CFLAGS="${CFLAGS} -D_REENTRANT"

-  CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+    CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+  fi

 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
       if test "$ac_cv_func_strtok_r" = "yes"; then
     echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
       if test "$ac_cv_func_strtok_r" = "yes"; then
     echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6

-echo "configure:11574: checking if -D_REENTRANT is needed" >&5
+echo "configure:14423: 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"
     if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
         CFLAGS="${CFLAGS} -D_REENTRANT"
         CXXFLAGS="${CXXFLAGS} -D_REENTRANT"


@@ -11581,9 +14430,9 @@ echo "configure:11574: checking if -D_REENTRANT is needed" >&5
   fi
 fi
 
   fi
 fi
 

-if test "$WXGTK13" = 1 ; then
+if test "$WXGTK20" = 1 ; then

   cat >> confdefs.h <<EOF
   cat >> confdefs.h <<EOF

-#define __WXGTK13__ $WXGTK13
+#define __WXGTK20__ $WXGTK20

 EOF
 
   WXGTK12=1
 EOF
 
   WXGTK12=1


@@ -11596,10 +14445,89 @@ EOF
 
 fi
 
 
 fi
 

+if test "$WXGTK127" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK127__ $WXGTK127
+EOF
+
+fi
+

 if test "$WXWINE" = 1 ; then
   TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
 fi
 
 if test "$WXWINE" = 1 ; then
   TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
 fi
 

+if test "$wxUSE_MAC" = 1 ; then
+  TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__POWERPC__ -DTARGET_CARBON"
+  CFLAGS="${CFLAGS} -fno-common -fpascal-strings"
+  CPPFLAGS="${CPPFLAGS} -cpp-precomp -fno-common -fpascal-strings"
+  # 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:14467: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_REZ'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$REZ"; then
+  ac_cv_prog_REZ="$REZ" # 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_REZ="Rez"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
+fi
+fi
+REZ="$ac_cv_prog_REZ"
+if test -n "$REZ"; then
+  echo "$ac_t""$REZ" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  # Extract the first word of "Derez", so it can be a program name with args.
+set dummy Derez; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:14497: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$DEREZ"; then
+  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_DEREZ="Derez"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez"
+fi
+fi
+DEREZ="$ac_cv_prog_DEREZ"
+if test -n "$DEREZ"; then
+  echo "$ac_t""$DEREZ" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  RESCOMP=${REZ}
+  REZFLAGS="-d __UNIX__ -useDF"
+  DEREZFLAGS="Carbon.r -useDF"
+  RESFLAGS="Carbon.r -t APPL"
+  LIBWXMACRES="\$(LIBWX_MACRES)"
+  LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)"
+fi
+

 if test "$wxUSE_CYGWIN" = 1 ; then
   TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__"
 fi
 if test "$wxUSE_CYGWIN" = 1 ; then
   TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__"
 fi


@@ -11655,12 +14583,13 @@ fi
 
 DEP_INFO_FLAGS=
 CODE_GEN_FLAGS=
 
 DEP_INFO_FLAGS=
 CODE_GEN_FLAGS=

+CODE_GEN_FLAGS_CXX=

 if test "$GCC" = yes ; then
     if test "$wxUSE_NO_RTTI" = "yes" ; then
 if test "$GCC" = yes ; then
     if test "$wxUSE_NO_RTTI" = "yes" ; then

-        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-rtti"
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti"

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

-        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-exceptions"
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions"

     fi
     if test "$wxUSE_PERMISSIVE" = "yes" ; then
        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
     fi
     if test "$wxUSE_PERMISSIVE" = "yes" ; then
        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"


@@ -11688,6 +14617,22 @@ else
     fi
 fi
 
     fi
 fi
 

+if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define WXWIN_COMPATIBILITY_2 1
+EOF
+
+
+    WXWIN_COMPATIBILITY_2_2="yes"
+fi
+
+if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define WXWIN_COMPATIBILITY_2_2 1
+EOF
+
+fi
+

 
 ZLIB_INCLUDE=
 if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
 
 ZLIB_INCLUDE=
 if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then


@@ -11701,17 +14646,17 @@ EOF
     ZLIB_LINK=
     ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
     ZLIB_LINK=
     ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for zlib.h""... $ac_c" 1>&6

-echo "configure:11705: checking for zlib.h" >&5
+echo "configure:14650: 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
 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 11710 "configure"
+#line 14655 "configure"

 #include "confdefs.h"
 #include <zlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <zlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:11715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14660: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -11728,7 +14673,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6

-echo "configure:11732: checking for deflate in -lz" >&5
+echo "configure:14677: 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
 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


@@ -11736,7 +14681,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 11740 "configure"
+#line 14685 "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
 #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


@@ -11747,7 +14692,7 @@ int main() {
 deflate()
 ; return 0; }
 EOF
 deflate()
 ; return 0; }
 EOF

-if { (eval echo configure:11751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14696: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11794,17 +14739,17 @@ EOF
     PNG_LINK=
     ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
     PNG_LINK=
     ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6

-echo "configure:11798: checking for png.h" >&5
+echo "configure:14743: 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
 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 11803 "configure"
+#line 14748 "configure"

 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:11808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14753: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -11821,7 +14766,7 @@ 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
 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:11825: checking for png_check_sig in -lpng" >&5
+echo "configure:14770: 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
 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


@@ -11829,7 +14774,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF

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


@@ -11840,7 +14785,7 @@ int main() {
 png_check_sig()
 ; return 0; }
 EOF
 png_check_sig()
 ; return 0; }
 EOF

-if { (eval echo configure:11844: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11865,37 +14810,130 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
   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; }
+    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
+
+JPEG_INCLUDE=
+if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LIBJPEG 1
+EOF
+
+  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:14833: 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 14838 "configure"
+#include "confdefs.h"
+
+                #undef HAVE_STDLIB_H
+                #include <stdio.h>
+                #include <jpeglib.h>
+            
+int main() {
+
+            
+; return 0; }
+EOF
+if { (eval echo configure:14850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_header_jpeglib_h=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_jpeglib_h=no
+        
+fi
+rm -f conftest*
+    
+fi
+
+    echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6
+
+    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:14868: 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="-ljpeg  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14876 "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 jpeg_read_header();
+
+int main() {
+jpeg_read_header()
+; return 0; }
+EOF
+if { (eval echo configure:14887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  JPEG_LINK="-ljpeg"
+else
+  echo "$ac_t""no" 1>&6
+fi
+

     fi
     fi

-  fi

 
 

-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
+    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
 
 fi
 

-JPEG_INCLUDE=
-if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then
+TIFF_INCLUDE=
+if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then

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

-#define wxUSE_LIBJPEG 1
+#define wxUSE_LIBTIFF 1

 EOF
 
 EOF
 

-  if test "$wxUSE_LIBJPEG" = "yes" ; then
-    JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
+  if test "$wxUSE_LIBTIFF" = "yes" ; then
+    TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"

   else
   else

-    JPEG_LINK=
-    ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:11889: checking for jpeglib.h" >&5
+    TIFF_LINK=
+    ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
+echo "configure:14927: 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
 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 11894 "configure"
+#line 14932 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <jpeglib.h>
+#include <tiffio.h>

 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:11899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14937: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -11911,27 +14949,27 @@ rm -f conftest*
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6

-  echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:11916: checking for jpeg_read_header in -ljpeg" >&5
-ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
+  echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6
+echo "configure:14954: 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"
 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="-ljpeg  $LIBS"
+LIBS="-ltiff -lm $LIBS"

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 11924 "configure"
+#line 14962 "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.  */
 #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 jpeg_read_header();
+char TIFFError();

 
 int main() {
 
 int main() {

-jpeg_read_header()
+TIFFError()

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:11935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14973: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11946,7 +14984,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6

-  JPEG_LINK="-ljpeg"
+  TIFF_LINK="-ltiff"

 else
   echo "$ac_t""no" 1>&6
 fi
 else
   echo "$ac_t""no" 1>&6
 fi


@@ -11955,35 +14993,35 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
   echo "$ac_t""no" 1>&6
 fi
 

-    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; }
+    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
 
     fi
   fi
 fi
 

-TIFF_INCLUDE=
-if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then
+FREETYPE_INCLUDE=
+if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then

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

-#define wxUSE_LIBTIFF 1
+#define wxUSE_FREETYPE 1

 EOF
 
 EOF
 

-  if test "$wxUSE_LIBTIFF" = "yes" ; then  
-    TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
+  if test "$wxUSE_FREETYPE" = "yes" ; then
+    FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype"

   else
   else

-    TIFF_LINK=
-    ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:11977: checking for tiffio.h" >&5
+    FREETYPE_LINK=
+    ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
+echo "configure:15015: 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
 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 11982 "configure"
+#line 15020 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <tiffio.h>
+#include <freetype.h>

 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:11987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15025: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -11999,27 +15037,27 @@ rm -f conftest*
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 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:12004: checking for TIFFError in -ltiff" >&5
-ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
+  echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6
+echo "configure:15042: 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"
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"

-LIBS="-ltiff -lm $LIBS"
+LIBS="-lfreetype -lm $LIBS"

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 12012 "configure"
+#line 15050 "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.  */
 #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 TIFFError();
+char FT_Render_Glyph();

 
 int main() {
 
 int main() {

-TIFFError()
+FT_Render_Glyph()

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:12023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15061: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12034,17 +15072,18 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6

-  TIFF_LINK="-ltiff"
+  FREETYPE_LINK="-lfreetype"

 else
   echo "$ac_t""no" 1>&6
 fi
 
 else
   echo "$ac_t""no" 1>&6
 fi
 

+                   

 else
   echo "$ac_t""no" 1>&6
 fi
 
 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; }
+    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
     fi
   fi
 fi


@@ -12052,17 +15091,17 @@ fi
 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
 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:12056: checking for GL/gl.h" >&5
+echo "configure:15095: 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
 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 12061 "configure"
+#line 15100 "configure"

 #include "confdefs.h"
 #include <GL/gl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <GL/gl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:12066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15105: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -12088,7 +15127,7 @@ EOF
 EOF
 
     echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
 EOF
 
     echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6

-echo "configure:12092: checking for glFlush in -lGL" >&5
+echo "configure:15131: 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
 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


@@ -12096,7 +15135,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lGL  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12100 "configure"
+#line 15139 "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
 #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


@@ -12107,7 +15146,7 @@ int main() {
 glFlush()
 ; return 0; }
 EOF
 glFlush()
 ; return 0; }
 EOF

-if { (eval echo configure:12111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15150: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12123,13 +15162,13 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   

-      OPENGL_LINK="-lGL"
+      OPENGL_LINK="-lGL -lGLU"

     
 else
   echo "$ac_t""no" 1>&6
 
         echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
     
 else
   echo "$ac_t""no" 1>&6
 
         echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6

-echo "configure:12133: checking for glFlush in -lMesaGL" >&5
+echo "configure:15172: 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
 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


@@ -12137,7 +15176,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lMesaGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lMesaGL  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12141 "configure"
+#line 15180 "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
 #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


@@ -12148,7 +15187,7 @@ int main() {
 glFlush()
 ; return 0; }
 EOF
 glFlush()
 ; return 0; }
 EOF

-if { (eval echo configure:12152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15191: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12164,7 +15203,7 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   

-        OPENGL_LINK="-lMesaGL"
+        OPENGL_LINK="-lMesaGL -lMesaGLU"

       
 else
   echo "$ac_t""no" 1>&6
       
 else
   echo "$ac_t""no" 1>&6


@@ -12211,6 +15250,13 @@ EOF
 
 fi
 
 
 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
 if test "$wxUSE_WAVE" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_WAVE 1


@@ -12218,6 +15264,34 @@ EOF
 
 fi
 
 
 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
 if test "$wxUSE_FILE" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_FILE 1


@@ -12225,6 +15299,13 @@ EOF
 
 fi
 
 
 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
 if test "$wxUSE_FILESYSTEM" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_FILESYSTEM 1


@@ -12260,6 +15341,13 @@ EOF
 
 fi
 
 
 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
 if test "$wxUSE_BUSYINFO" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_BUSYINFO 1


@@ -12306,6 +15394,7 @@ if test "$wxUSE_INTL" = "yes" ; then
 EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
 EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"

+    GUIDIST="$GUIDIST INTL_DIST"

   fi
 fi
 
   fi
 fi
 


@@ -12314,6 +15403,20 @@ if test "$wxUSE_LOG" = "yes"; then
 #define wxUSE_LOG 1
 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 test "$wxUSE_LONGLONG" = "yes"; then
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then


@@ -12323,9 +15426,9 @@ EOF
 
 fi
 
 
 fi
 

-if test "$wxUSE_PLOT" = "yes"; then
+if test "$wxUSE_GEOMETRY" = "yes"; then

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

-#define wxUSE_PLOT 1
+#define wxUSE_GEOMETRY 1

 EOF
 
 fi
 EOF
 
 fi


@@ -12346,16 +15449,16 @@ EOF
 fi
 
 
 fi
 
 

-if test "$wxUSE_TIMEDATE" = "yes"; then
+if test "$wxUSE_DATETIME" = "yes"; then

         for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
         for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:12354: checking for $ac_func" >&5
+echo "configure:15457: 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
 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 12359 "configure"
+#line 15462 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -12378,7 +15481,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:12382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15485: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -12404,13 +15507,13 @@ done
 
 
         echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
 
 
         echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6

-echo "configure:12408: checking for timezone variable in <time.h>" >&5
+echo "configure:15511: checking for timezone variable in <time.h>" >&5

 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                         cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                         cat > conftest.$ac_ext <<EOF

-#line 12414 "configure"
+#line 15517 "configure"

 #include "confdefs.h"
 
                                 #include <time.h>
 #include "confdefs.h"
 
                                 #include <time.h>


@@ -12422,7 +15525,7 @@ int main() {
                             
 ; return 0; }
 EOF
                             
 ; return 0; }
 EOF

-if { (eval echo configure:12426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                                 wx_cv_var_timezone=__timezone
   rm -rf conftest*
   
                                 wx_cv_var_timezone=__timezone


@@ -12433,7 +15536,7 @@ else
   rm -rf conftest*
   
                                 cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   
                                 cat > conftest.$ac_ext <<EOF

-#line 12437 "configure"
+#line 15540 "configure"

 #include "confdefs.h"
 
                                         #include <time.h>
 #include "confdefs.h"
 
                                         #include <time.h>


@@ -12445,7 +15548,7 @@ int main() {
                                     
 ; return 0; }
 EOF
                                     
 ; return 0; }
 EOF

-if { (eval echo configure:12449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                                         wx_cv_var_timezone=_timezone
   rm -rf conftest*
   
                                         wx_cv_var_timezone=_timezone


@@ -12456,7 +15559,7 @@ else
   rm -rf conftest*
   
                                         cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   
                                         cat > conftest.$ac_ext <<EOF

-#line 12460 "configure"
+#line 15563 "configure"

 #include "confdefs.h"
 
                                                 #include <time.h>
 #include "confdefs.h"
 
                                                 #include <time.h>


@@ -12468,7 +15571,7 @@ int main() {
                                             
 ; return 0; }
 EOF
                                             
 ; return 0; }
 EOF

-if { (eval echo configure:12472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                                                 wx_cv_var_timezone=timezone
   rm -rf conftest*
   
                                                 wx_cv_var_timezone=timezone


@@ -12503,12 +15606,12 @@ EOF
         for ac_func in localtime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
         for ac_func in localtime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:12507: checking for $ac_func" >&5
+echo "configure:15610: 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
 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 12512 "configure"
+#line 15615 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -12531,7 +15634,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:12535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15638: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -12558,13 +15661,13 @@ done
 
     if test "$ac_cv_func_localtime" = "yes"; then
         echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
 
     if test "$ac_cv_func_localtime" = "yes"; then
         echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6

-echo "configure:12562: checking for tm_gmtoff in struct tm" >&5
+echo "configure:15665: 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
 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 12568 "configure"
+#line 15671 "configure"

 #include "confdefs.h"
 
                     #include <time.h>
 #include "confdefs.h"
 
                     #include <time.h>


@@ -12576,14 +15679,10 @@ int main() {
                 
 ; return 0; }
 EOF
                 
 ; return 0; }
 EOF

-if { (eval echo configure:12580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                     wx_cv_struct_tm_has_gmtoff=yes
   rm -rf conftest*
   
                     wx_cv_struct_tm_has_gmtoff=yes

-                    cat >> confdefs.h <<\EOF
-#define WX_GMTOFF_IN_TM 1
-EOF
-

                 
 else
   echo "configure: failed program was:" >&5
                 
 else
   echo "configure: failed program was:" >&5


@@ -12597,17 +15696,24 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6
 fi
 
 echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6

+    fi
+
+    if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define WX_GMTOFF_IN_TM 1
+EOF
+

     fi
 
             for ac_func in gettimeofday ftime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
     fi
 
             for ac_func in gettimeofday ftime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:12606: checking for $ac_func" >&5
+echo "configure:15712: 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
 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 12611 "configure"
+#line 15717 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -12630,7 +15736,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:12634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15740: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -12657,7 +15763,7 @@ done
 
     if test "$ac_cv_func_gettimeofday" = "yes"; then
         echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
 
     if test "$ac_cv_func_gettimeofday" = "yes"; then
         echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6

-echo "configure:12661: checking whether gettimeofday takes two arguments" >&5
+echo "configure:15767: 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
 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -12672,7 +15778,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
 
 
             cat > conftest.$ac_ext <<EOF

-#line 12676 "configure"
+#line 15782 "configure"

 #include "confdefs.h"
 
                     #include <sys/time.h>
 #include "confdefs.h"
 
                     #include <sys/time.h>


@@ -12686,7 +15792,7 @@ int main() {
                 
 ; return 0; }
 EOF
                 
 ; return 0; }
 EOF

-if { (eval echo configure:12690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=yes
 else
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=yes
 else


@@ -12694,7 +15800,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF

-#line 12698 "configure"
+#line 15804 "configure"

 #include "confdefs.h"
 
                         #include <sys/time.h>
 #include "confdefs.h"
 
                         #include <sys/time.h>


@@ -12707,7 +15813,7 @@ int main() {
                     
 ; return 0; }
 EOF
                     
 ; return 0; }
 EOF

-if { (eval echo configure:12711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=no
 else
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=no
 else


@@ -12753,12 +15859,12 @@ if test "$TOOLKIT" != "MSW"; then
 
 if test "$wxUSE_SOCKETS" = "yes"; then
         echo $ac_n "checking for socket""... $ac_c" 1>&6
 
 if test "$wxUSE_SOCKETS" = "yes"; then
         echo $ac_n "checking for socket""... $ac_c" 1>&6

-echo "configure:12757: checking for socket" >&5
+echo "configure:15863: 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
 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 12762 "configure"
+#line 15868 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */


@@ -12781,7 +15887,7 @@ socket();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:12785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else


@@ -12799,7 +15905,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6

-echo "configure:12803: checking for socket in -lsocket" >&5
+echo "configure:15909: 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
 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


@@ -12807,7 +15913,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12811 "configure"
+#line 15917 "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
 #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


@@ -12818,7 +15924,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
 socket()
 ; return 0; }
 EOF

-if { (eval echo configure:12822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15928: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12848,11 +15954,10 @@ fi
 
 fi
 
 
 fi
 

-fi

 
 if test "$wxUSE_SOCKETS" = "yes" ; then
         echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
 
 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:12856: checking what is the type of the third argument of getsockname" >&5
+echo "configure:15961: 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
 if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -12867,7 +15972,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
 
 
             cat > conftest.$ac_ext <<EOF

-#line 12871 "configure"
+#line 15976 "configure"

 #include "confdefs.h"
 
                     #include <sys/types.h>
 #include "confdefs.h"
 
                     #include <sys/types.h>


@@ -12880,7 +15985,7 @@ int main() {
                 
 ; return 0; }
 EOF
                 
 ; return 0; }
 EOF

-if { (eval echo configure:12884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_type_getsockname3=socklen_t
 else
   rm -rf conftest*
   wx_cv_type_getsockname3=socklen_t
 else


@@ -12888,7 +15993,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF

-#line 12892 "configure"
+#line 15997 "configure"

 #include "confdefs.h"
 
                         #include <sys/types.h>
 #include "confdefs.h"
 
                         #include <sys/types.h>


@@ -12901,7 +16006,7 @@ int main() {
                     
 ; return 0; }
 EOF
                     
 ; return 0; }
 EOF

-if { (eval echo configure:12905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_type_getsockname3=size_t
 else
   rm -rf conftest*
   wx_cv_type_getsockname3=size_t
 else


@@ -12909,7 +16014,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF

-#line 12913 "configure"
+#line 16018 "configure"

 #include "confdefs.h"
 
                             #include <sys/types.h>
 #include "confdefs.h"
 
                             #include <sys/types.h>


@@ -12922,7 +16027,7 @@ int main() {
                         
 ; return 0; }
 EOF
                         
 ; return 0; }
 EOF

-if { (eval echo configure:12926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_type_getsockname3=int
 else
   rm -rf conftest*
   wx_cv_type_getsockname3=int
 else


@@ -12963,6 +16068,8 @@ EOF
     fi
 fi
 
     fi
 fi
 

+fi
+

 if test "$wxUSE_SOCKETS" = "yes" ; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_SOCKETS 1
 if test "$wxUSE_SOCKETS" = "yes" ; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_SOCKETS 1


@@ -12973,24 +16080,26 @@ EOF
 fi
 
 
 fi
 
 

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

 if test "$TOOLKIT" != "MSW"; then
 
 if test "$TOOLKIT" != "MSW"; then
 

-if test "$wxUSE_JOYSTICK" = 1; 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
     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:12984: checking for $ac_hdr" >&5
+echo "configure:16093: 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
 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 12989 "configure"
+#line 16098 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:12994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16103: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -13017,14 +16126,14 @@ fi
 done
 
   if test "$ac_cv_header_linux_joystick_h" != "yes"; then
 done
 
   if test "$ac_cv_header_linux_joystick_h" != "yes"; then

-    wxUSE_JOYSTICK=0
-    echo "configure: warning: Joystick not supported yb this system" 1>&2
+    wxUSE_JOYSTICK=no
+    echo "configure: warning: Joystick not supported by this system" 1>&2

   fi
 fi
 
 fi
 
   fi
 fi
 
 fi
 

-if test "$wxUSE_JOYSTICK" = 1; then
+if test "$wxUSE_JOYSTICK" = "yes"; then

     cat >> confdefs.h <<\EOF
 #define wxUSE_JOYSTICK 1
 EOF
     cat >> confdefs.h <<\EOF
 #define wxUSE_JOYSTICK 1
 EOF


@@ -13032,21 +16141,26 @@ EOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
 fi
 

+fi
+

 
 if test "$TOOLKIT" != "MSW"; then
 
 HAVE_DL_FUNCS=0
 HAVE_SHL_FUNCS=0
 if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
 
 if test "$TOOLKIT" != "MSW"; then
 
 HAVE_DL_FUNCS=0
 HAVE_SHL_FUNCS=0
 if test "$wxUSE_DYNLIB_CLASS" = "yes"; then

-                for ac_func in dlopen
+    if test "$USE_MAC" = 1; then
+                HAVE_DL_FUNCS=1
+    else
+                                for ac_func in dlopen

 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:13045: checking for $ac_func" >&5
+echo "configure:16159: 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
 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 13050 "configure"
+#line 16164 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -13069,7 +16183,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:13073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16187: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -13097,7 +16211,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6

-echo "configure:13101: checking for dlopen in -ldl" >&5
+echo "configure:16215: 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
 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


@@ -13105,7 +16219,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 13109 "configure"
+#line 16223 "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
 #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


@@ -13116,7 +16230,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
 dlopen()
 ; return 0; }
 EOF

-if { (eval echo configure:13120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16234: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -13145,12 +16259,126 @@ else
                             for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
                             for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:13149: checking for $ac_func" >&5
+echo "configure:16263: 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
 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 13154 "configure"
+#line 16268 "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:16291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+                                            cat >> confdefs.h <<\EOF
+#define HAVE_SHL_LOAD 1
+EOF
+
+                                            HAVE_SHL_FUNCS=1
+                                          
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
+echo "configure:16319: checking for dld in -lshl_load" >&5
+ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lshl_load  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 16327 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dld();
+
+int main() {
+dld()
+; return 0; }
+EOF
+if { (eval echo configure:16338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+                                                            HAVE_SHL_FUNCS=1
+                                                            LIBS="$LIBS -ldld"
+                                                         
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+                                          
+fi
+done
+
+                        
+fi
+
+        
+fi
+done
+
+
+        if test "$HAVE_DL_FUNCS" = 1; then
+        for ac_func in dlerror
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:16377: 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 16382 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -13173,7 +16401,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:13177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16405: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -13185,31 +16413,66 @@ fi
 rm -f conftest*
 fi
 
 rm -f conftest*
 fi
 

-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = 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 dlerror in -ldl""... $ac_c" 1>&6
+echo "configure:16430: checking for dlerror in -ldl" >&5
+ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 16438 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dlerror();
+
+int main() {
+dlerror()
+; return 0; }
+EOF
+if { (eval echo configure:16449: \"$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
   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
+  cat >> confdefs.h <<\EOF
+#define HAVE_DLERROR 1

 EOF
 
 EOF
 

-                                            HAVE_SHL_FUNCS=1
-                                          

 else
   echo "$ac_t""no" 1>&6
 fi
 else
   echo "$ac_t""no" 1>&6
 fi

-done
-
-                        
-fi

 
 

-        

 fi
 done
 
 fi
 done
 

+    fi
+    fi

 
     if test "$HAVE_DL_FUNCS" = 0; then
         if test "$HAVE_SHL_FUNCS" = 0; then
 
     if test "$HAVE_DL_FUNCS" = 0; then
         if test "$HAVE_SHL_FUNCS" = 0; then


@@ -13236,6 +16499,13 @@ else
 fi
 
 
 fi
 
 

+if test "$wxUSE_FONTMAP" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FONTMAP 1
+EOF
+
+fi
+

 if test "$wxUSE_UNICODE" = "yes" ; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_UNICODE 1
 if test "$wxUSE_UNICODE" = "yes" ; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_UNICODE 1


@@ -13274,9 +16544,6 @@ EOF
 
     WXODBCFLAG="-D_IODBC_"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
 
     WXODBCFLAG="-D_IODBC_"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"

-    IODBCOBJS="\$(IODBC_OBJS)"
-else
-    IODBCOBJS=

 fi
 
 
 fi
 
 


@@ -13331,6 +16598,13 @@ if test "$wxUSE_HELP" = "yes"; then
 EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
 EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"

+
+    if test "$wxUSE_WXHTML_HELP" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_WXHTML_HELP 1
+EOF
+
+    fi

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


@@ -13353,15 +16627,11 @@ EOF
 fi
 
 if test "$wxUSE_RESOURCES" = "yes" ; then
 fi
 
 if test "$wxUSE_RESOURCES" = "yes" ; then

-    if test "$wxUSE_PROLOGIO" = "yes" ; then
-        cat >> confdefs.h <<\EOF
+    cat >> confdefs.h <<\EOF

 #define wxUSE_RESOURCES 1
 EOF
 
 #define wxUSE_RESOURCES 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
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"

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


@@ -13386,6 +16656,10 @@ fi
 if test "$wxUSE_CLIPBOARD" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_CLIPBOARD 1
 if test "$wxUSE_CLIPBOARD" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_CLIPBOARD 1

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

 EOF
 
 fi
 EOF
 
 fi


@@ -13403,22 +16677,28 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
         wxUSE_DRAG_AND_DROP=no
     fi
 
         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 "$USE_WIN32" = 1; then
     if test "$USE_WIN32" = 1; then

-                        for ac_hdr in ole2.h
+                
+        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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:13412: checking for $ac_hdr" >&5
+echo "configure:16692: 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
 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 13417 "configure"
+#line 16697 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:13422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16702: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -13444,7 +16724,26 @@ else
 fi
 done
 
 fi
 done
 

-        if test "x$HAVE_OLE2_H" = x ; then
+
+        if test "$ac_cv_header_ole2_h" = "yes" ; then
+            if test "$GCC" = yes ; then
+                ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
+                ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
+                CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
+                LIBS="$LIBS -lole32 -luuid"
+
+                                                if test "$wxUSE_METAFILE" = "yes"; then
+                    cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
+EOF
+
+                                        cat >> confdefs.h <<\EOF
+#define wxUSE_ENH_METAFILE 1
+EOF
+
+                fi
+            fi
+        else

             echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2
             wxUSE_DRAG_AND_DROP=no
         fi
             echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2
             wxUSE_DRAG_AND_DROP=no
         fi


@@ -13468,11 +16767,42 @@ EOF
 fi
 
 
 fi
 
 

+USES_CONTROLS=0
+if test "$wxUSE_CONTROLS" = "yes"; then
+  USES_CONTROLS=1
+fi
+

 if test "$wxUSE_ACCEL" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_ACCEL 1
 EOF
 
 if test "$wxUSE_ACCEL" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_ACCEL 1
 EOF
 

+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BUTTON 1
+EOF
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BMPBUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BMPBUTTON 1
+EOF
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_CALCTRL" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CALENDARCTRL 1
+EOF
+
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"

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


@@ -13480,6 +16810,7 @@ if test "$wxUSE_CARET" = "yes"; then
 #define wxUSE_CARET 1
 EOF
 
 #define wxUSE_CARET 1
 EOF
 

+  USES_CONTROLS=1

   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 


@@ -13488,6 +16819,7 @@ if test "$wxUSE_COMBOBOX" = "yes"; then
 #define wxUSE_COMBOBOX 1
 EOF
 
 #define wxUSE_COMBOBOX 1
 EOF
 

+  USES_CONTROLS=1

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


@@ -13495,13 +16827,7 @@ if test "$wxUSE_CHOICE" = "yes"; then
 #define wxUSE_CHOICE 1
 EOF
 
 #define wxUSE_CHOICE 1
 EOF
 

-fi
-
-if test "$wxUSE_BMPBUTTON" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_BMPBUTTON 1
-EOF
-
+  USES_CONTROLS=1

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


@@ -13509,6 +16835,7 @@ if test "$wxUSE_CHECKBOX" = "yes"; then
 #define wxUSE_CHECKBOX 1
 EOF
 
 #define wxUSE_CHECKBOX 1
 EOF
 

+  USES_CONTROLS=1

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


@@ -13516,6 +16843,7 @@ if test "$wxUSE_CHECKLST" = "yes"; then
 #define wxUSE_CHECKLISTBOX 1
 EOF
 
 #define wxUSE_CHECKLISTBOX 1
 EOF
 

+  USES_CONTROLS=1

   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 


@@ -13524,6 +16852,7 @@ if test "$wxUSE_GAUGE" = "yes"; then
 #define wxUSE_GAUGE 1
 EOF
 
 #define wxUSE_GAUGE 1
 EOF
 

+  USES_CONTROLS=1

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


@@ -13532,6 +16861,7 @@ if test "$wxUSE_NEW_GRID" = "yes"; then
 #define wxUSE_NEW_GRID 1
 EOF
 
 #define wxUSE_NEW_GRID 1
 EOF
 

+  USES_CONTROLS=1

   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 


@@ -13540,6 +16870,7 @@ if test "$wxUSE_GRID" = "yes"; then
 #define wxUSE_GRID 1
 EOF
 
 #define wxUSE_GRID 1
 EOF
 

+  USES_CONTROLS=1

   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 


@@ -13555,6 +16886,7 @@ if test "$wxUSE_LISTBOX" = "yes"; then
 #define wxUSE_LISTBOX 1
 EOF
 
 #define wxUSE_LISTBOX 1
 EOF
 

+    USES_CONTROLS=1

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


@@ -13563,6 +16895,7 @@ if test "$wxUSE_LISTCTRL" = "yes"; then
 #define wxUSE_LISTCTRL 1
 EOF
 
 #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
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
     else
         echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2


@@ -13574,6 +16907,7 @@ if test "$wxUSE_NOTEBOOK" = "yes"; then
 #define wxUSE_NOTEBOOK 1
 EOF
 
 #define wxUSE_NOTEBOOK 1
 EOF
 

+    USES_CONTROLS=1

     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 


@@ -13582,6 +16916,7 @@ if test "$wxUSE_RADIOBOX" = "yes"; then
 #define wxUSE_RADIOBOX 1
 EOF
 
 #define wxUSE_RADIOBOX 1
 EOF
 

+    USES_CONTROLS=1

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


@@ -13589,6 +16924,7 @@ if test "$wxUSE_RADIOBTN" = "yes"; then
 #define wxUSE_RADIOBTN 1
 EOF
 
 #define wxUSE_RADIOBTN 1
 EOF
 

+    USES_CONTROLS=1

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


@@ -13604,6 +16940,7 @@ if test "$wxUSE_SCROLLBAR" = "yes"; then
 #define wxUSE_SCROLLBAR 1
 EOF
 
 #define wxUSE_SCROLLBAR 1
 EOF
 

+    USES_CONTROLS=1

     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi
 


@@ -13612,6 +16949,7 @@ if test "$wxUSE_SLIDER" = "yes"; then
 #define wxUSE_SLIDER 1
 EOF
 
 #define wxUSE_SLIDER 1
 EOF
 

+    USES_CONTROLS=1

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


@@ -13619,6 +16957,7 @@ if test "$wxUSE_SPINBTN" = "yes"; then
 #define wxUSE_SPINBTN 1
 EOF
 
 #define wxUSE_SPINBTN 1
 EOF
 

+    USES_CONTROLS=1

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


@@ -13626,6 +16965,7 @@ if test "$wxUSE_SPINCTRL" = "yes"; then
 #define wxUSE_SPINCTRL 1
 EOF
 
 #define wxUSE_SPINCTRL 1
 EOF
 

+    USES_CONTROLS=1

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


@@ -13641,6 +16981,7 @@ if test "$wxUSE_STATBMP" = "yes"; then
 #define wxUSE_STATBMP 1
 EOF
 
 #define wxUSE_STATBMP 1
 EOF
 

+    USES_CONTROLS=1

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


@@ -13648,6 +16989,15 @@ if test "$wxUSE_STATBOX" = "yes"; then
 #define wxUSE_STATBOX 1
 EOF
 
 #define wxUSE_STATBOX 1
 EOF
 

+    USES_CONTROLS=1
+fi
+
+if test "$wxUSE_STATTEXT" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATTEXT 1
+EOF
+
+    USES_CONTROLS=1

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


@@ -13658,6 +17008,7 @@ if test "$wxUSE_STATLINE" = "yes"; then
 #define wxUSE_STATLINE 1
 EOF
 
 #define wxUSE_STATLINE 1
 EOF
 

+        USES_CONTROLS=1

     fi
 fi
 
     fi
 fi
 


@@ -13666,6 +17017,7 @@ if test "$wxUSE_STATUSBAR" = "yes"; then
 #define wxUSE_STATUSBAR 1
 EOF
 
 #define wxUSE_STATUSBAR 1
 EOF
 

+    USES_CONTROLS=1

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
 fi


@@ -13678,12 +17030,37 @@ EOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 

+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_TOGGLEBTN" = "yes"; then
+    if test "$wxUSE_MAC" = 1; then
+        echo "configure: warning: Toggle button is not yet supported under Mac OS X" 1>&2
+        wxUSE_TOGGLEBTN=no
+    fi
+
+    if test "$wxUSE_TOGGLEBTN" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TOGGLEBTN 1
+EOF
+
+        USES_CONTROLS=1
+    fi
+fi
+

 if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_TOOLBAR_SIMPLE 1
 EOF
 
     wxUSE_TOOLBAR="yes"
 if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_TOOLBAR_SIMPLE 1
 EOF
 
     wxUSE_TOOLBAR="yes"

+    USES_CONTROLS=1

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


@@ -13691,19 +17068,21 @@ if test "$wxUSE_TOOLBAR" = "yes"; then
 #define wxUSE_TOOLBAR 1
 EOF
 
 #define wxUSE_TOOLBAR 1
 EOF
 

+    USES_CONTROLS=1

 
         if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
         wxUSE_TOOLBAR_NATIVE="yes"
     fi
 
 
         if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
         wxUSE_TOOLBAR_NATIVE="yes"
     fi
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
-fi
-
-if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
+        cat >> confdefs.h <<\EOF

 #define wxUSE_TOOLBAR_NATIVE 1
 EOF
 
 #define wxUSE_TOOLBAR_NATIVE 1
 EOF
 

+        USES_CONTROLS=1
+    fi
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"

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


@@ -13727,63 +17106,58 @@ if test "$wxUSE_TREECTRL" = "yes"; then
 #define wxUSE_TREECTRL 1
 EOF
 
 #define wxUSE_TREECTRL 1
 EOF
 

+        USES_CONTROLS=1

         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
     else
         echo "configure: warning: wxTreeCtrl requires wxImageList and won't be compiled without it" 1>&2
     fi
 fi
 
         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_POPUPWIN" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_POPUPWIN 1
+EOF

 
 

+    USES_CONTROLS=1
+fi

 
 

-if test "$wxUSE_METAFILE" = "yes"; then
+if test "$USES_CONTROLS" = 1; then

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

-#define wxUSE_METAFILE 1
+#define wxUSE_CONTROLS 1

 EOF
 
 fi
 
 EOF
 
 fi
 

-if test "$wxUSE_DIRDLG" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2
-    else
-        if test "$wxUSE_TREECTRL" != "yes"; then
-            echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
-        else
-            cat >> confdefs.h <<\EOF
-#define wxUSE_DIRDLG 1
+
+
+if test "$wxUSE_DRAGIMAGE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DRAGIMAGE 1

 EOF
 
 EOF
 

-        fi
-    fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"

 fi
 
 fi
 

-if test "$wxUSE_TEXTDLG" = "yes"; then
+if test "$wxUSE_MENUS" = "yes"; then

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

-#define wxUSE_TEXTDLG 1
+#define wxUSE_MENUS 1

 EOF
 
 EOF
 

+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"

 fi
 
 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_METAFILE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1

 EOF
 
 EOF
 

-    fi

 fi
 
 fi
 

-if test "$wxUSE_PROGRESSDLG" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2
-    else
-        cat >> confdefs.h <<\EOF
-#define wxUSE_PROGRESSDLG 1
+if test "$wxUSE_MIMETYPE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MIMETYPE 1

 EOF
 
 EOF
 

-    fi

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


@@ -13811,6 +17185,13 @@ EOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 

+if test "$wxUSE_IMAGE" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_IMAGE 1
+EOF
+
+fi
+

 if test "$wxUSE_GIF" = "yes" ; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_GIF 1
 if test "$wxUSE_GIF" = "yes" ; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_GIF 1


@@ -13832,6 +17213,108 @@ EOF
 
 fi
 
 
 fi
 

+if test "$wxUSE_XPM" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_XPM 1
+EOF
+
+fi
+
+
+if test "$wxUSE_CHOICEDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CHOICEDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_COLOURDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_COLOURDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_FILEDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FILEDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_FONTDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FONTDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_DIRDLG" = "yes"; then
+    if test "$wxUSE_CONSTRAINTS" != "yes"; then
+       echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2
+    else
+        if test "$wxUSE_TREECTRL" != "yes"; then
+            echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
+        else
+            cat >> confdefs.h <<\EOF
+#define wxUSE_DIRDLG 1
+EOF
+
+        fi
+    fi
+fi
+
+if test "$wxUSE_MSGDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MSGDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_NUMBERDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_NUMBERDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_PROGRESSDLG" = "yes"; then
+    if test "$wxUSE_CONSTRAINTS" != "yes"; then
+       echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_PROGRESSDLG 1
+EOF
+
+    fi
+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
+EOF
+
+    fi
+fi
+
+if test "$wxUSE_TEXTDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_WIZARDDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_WIZARDDLG 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
+fi
+

 
 if test "$cross_compiling" = "yes"; then
         OSINFO="\"$host\""
 
 if test "$cross_compiling" = "yes"; then
         OSINFO="\"$host\""


@@ -13846,31 +17329,46 @@ EOF
 
 
 
 
 
 

-GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $TOOLKIT_LINK"
+GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
+OPENGL_LIBS="$OPENGL_LINK"

 
 

-EXTRA_LIBS="$LIBS $ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
+EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
+if test "$USE_MAC" = 1 ; then
+    EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
+fi

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

-    EXTRA_LIBS="$EXTRA_LIBS $GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK"
+    EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"

 fi
 
 LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
 
 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}/include -I\${top_srcdir}/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
 EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
 
 
 if test "$GXX" = yes ; then
         CXXWARNINGS="-Wall"
         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
         
 CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 
 LDFLAGS="$LDFLAGS $PROFILE"
 
 if test "$wxUSE_GUI" = "yes"; then
         

-            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag drawing dynamic \
-                     font fractal image menu minimal richedit"
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
+                     drawing dynamic event font fractal image \
+                     minimal richedit widgets"
+
+    if test "$wxUSE_UNIVERSAL" = "yes" ; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ"
+    fi

 
         CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
 else
 
         CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
 else


@@ -13965,12 +17463,15 @@ 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 $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6

-echo "configure:13974: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:17475: 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
 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


@@ -13999,14 +17500,14 @@ fi
 
 if test -d include; then
     if test -d include/wx; then
 
 if test -d include; then
     if test -d include/wx; then

-        if test -d include/wx/${TOOLKIT_DIR}; then
-            if test -f include/wx/${TOOLKIT_DIR}/setup.h; then
-                mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h 
+        if test -d include/wx/${SETUPH_DIR}; then
+            if test -f include/wx/${SETUPH_DIR}/setup.h; then
+                mv -f include/wx/${SETUPH_DIR}/setup.h setup.h

             fi
         fi
     fi
 fi
             fi
         fi
     fi
 fi

-            
+

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


@@ -14015,6 +17516,8 @@ if test "$wxUSE_GUI" = "yes"; then
     wx_cv_program_ext=$PROGRAM_EXT
     wx_cv_target_library=$WX_TARGET_LIBRARY
     wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
     wx_cv_program_ext=$PROGRAM_EXT
     wx_cv_target_library=$WX_TARGET_LIBRARY
     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_libtype

     subdirs="demos samples utils contrib"
 
 fi
     subdirs="demos samples utils contrib"
 
 fi


@@ -14187,13 +17690,16 @@ s%@YACC@%$YACC%g
 s%@LEX@%$LEX%g
 s%@LEXLIB@%$LEXLIB%g
 s%@LN_S@%$LN_S%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_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%@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%@REZ@%$REZ%g
+s%@DEREZ@%$DEREZ%g

 s%@LEX_STEM@%$LEX_STEM%g
 s%@PATH_IFS@%$PATH_IFS%g
 s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g
 s%@LEX_STEM@%$LEX_STEM%g
 s%@PATH_IFS@%$PATH_IFS%g
 s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g


@@ -14222,26 +17728,22 @@ 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%@PIC_FLAG@%$PIC_FLAG%g
 s%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g
 s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g

+s%@CODE_GEN_FLAGS_CXX@%$CODE_GEN_FLAGS_CXX%g

 s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g
 s%@BURNT_LIBRARY_NAME_GL@%$BURNT_LIBRARY_NAME_GL%g
 s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g
 s%@BURNT_LIBRARY_NAME_GL@%$BURNT_LIBRARY_NAME_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%@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%@SETUPH_DIR@%$SETUPH_DIR%g

 s%@TOOLKIT@%$TOOLKIT%g
 s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
 s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
 s%@TOOLKIT@%$TOOLKIT%g
 s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
 s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g

+s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g

 s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%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%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g

 s%@ALL_OBJECTS@%$ALL_OBJECTS%g
 s%@ALL_DEPFILES@%$ALL_DEPFILES%g
 s%@GUIDIST@%$GUIDIST%g
 s%@ALL_OBJECTS@%$ALL_OBJECTS%g
 s%@ALL_DEPFILES@%$ALL_DEPFILES%g
 s%@GUIDIST@%$GUIDIST%g


@@ -14256,6 +17758,7 @@ s%@DOCS_SUBDIRS@%$DOCS_SUBDIRS%g
 s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
 s%@USER_SUBDIRS@%$USER_SUBDIRS%g
 s%@EXTRA_LIBS@%$EXTRA_LIBS%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%@RCINPUTSWITCH@%$RCINPUTSWITCH%g
 s%@EXTRADEFS@%$EXTRADEFS%g
 s%@LD_LIBS@%$LD_LIBS%g
 s%@RCINPUTSWITCH@%$RCINPUTSWITCH%g


@@ -14263,6 +17766,10 @@ s%@RCOUTPUTSWITCH@%$RCOUTPUTSWITCH%g
 s%@RESPROGRAM@%$RESPROGRAM%g
 s%@RESCOMP@%$RESCOMP%g
 s%@RESFLAGS@%$RESFLAGS%g
 s%@RESPROGRAM@%$RESPROGRAM%g
 s%@RESCOMP@%$RESCOMP%g
 s%@RESFLAGS@%$RESFLAGS%g

+s%@REZFLAGS@%$REZFLAGS%g
+s%@DEREZFLAGS@%$DEREZFLAGS%g
+s%@LIBWXMACRES@%$LIBWXMACRES%g
+s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g

 s%@DLLTOOL@%$DLLTOOL%g
 s%@AS@%$AS%g
 s%@NM@%$NM%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@AS@%$AS%g
 s%@NM@%$NM%g


@@ -14485,18 +17992,21 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<EOF
 

-            TOOLKIT_DIR="${TOOLKIT_DIR}"
+            SETUPH_DIR="${SETUPH_DIR}"
+            TOOLKIT_NAME="${TOOLKIT_NAME}"

             LN_S="${LN_S}"
           
          
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 
             LN_S="${LN_S}"
           
          
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 

-            chmod +x wx-config
-            mv wx-config wx${TOOLKIT_DIR}-config
-            ${LN_S} wx${TOOLKIT_DIR}-config wx-config
-            
-                                    
+                                                if test ! -f wx${TOOLKIT_NAME}-config; then
+                chmod +x wx-config
+                mv wx-config wx${TOOLKIT_NAME}-config
+                ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+            fi
+
+                        

             if test ! -d lib; then
               mkdir lib
             fi
             if test ! -d lib; then
               mkdir lib
             fi


@@ -14509,11 +18019,11 @@ cat >> $CONFIG_STATUS <<\EOF
             if test ! -d lib/wx/include/wx; then
               mkdir lib/wx/include/wx
             fi
             if test ! -d lib/wx/include/wx; then
               mkdir lib/wx/include/wx
             fi

-            if test ! -d lib/wx/include/wx/${TOOLKIT_DIR}; then
-              mkdir lib/wx/include/wx/${TOOLKIT_DIR}
+            if test ! -d lib/wx/include/wx/${TOOLKIT_NAME}; then
+              mkdir lib/wx/include/wx/${TOOLKIT_NAME}

             fi
             if test -f setup.h; then
             fi
             if test -f setup.h; then

-                cp -f setup.h lib/wx/include/wx/${TOOLKIT_DIR}/setup.h
+                cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h

             fi
 
             
             fi
 
             


@@ -14523,13 +18033,13 @@ cat >> $CONFIG_STATUS <<\EOF
             if test ! -d include/wx; then
               mkdir include/wx
             fi
             if test ! -d include/wx; then
               mkdir include/wx
             fi

-            if test ! -d include/wx/${TOOLKIT_DIR}; then
-              mkdir include/wx/${TOOLKIT_DIR}
+            if test ! -d include/wx/${SETUPH_DIR}; then
+              mkdir include/wx/${SETUPH_DIR}

             fi
             if test -f setup.h; then
             fi
             if test -f setup.h; then

-                mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+                cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h

             fi
             fi

-            
+

           
 exit 0
 EOF
           
 exit 0
 EOF