X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1db8dc4a2b5b664e922b9d049320ec0354e0eccf..ff3d11a0ab976879ff87c826f660786fee172ed9:/configure

diff --git a/configure b/configure
index d69487ab45..5f830dbd84 100755
--- a/configure
+++ b/configure
@@ -35,12 +35,13 @@
 
 
 
+
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
 
 
 
 
-# Configure paths for GTK+
-# Owen Taylor     97-11-3
 
 
 # Guess values for system-dependent variables and create Makefiles.
@@ -55,7 +56,9 @@ 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
@@ -71,229 +74,295 @@ 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-regex            enable support for wxRegEx class"
+ac_help="$ac_help
+  --with-zlib             use zlib for LZW compression"
+ac_help="$ac_help
+  --with-odbc             use the IODBC and wxODBC classes"
+ac_help="$ac_help
+  --enable-shared         create shared library code"
+ac_help="$ac_help
+  --enable-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
-  --with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed"
+  --enable-intl           use internationalization system"
 ac_help="$ac_help
---with-libpng           use libpng (PNG image format)"
+  --enable-config         use wxConfig (and derived) classes"
 ac_help="$ac_help
---with-libjpeg          use libjpeg (JPEG file format)"
+  --enable-sockets        use socket/network classes"
 ac_help="$ac_help
---with-libtiff          use libtiff (TIFF file format)"
+  --enable-ipc            use interprocess communication (wxSocket etc.)"
 ac_help="$ac_help
---with-freetype         use freetype (font rasterizer)"
+  --enable-cmdline        use wxCmdLineParser class"
 ac_help="$ac_help
---with-opengl           use OpenGL (or Mesa)"
+  --enable-datetime       use wxDateTime class"
 ac_help="$ac_help
---with-dmalloc          use dmalloc library (www.letters.com/dmalloc)"
+  --enable-timedate       use obsolete wxDate/wxTime classes"
 ac_help="$ac_help
---with-zlib             use zlib for LZW compression"
+  --enable-stopwatch      use wxStopWatch class"
 ac_help="$ac_help
---with-odbc             use the IODBC and wxODBC classes"
+  --enable-dialupman      use dialup network classes"
 ac_help="$ac_help
---enable-shared         create shared library code"
+  --enable-apple_ieee     use the Apple IEEE codec"
 ac_help="$ac_help
---enable-burnt_name     create set name in shared library "
+  --enable-timer          use wxTimer class"
 ac_help="$ac_help
---enable-optimise       create optimised code"
+  --enable-wave           use wxWave class"
 ac_help="$ac_help
---enable-debug          same as debug_flag and debug_info"
+  --enable-fraction       use wxFraction class"
 ac_help="$ac_help
---enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)"
+  --enable-dynlib         use wxLibrary class for DLL loading"
 ac_help="$ac_help
---enable-debug_info     create code with debugging information"
+  --enable-longlong       use wxLongLong class"
 ac_help="$ac_help
---enable-debug_gdb      create code with extra GDB debugging information"
+  --enable-geometry       use geometry class"
 ac_help="$ac_help
---enable-debug_cntxt    use wxDebugContext"
+  --enable-log            use logging system"
 ac_help="$ac_help
---enable-mem_tracing    create code with memory tracing"
+  --enable-streams        use wxStream etc classes"
 ac_help="$ac_help
---enable-profile        create code with profiling information"
+  --enable-file           use wxFile classes"
 ac_help="$ac_help
---enable-no_rtti        create code without RTTI information"
+  --enable-ffile          use wxFFile classes"
 ac_help="$ac_help
---enable-no_exceptions  create code without exceptions information"
+  --enable-textfile       use wxTextFile classes"
 ac_help="$ac_help
---enable-permissive     compile code disregarding strict ANSI"
+  --enable-fontmap        use font encodings conversion classes"
 ac_help="$ac_help
---enable-no_deps        create code without dependency information"
+  --enable-unicode        compile wxString with Unicode support"
 ac_help="$ac_help
---enable-intl           use internationalization system"
+  --enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
 ac_help="$ac_help
---enable-config         use wxConfig (and derived) classes"
+  --enable-wxprintfv      use wxWindows implementation of vprintf()"
 ac_help="$ac_help
---enable-sockets        use socket/network classes"
+  --enable-std_iostreams  use standard C++ stream classes"
 ac_help="$ac_help
---enable-ipc            use interprocess communication (wxSocket etc.)"
+  --enable-filesystem     use virtual file systems classes"
 ac_help="$ac_help
---enable-dialupman      use dialup network classes"
+  --enable-fs_inet        use virtual HTTP/FTP filesystems"
 ac_help="$ac_help
---enable-apple_ieee     use the Apple IEEE codec"
+  --enable-fs_zip         use virtual ZIP filesystems"
 ac_help="$ac_help
---enable-timedate       use date/time classes"
+  --enable-zipstream      use wxZipInputStream"
 ac_help="$ac_help
---enable-wave           use wxWave class"
+  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException"
 ac_help="$ac_help
---enable-fraction       use wxFraction class"
+  --enable-snglinst       use wxSingleInstanceChecker class"
 ac_help="$ac_help
---enable-dynlib         use wxLibrary class for DLL loading"
+  --enable-mimetypes      use wxMimeTypesManager"
 ac_help="$ac_help
---enable-longlong       use wxLongLong class"
+  --enable-sysoptions      use wxSystemOptions"
 ac_help="$ac_help
---enable-geometry       use geometry class"
+  --enable-threads        use threads"
 ac_help="$ac_help
---enable-log            use logging system"
+  --enable-serial         use class serialization"
 ac_help="$ac_help
---enable-streams        use wxStream etc classes"
+  --enable-docview        use document view architecture"
 ac_help="$ac_help
---enable-file           use wxFile classes"
+  --enable-help           use help subsystem"
 ac_help="$ac_help
---enable-textfile       use wxTextFile classes"
+  --enable-mshtmlhelp     use MS HTML Help (win32)"
 ac_help="$ac_help
---enable-unicode        compile wxString with Unicode support"
+  --enable-html           use wxHTML sub-library"
 ac_help="$ac_help
---enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
+  --enable-htmlhelp       use wxHTML-based help"
 ac_help="$ac_help
---enable-wxprintfv      use wxWindows implementation of vprintf()"
+  --enable-constraints    use layout-constraints system"
 ac_help="$ac_help
---enable-std_iostreams  use standard C++ stream classes"
+  --enable-printarch      use printing architecture"
 ac_help="$ac_help
---enable-filesystem     use virtual file systems classes"
+  --enable-mdi            use multiple document interface architecture"
 ac_help="$ac_help
---enable-fs_inet        use virtual HTTP/FTP filesystems"
+  --enable-loggui         use standard GUI logger"
 ac_help="$ac_help
---enable-fs_zip         use virtual ZIP filesystems"
+  --enable-logwin         use wxLogWindow"
 ac_help="$ac_help
---enable-zipstream      use wxZipInputStream"
+  --enable-postscript     use wxPostscriptDC device context (default for gtk+)"
 ac_help="$ac_help
---enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException"
+  --enable-prologio       use Prolog IO library"
 ac_help="$ac_help
---enable-threads        use threads"
+  --enable-resources      use wxWindows resources"
 ac_help="$ac_help
---enable-serial         use class serialization"
+  --enable-xresources     use X resources for save (default for gtk+)"
 ac_help="$ac_help
---enable-docview        use document view architecture"
+  --enable-clipboard      use wxClipboard classes"
 ac_help="$ac_help
---enable-help           use help (using external browser at present)"
+  --enable-dnd            use Drag'n'Drop classes"
 ac_help="$ac_help
---enable-constraints    use layout-constraints system"
+  --enable-metafile       use win32 metafiles"
 ac_help="$ac_help
---enable-printarch      use printing architecture"
+  --enable-wxtree         make wxTree library"
 ac_help="$ac_help
---enable-mdi            use multiple document interface architecture"
+  --enable-controls       use all usual controls"
 ac_help="$ac_help
---enable-postscript     use wxPostscriptDC device context (default for gtk+)"
+  --enable-accel          use accelerators"
 ac_help="$ac_help
---enable-prologio       use Prolog IO library"
+  --enable-button         use wxButton class"
 ac_help="$ac_help
---enable-resources      use wxWindows resources"
+  --enable-bmpbutton      use wxBitmapButton class"
 ac_help="$ac_help
---enable-xresources     use X resources for save (default for gtk+)"
+  --enable-calendar       use wxCalendarCtrl class"
 ac_help="$ac_help
---enable-clipboard      use wxClipboard classes"
+  --enable-caret          use wxCaret class"
 ac_help="$ac_help
---enable-dnd            use Drag'n'Drop classes"
+  --enable-checkbox       use wxCheckBox class"
 ac_help="$ac_help
---enable-metafile       use win32 metafiles"
+  --enable-checklst       use wxCheckListBox (listbox with checkboxes) class"
 ac_help="$ac_help
---enable-wxtree         make wxTree library"
+  --enable-choice         use wxChoice class"
 ac_help="$ac_help
---enable-controls       use all usual controls"
+  --enable-combobox       use wxComboBox classes"
 ac_help="$ac_help
---enable-accel          use accelerators"
+  --enable-gauge          use wxGauge class"
 ac_help="$ac_help
---enable-caret          use wxCaret class"
+  --enable-grid           use wxGrid class"
 ac_help="$ac_help
---enable-bmpbutton      use wxBitmapButton class"
+  --enable-newgrid        use new wxGrid class"
 ac_help="$ac_help
---enable-checkbox       use wxCheckBox class"
+  --enable-imaglist       use wxImageList class"
 ac_help="$ac_help
---enable-checklst       use wxCheckListBox (listbox with checkboxes) class"
+  --enable-listbox        use wxListBox class"
 ac_help="$ac_help
---enable-choice         use wxChoice class"
+  --enable-listctrl       use wxListCtrl class"
 ac_help="$ac_help
---enable-combobox       use wxComboBox classes"
+  --enable-notebook       use wxNotebook class"
 ac_help="$ac_help
---enable-gauge          use wxGauge class"
+  --enable-radiobox       use wxRadioBox class"
 ac_help="$ac_help
---enable-grid           use wxGrid class"
+  --enable-radiobtn       use wxRadioButton class"
 ac_help="$ac_help
---enable-newgrid        use new wxGrid class"
+  --enable-sash           use wxSashWindow class"
 ac_help="$ac_help
---enable-imaglist       use wxImageList class"
+  --enable-scrollbar      use wxScrollBar class and scrollable windows"
 ac_help="$ac_help
---enable-listbox        use wxListBox class"
+  --enable-slider         use wxSlider class"
 ac_help="$ac_help
---enable-listctrl       use wxListCtrl class"
+  --enable-spinbtn        use wxSpinButton class"
 ac_help="$ac_help
---enable-notebook       use wxNotebook class"
+  --enable-spinctrl       use wxSpinCtrl class"
 ac_help="$ac_help
---enable-radiobox       use wxRadioBox class"
+  --enable-splitter       use wxSplitterWindow class"
 ac_help="$ac_help
---enable-radiobtn       use wxRadioButton class"
+  --enable-statbmp        use wxStaticBitmap class"
 ac_help="$ac_help
---enable-sash           use wxSashWindow class"
+  --enable-statbox        use wxStaticBox class"
 ac_help="$ac_help
---enable-scrollbar      use wxScrollBar class and scrollable windows"
+  --enable-statline       use wxStaticLine class"
 ac_help="$ac_help
---enable-slider         use wxSlider class"
+  --enable-stattext       use wxStaticText class"
 ac_help="$ac_help
---enable-spinbtn        use wxSpinButton class"
+  --enable-statusbar      use wxStatusBar class"
 ac_help="$ac_help
---enable-spinctrl       use wxSpinCtrl class"
+  --enable-tabdialog      use wxTabControl class"
 ac_help="$ac_help
---enable-splitter       use wxSplitterWindow class"
+  --enable-textctrl       use wxTextCtrl class"
 ac_help="$ac_help
---enable-statbmp        use wxStaticBitmap class"
+  --enable-togglebtn      use wxToggleButton class"
 ac_help="$ac_help
---enable-statbox        use wxStaticBox class"
+  --enable-toolbar        use wxToolBar class"
 ac_help="$ac_help
---enable-statline       use wxStaticLine class"
+  --enable-tbarnative     use native wxToolBar class"
 ac_help="$ac_help
---enable-statusbar      use wxStatusBar class"
+  --enable-tbarsmpl       use wxToolBarSimple class"
 ac_help="$ac_help
---enable-tabdialog      use wxTabControl class"
+  --enable-treectrl       use wxTreeCtrl class"
 ac_help="$ac_help
---enable-togglebtn      use wxToggleButton class"
+  --enable-popupwin       use wxPopUpWindow class"
 ac_help="$ac_help
---enable-toolbar        use wxToolBar class"
+  --enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
 ac_help="$ac_help
---enable-tbarnative     use native wxToolBar class"
+  --enable-choicedlg      use wxChoiceDialog"
 ac_help="$ac_help
---enable-tbarsmpl       use wxToolBarSimple class"
+  --enable-coldlg         use wxColourDialog"
 ac_help="$ac_help
---enable-treectrl       use wxTreeCtrl class"
+  --enable-filedlg        use wxFileDialog"
 ac_help="$ac_help
---enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
+  --enable-fontdlg        use wxFontDialog"
 ac_help="$ac_help
---enable-dirdlg         use wxDirDialog"
+  --enable-dirdlg         use wxDirDialog"
 ac_help="$ac_help
---enable-textdlg        use wxTextDialog"
+  --enable-msgdlg         use wxMessageDialog"
 ac_help="$ac_help
---enable-tipdlg         use startup tips"
+  --enable-numberdlg      use wxNumberEntryDialog"
 ac_help="$ac_help
---enable-progressdlg    use wxProgressDialog"
+  --enable-textdlg        use wxTextDialog"
 ac_help="$ac_help
---enable-miniframe      use wxMiniFrame class"
+  --enable-tipdlg         use startup tips"
 ac_help="$ac_help
---enable-html           use wxHTML sub-library"
+  --enable-progressdlg    use wxProgressDialog"
 ac_help="$ac_help
---enable-tooltips       use wxToolTip class"
+  --enable-wizarddlg      use wxWizard"
 ac_help="$ac_help
---enable-splines        use spline drawing code"
+  --enable-menus          use wxMenu/wxMenuBar/wxMenuItem classes"
 ac_help="$ac_help
---enable-validators     use wxValidator and derived classes"
+  --enable-miniframe      use wxMiniFrame class"
 ac_help="$ac_help
---enable-busyinfo       use wxBusyInfo"
+  --enable-tooltips       use wxToolTip class"
 ac_help="$ac_help
---enable-joystick       compile in joystick support (Linux only)"
+  --enable-splines        use spline drawing code"
 ac_help="$ac_help
---enable-gif            use gif images (GIF file format)"
+  --enable-validators     use wxValidator and derived classes"
 ac_help="$ac_help
---enable-pcx            use pcx images (PCX file format)"
+  --enable-busyinfo       use wxBusyInfo"
 ac_help="$ac_help
---enable-pnm            use pnm images (PNM file format)"
+  --enable-joystick       compile in joystick support (Linux only)"
+ac_help="$ac_help
+  --enable-metafiles      use wxMetaFile (Windows only)"
+ac_help="$ac_help
+  --enable-dragimage      use wxDragImage"
+ac_help="$ac_help
+  --enable-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
@@ -860,7 +929,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:864: checking host system type" >&5
+echo "configure:933: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -881,7 +950,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:885: checking target system type" >&5
+echo "configure:954: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -899,7 +968,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:903: checking build system type" >&5
+echo "configure:972: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -925,22 +994,21 @@ test "$host_alias" != "$target_alias" &&
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=3
-WX_RELEASE_NUMBER=0
-
-WX_INTERFACE_AGE=0
-WX_BINARY_AGE=0
+WX_RELEASE_NUMBER=2
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
-
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
-WX_CURRENT=`expr $WX_RELEASE_NUMBER - $WX_INTERFACE_AGE`
-WX_REVISION=$WX_INTERFACE_AGE
-WX_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE`
+
+WX_CURRENT=1
+WX_REVISION=0
+WX_AGE=0
+
 
 
 USE_UNIX=1
 USE_WIN32=0
 USE_BEOS=0
+USE_MAC=0
 
 USE_LINUX=
 USE_SGI=
@@ -954,7 +1022,9 @@ USE_SUNOS=
 USE_ALPHA=
 USE_OSF=
 USE_BSD=
+USE_DARWIN=
 USE_FREEBSD=
+USE_OPENBSD=
 USE_NETBSD=
 USE_VMS=
 USE_ULTRIX=
@@ -964,21 +1034,23 @@ USE_DATA_GENERAL=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
-ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF MAC WINE PM"
+ALL_TOOLKITS="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE"
 
 DEFAULT_wxUSE_GTK=0
+DEFAULT_wxUSE_MAC=0
+DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
-DEFAULT_wxUSE_MAC=0
-DEFAULT_wxUSE_WINE=0
 DEFAULT_wxUSE_PM=0
+DEFAULT_wxUSE_WINE=0
 
 DEFAULT_DEFAULT_wxUSE_GTK=0
+DEFAULT_DEFAULT_wxUSE_MAC=0
+DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
-DEFAULT_DEFAULT_wxUSE_MAC=0
-DEFAULT_DEFAULT_wxUSE_WINE=0
 DEFAULT_DEFAULT_wxUSE_PM=0
+DEFAULT_DEFAULT_wxUSE_WINE=0
 
 PROGRAM_EXT=
 
@@ -1067,6 +1139,19 @@ EOF
 
     cat >> confdefs.h <<\EOF
 #define __BSD__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_GTK=1
+  ;;
+  *-*-openbsd*)
+    USE_BSD=1
+    USE_OPENBSD=1
+    cat >> confdefs.h <<\EOF
+#define __FREEBSD__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __OPENBSD__ 1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
@@ -1143,7 +1228,7 @@ EOF
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
-  *-*-cygwin32* | *-*-mingw32* )
+  *-*-cygwin* | *-*-mingw32* )
     USE_UNIX=0
     USE_WIN32=1
     cat >> confdefs.h <<\EOF
@@ -1185,13 +1270,13 @@ EOF
 
   *-*-darwin* )
     USE_BSD=1
-    USE_MAC=1
+    USE_DARWIN=1
     cat >> confdefs.h <<\EOF
-#define __MAC__ 1
+#define __BSD__ 1
 EOF
 
     cat >> confdefs.h <<\EOF
-#define __BSD__ 1
+#define __DARWIN__ 1
 EOF
 
     cat >> confdefs.h <<\EOF
@@ -1231,7 +1316,7 @@ fi
 
 if test "$USE_LINUX" = 1; then
   echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
-echo "configure:1235: checking for gettext in -lc" >&5
+echo "configure:1320: 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
@@ -1239,7 +1324,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1243 "configure"
+#line 1328 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1250,7 +1335,7 @@ int main() {
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:1254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1339: \"$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
@@ -1287,11 +1372,13 @@ fi
 
 DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then
+  DEFAULT_wxUSE_UNIVERSAL=no
+
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_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
@@ -1306,9 +1393,13 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes
+  DEFAULT_wxUSE_LOGWINDOW=no
+  DEFAULT_wxUSE_LOGGUI=no
 
   DEFAULT_wxUSE_GUI=yes
+  DEFAULT_wxUSE_CONTROLS=no
 
+  DEFAULT_wxUSE_REGEX=no
   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
   DEFAULT_wxUSE_LIBJPEG=no
@@ -1318,13 +1409,20 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_OPENGL=no
 
   DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
+  DEFAULT_wxUSE_SNGLINST_CHECKER=no
   DEFAULT_wxUSE_STD_IOSTREAM=no
+  DEFAULT_wxUSE_CMDLINE_PARSER=no
+  DEFAULT_wxUSE_DATETIME=no
+  DEFAULT_wxUSE_TIMEDATE=no
+  DEFAULT_wxUSE_TIMER=no
+  DEFAULT_wxUSE_STOPWATCH=no
   DEFAULT_wxUSE_FILE=no
+  DEFAULT_wxUSE_FFILE=no
   DEFAULT_wxUSE_TEXTFILE=no
-  DEFAULT_wxUSE_TIMEDATE=no
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=no
   DEFAULT_wxUSE_CONFIG=no
+  DEFAULT_wxUSE_FONTMAP=no
   DEFAULT_wxUSE_STREAMS=no
   DEFAULT_wxUSE_SOCKETS=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no
@@ -1342,6 +1440,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CLIPBOARD=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAG_AND_DROP=no
+  DEFAULT_wxUSE_DRAGIMAGE=no
   DEFAULT_wxUSE_SPLINES=no
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=no
@@ -1353,14 +1452,27 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CONSTRAINTS=no
   DEFAULT_wxUSE_IPC=no
   DEFAULT_wxUSE_HELP=no
+  DEFAULT_wxUSE_MS_HTML_HELP=no
+  DEFAULT_wxUSE_WXHTML_HELP=no
   DEFAULT_wxUSE_WXTREE=no
   DEFAULT_wxUSE_METAFILE=no
+  DEFAULT_wxUSE_MIMETYPE=no
+  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
 
   DEFAULT_wxUSE_COMMONDLGS=no
+  DEFAULT_wxUSE_CHOICEDLG=no
+  DEFAULT_wxUSE_COLOURDLG=no
   DEFAULT_wxUSE_DIRDLG=no
+  DEFAULT_wxUSE_FILEDLG=no
+  DEFAULT_wxUSE_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_WIZARDDLG=no
+
+  DEFAULT_wxUSE_MENUS=no
   DEFAULT_wxUSE_MINIFRAME=no
   DEFAULT_wxUSE_HTML=no
   DEFAULT_wxUSE_FILESYSTEM=no
@@ -1368,14 +1480,16 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ZIPSTREAM=no
-  DEFAULT_wxUSE_VALIDATORS=yes
+  DEFAULT_wxUSE_VALIDATORS=no
 
   DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_CARET=no
+  DEFAULT_wxUSE_BUTTON=no
   DEFAULT_wxUSE_BMPBUTTON=no
+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_CARET=no
   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLST=no
-  DEFAULT_wxUSE_CHOICE=yes
+  DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
@@ -1395,21 +1509,28 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_STATBMP=no
   DEFAULT_wxUSE_STATBOX=no
   DEFAULT_wxUSE_STATLINE=no
+  DEFAULT_wxUSE_STATTEXT=no
   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TABDIALOG=no
+  DEFAULT_wxUSE_TEXTCTRL=no
   DEFAULT_wxUSE_TOGGLEBTN=no
   DEFAULT_wxUSE_TOOLBAR=no
   DEFAULT_wxUSE_TOOLBAR_NATIVE=no
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TREECTRL=no
+  DEFAULT_wxUSE_POPUPWIN=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
+  DEFAULT_wxUSE_IMAGE=no
   DEFAULT_wxUSE_GIF=no
   DEFAULT_wxUSE_PCX=no
   DEFAULT_wxUSE_PNM=no
+  DEFAULT_wxUSE_XPM=no
 else
+  DEFAULT_wxUSE_UNIVERSAL=no
+
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
@@ -1429,9 +1550,12 @@ else
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes
+  DEFAULT_wxUSE_LOGWINDOW=yes
+  DEFAULT_wxUSE_LOGGUI=yes
 
   DEFAULT_wxUSE_GUI=yes
 
+  DEFAULT_wxUSE_REGEX=yes
   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
@@ -1441,13 +1565,20 @@ else
   DEFAULT_wxUSE_OPENGL=no
 
   DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
+  DEFAULT_wxUSE_SNGLINST_CHECKER=yes
   DEFAULT_wxUSE_STD_IOSTREAM=no
+  DEFAULT_wxUSE_CMDLINE_PARSER=yes
+  DEFAULT_wxUSE_DATETIME=yes
+  DEFAULT_wxUSE_TIMEDATE=no
+  DEFAULT_wxUSE_TIMER=yes
+  DEFAULT_wxUSE_STOPWATCH=yes
   DEFAULT_wxUSE_FILE=yes
+  DEFAULT_wxUSE_FFILE=yes
   DEFAULT_wxUSE_TEXTFILE=yes
-  DEFAULT_wxUSE_TIMEDATE=yes
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=yes
   DEFAULT_wxUSE_CONFIG=yes
+  DEFAULT_wxUSE_FONTMAP=yes
   DEFAULT_wxUSE_STREAMS=yes
   DEFAULT_wxUSE_SOCKETS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
@@ -1465,6 +1596,7 @@ else
   DEFAULT_wxUSE_CLIPBOARD=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_DRAG_AND_DROP=yes
+  DEFAULT_wxUSE_DRAGIMAGE=yes
   DEFAULT_wxUSE_SPLINES=yes
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
@@ -1476,14 +1608,27 @@ else
   DEFAULT_wxUSE_CONSTRAINTS=yes
   DEFAULT_wxUSE_IPC=yes
   DEFAULT_wxUSE_HELP=yes
+  DEFAULT_wxUSE_MS_HTML_HELP=yes
+  DEFAULT_wxUSE_WXHTML_HELP=yes
   DEFAULT_wxUSE_WXTREE=yes
   DEFAULT_wxUSE_METAFILE=yes
+  DEFAULT_wxUSE_MIMETYPE=yes
+  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
 
   DEFAULT_wxUSE_COMMONDLGS=yes
+  DEFAULT_wxUSE_CHOICEDLG=yes
+  DEFAULT_wxUSE_COLOURDLG=yes
   DEFAULT_wxUSE_DIRDLG=yes
+  DEFAULT_wxUSE_FILEDLG=yes
+  DEFAULT_wxUSE_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_WIZARDDLG=yes
+
+  DEFAULT_wxUSE_MENUS=yes
   DEFAULT_wxUSE_MINIFRAME=yes
   DEFAULT_wxUSE_HTML=yes
   DEFAULT_wxUSE_FILESYSTEM=yes
@@ -1494,8 +1639,10 @@ else
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_CARET=yes
+  DEFAULT_wxUSE_BUTTON=yes
   DEFAULT_wxUSE_BMPBUTTON=yes
+  DEFAULT_wxUSE_CALCTRL=yes
+  DEFAULT_wxUSE_CARET=yes
   DEFAULT_wxUSE_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLST=yes
   DEFAULT_wxUSE_CHOICE=yes
@@ -1518,20 +1665,25 @@ else
   DEFAULT_wxUSE_STATBMP=yes
   DEFAULT_wxUSE_STATBOX=yes
   DEFAULT_wxUSE_STATLINE=yes
+  DEFAULT_wxUSE_STATTEXT=yes
   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TABDIALOG=no
+  DEFAULT_wxUSE_TEXTCTRL=yes
   DEFAULT_wxUSE_TOGGLEBTN=yes
   DEFAULT_wxUSE_TOOLBAR=yes
   DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TREECTRL=yes
+  DEFAULT_wxUSE_POPUPWIN=yes
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
+  DEFAULT_wxUSE_IMAGE=yes
   DEFAULT_wxUSE_GIF=yes
   DEFAULT_wxUSE_PCX=yes
   DEFAULT_wxUSE_PNM=yes
+  DEFAULT_wxUSE_XPM=yes
 fi
 
 
@@ -1547,8 +1699,8 @@ done
 
 
 
-          echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6
-echo "configure:1552: checking "for --enable-gui"" >&5
+          echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
+echo "configure:1704: checking for --enable-gui" >&5
           no_cache=0
           # Check whether --enable-gui or --disable-gui was given.
 if test "${enable_gui+set}" = set; then
@@ -1588,6 +1740,45 @@ fi
 
 if test "$wxUSE_GUI" = "yes"; then
 
+
+          echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
+echo "configure:1746: 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"
@@ -1630,27 +1821,25 @@ if test "${with_pm+set}" = set; then
   wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
 fi
 
-
-# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
-if test "${with_gtk_prefix+set}" = set; then
-  withval="$with_gtk_prefix"
-  gtk_config_prefix="$withval"
-else
-  gtk_config_prefix=""
+# Check whether --with-mgl or --without-mgl was given.
+if test "${with_mgl+set}" = set; then
+  withval="$with_mgl"
+  wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1
 fi
 
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
-if test "${with_gtk_exec_prefix+set}" = set; then
-  withval="$with_gtk_exec_prefix"
-  gtk_config_exec_prefix="$withval"
+
+# Check whether --enable-gtk2 or --disable-gtk2 was given.
+if test "${enable_gtk2+set}" = set; then
+  enableval="$enable_gtk2"
+  wxUSE_GTK2=1
 else
-  gtk_config_exec_prefix=""
+  wxUSE_GTK2=0
 fi
 
 
 
-          echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6
-echo "configure:1654: checking "for --with-libpng"" >&5
+          echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
+echo "configure:1843: checking for --with-libpng" >&5
           no_cache=0
           # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then
@@ -1696,8 +1885,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6
-echo "configure:1701: checking "for --with-libjpeg"" >&5
+          echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
+echo "configure:1890: checking for --with-libjpeg" >&5
           no_cache=0
           # Check whether --with-libjpeg or --without-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then
@@ -1743,8 +1932,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6
-echo "configure:1748: checking "for --with-libtiff"" >&5
+          echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
+echo "configure:1937: checking for --with-libtiff" >&5
           no_cache=0
           # Check whether --with-libtiff or --without-libtiff was given.
 if test "${with_libtiff+set}" = set; then
@@ -1790,8 +1979,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --with-freetype"""... $ac_c" 1>&6
-echo "configure:1795: checking "for --with-freetype"" >&5
+          echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
+echo "configure:1984: checking for --with-freetype" >&5
           no_cache=0
           # Check whether --with-freetype or --without-freetype was given.
 if test "${with_freetype+set}" = set; then
@@ -1837,8 +2026,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6
-echo "configure:1842: checking "for --with-opengl"" >&5
+          echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
+echo "configure:2031: checking for --with-opengl" >&5
           no_cache=0
           # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then
@@ -1879,8 +2068,8 @@ fi
 fi
 
 
-          echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6
-echo "configure:1884: checking "for --with-dmalloc"" >&5
+          echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
+echo "configure:2073: checking for --with-dmalloc" >&5
           no_cache=0
           # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
@@ -1918,8 +2107,55 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6
-echo "configure:1923: checking "for --with-zlib"" >&5
+          echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
+echo "configure:2112: checking for --with-regex" >&5
+          no_cache=0
+          # Check whether --with-regex or --without-regex was given.
+if test "${with_regex+set}" = set; then
+  withval="$with_regex"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_regex='wxUSE_REGEX=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_regex='wxUSE_REGEX=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_regex='wxUSE_REGEX=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; }
+                        fi
+                      
+else
+  
+                        LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX
+                      
+fi
+
+
+          eval "$ac_cv_use_regex"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_regex >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_REGEX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_REGEX" = no; then
+            echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_REGEX" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; }
+          fi
+        
+
+          echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
+echo "configure:2159: checking for --with-zlib" >&5
           no_cache=0
           # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
@@ -1965,8 +2201,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6
-echo "configure:1970: checking "for --with-odbc"" >&5
+          echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
+echo "configure:2206: checking for --with-odbc" >&5
           no_cache=0
           # Check whether --with-odbc or --without-odbc was given.
 if test "${with_odbc+set}" = set; then
@@ -2007,8 +2243,8 @@ fi
 
 
 
-          echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6
-echo "configure:2012: checking "for --enable-shared"" >&5
+          echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
+echo "configure:2248: checking for --enable-shared" >&5
           no_cache=0
           # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
@@ -2046,8 +2282,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-burnt_name"""... $ac_c" 1>&6
-echo "configure:2051: checking "for --enable-burnt_name"" >&5
+          echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6
+echo "configure:2287: 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
@@ -2085,8 +2321,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6
-echo "configure:2090: checking "for --enable-optimise"" >&5
+          echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
+echo "configure:2326: checking for --enable-optimise" >&5
           no_cache=0
           # Check whether --enable-optimise or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then
@@ -2124,8 +2360,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6
-echo "configure:2129: checking "for --enable-debug"" >&5
+          echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
+echo "configure:2365: checking for --enable-debug" >&5
           no_cache=0
           # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -2172,8 +2408,8 @@ elif test "$wxUSE_DEBUG" = "no"; then
 fi
 
 
-          echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6
-echo "configure:2177: checking "for --enable-debug_flag"" >&5
+          echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
+echo "configure:2413: 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
@@ -2211,8 +2447,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6
-echo "configure:2216: checking "for --enable-debug_info"" >&5
+          echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
+echo "configure:2452: 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
@@ -2250,8 +2486,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6
-echo "configure:2255: checking "for --enable-debug_gdb"" >&5
+          echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
+echo "configure:2491: 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
@@ -2289,8 +2525,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6
-echo "configure:2294: checking "for --enable-debug_cntxt"" >&5
+          echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
+echo "configure:2530: 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
@@ -2328,8 +2564,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6
-echo "configure:2333: checking "for --enable-mem_tracing"" >&5
+          echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
+echo "configure:2569: 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
@@ -2367,8 +2603,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6
-echo "configure:2372: checking "for --enable-profile"" >&5
+          echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
+echo "configure:2608: checking for --enable-profile" >&5
           no_cache=0
           # Check whether --enable-profile or --disable-profile was given.
 if test "${enable_profile+set}" = set; then
@@ -2406,8 +2642,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6
-echo "configure:2411: checking "for --enable-no_rtti"" >&5
+          echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
+echo "configure:2647: 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
@@ -2445,8 +2681,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6
-echo "configure:2450: checking "for --enable-no_exceptions"" >&5
+          echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
+echo "configure:2686: 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
@@ -2484,8 +2720,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6
-echo "configure:2489: checking "for --enable-permissive"" >&5
+          echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
+echo "configure:2725: checking for --enable-permissive" >&5
           no_cache=0
           # Check whether --enable-permissive or --disable-permissive was given.
 if test "${enable_permissive+set}" = set; then
@@ -2523,8 +2759,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6
-echo "configure:2528: checking "for --enable-no_deps"" >&5
+          echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
+echo "configure:2764: 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
@@ -2563,9 +2799,88 @@ fi
         
 
 
+          echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6
+echo "configure:2804: 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:2843: 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:2569: checking "for --enable-intl"" >&5
+          echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
+echo "configure:2884: checking for --enable-intl" >&5
           no_cache=0
           # Check whether --enable-intl or --disable-intl was given.
 if test "${enable_intl+set}" = set; then
@@ -2603,8 +2918,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6
-echo "configure:2608: checking "for --enable-config"" >&5
+          echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
+echo "configure:2923: checking for --enable-config" >&5
           no_cache=0
           # Check whether --enable-config or --disable-config was given.
 if test "${enable_config+set}" = set; then
@@ -2643,8 +2958,8 @@ fi
         
 
 
-          echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6
-echo "configure:2648: checking "for --enable-sockets"" >&5
+          echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
+echo "configure:2963: checking for --enable-sockets" >&5
           no_cache=0
           # Check whether --enable-sockets or --disable-sockets was given.
 if test "${enable_sockets+set}" = set; then
@@ -2683,8 +2998,8 @@ fi
         
 
 
-          echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6
-echo "configure:2688: checking "for --enable-ipc"" >&5
+          echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
+echo "configure:3003: checking for --enable-ipc" >&5
           no_cache=0
           # Check whether --enable-ipc or --disable-ipc was given.
 if test "${enable_ipc+set}" = set; then
@@ -2723,86 +3038,86 @@ fi
         
 
 
-          echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6
-echo "configure:2728: checking "for --enable-dialupman"" >&5
+          echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
+echo "configure:3043: checking for --enable-cmdline" >&5
           no_cache=0
-          # Check whether --enable-dialupman or --disable-dialupman was given.
-if test "${enable_dialupman+set}" = set; then
-  enableval="$enable_dialupman"
+          # Check whether --enable-cmdline or --disable-cmdline was given.
+if test "${enable_cmdline+set}" = set; then
+  enableval="$enable_cmdline"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
                           else
-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
                           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
 
-                          ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
+                          ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER
                         
 fi
 
 
-          eval "$ac_cv_use_dialupman"
+          eval "$ac_cv_use_cmdline"
           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
 
-          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_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6
-echo "configure:2767: checking "for --enable-apple_ieee"" >&5
+          echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
+echo "configure:3082: checking for --enable-datetime" >&5
           no_cache=0
-          # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
-if test "${enable_apple_ieee+set}" = set; then
-  enableval="$enable_apple_ieee"
+          # Check whether --enable-datetime or --disable-datetime was given.
+if test "${enable_datetime+set}" = set; then
+  enableval="$enable_datetime"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
+                            ac_cv_use_datetime='wxUSE_DATETIME=yes'
                           else
-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+                            ac_cv_use_datetime='wxUSE_DATETIME=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
+                          ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME
                         
 fi
 
 
-          eval "$ac_cv_use_apple_ieee"
+          eval "$ac_cv_use_datetime"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_APPLE_IEEE" = yes; then
+          if test "$wxUSE_DATETIME" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6
-echo "configure:2806: checking "for --enable-timedate"" >&5
+          echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
+echo "configure:3121: checking for --enable-timedate" >&5
           no_cache=0
           # Check whether --enable-timedate or --disable-timedate was given.
 if test "${enable_timedate+set}" = set; then
@@ -2840,91 +3155,247 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6
-echo "configure:2845: checking "for --enable-wave"" >&5
+          echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
+echo "configure:3160: checking for --enable-stopwatch" >&5
           no_cache=0
-          # Check whether --enable-wave or --disable-wave was given.
-if test "${enable_wave+set}" = set; then
-  enableval="$enable_wave"
+          # Check whether --enable-stopwatch or --disable-stopwatch was given.
+if test "${enable_stopwatch+set}" = set; then
+  enableval="$enable_stopwatch"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_wave='wxUSE_WAVE=yes'
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
                           else
-                            ac_cv_use_wave='wxUSE_WAVE=no'
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+                          ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
                         
 fi
 
 
-          eval "$ac_cv_use_wave"
+          eval "$ac_cv_use_stopwatch"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_WAVE" = yes; then
+          if test "$wxUSE_STOPWATCH" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6
-echo "configure:2884: checking "for --enable-fraction"" >&5
+          echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
+echo "configure:3199: checking for --enable-dialupman" >&5
           no_cache=0
-          # Check whether --enable-fraction or --disable-fraction was given.
-if test "${enable_fraction+set}" = set; then
-  enableval="$enable_fraction"
+          # Check whether --enable-dialupman or --disable-dialupman was given.
+if test "${enable_dialupman+set}" = set; then
+  enableval="$enable_dialupman"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_fraction='wxUSE_FRACTION=yes'
+                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
                           else
-                            ac_cv_use_fraction='wxUSE_FRACTION=no'
+                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+                          ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
                         
 fi
 
 
-          eval "$ac_cv_use_fraction"
+          eval "$ac_cv_use_dialupman"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_FRACTION" = yes; then
+          if test "$wxUSE_DIALUP_MANAGER" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6
-echo "configure:2923: checking "for --enable-dynlib"" >&5
+          echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
+echo "configure:3238: checking for --enable-apple_ieee" >&5
           no_cache=0
-          # Check whether --enable-dynlib or --disable-dynlib was given.
-if test "${enable_dynlib+set}" = set; then
-  enableval="$enable_dynlib"
-  
+          # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
+if test "${enable_apple_ieee+set}" = set; then
+  enableval="$enable_apple_ieee"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_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:3277: 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:3316: 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:3355: 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 "$enableval" = yes; then
+                            ac_cv_use_fraction='wxUSE_FRACTION=yes'
+                          else
+                            ac_cv_use_fraction='wxUSE_FRACTION=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+                        
+fi
+
+
+          eval "$ac_cv_use_fraction"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FRACTION" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
+echo "configure:3394: checking for --enable-dynlib" >&5
+          no_cache=0
+          # Check whether --enable-dynlib or --disable-dynlib was given.
+if test "${enable_dynlib+set}" = set; then
+  enableval="$enable_dynlib"
+  
                           if test "$enableval" = yes; then
                             ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
                           else
@@ -2957,8 +3428,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6
-echo "configure:2962: checking "for --enable-longlong"" >&5
+          echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
+echo "configure:3433: checking for --enable-longlong" >&5
           no_cache=0
           # Check whether --enable-longlong or --disable-longlong was given.
 if test "${enable_longlong+set}" = set; then
@@ -2996,8 +3467,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-geometry"""... $ac_c" 1>&6
-echo "configure:3001: checking "for --enable-geometry"" >&5
+          echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
+echo "configure:3472: checking for --enable-geometry" >&5
           no_cache=0
           # Check whether --enable-geometry or --disable-geometry was given.
 if test "${enable_geometry+set}" = set; then
@@ -3035,8 +3506,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6
-echo "configure:3040: checking "for --enable-log"" >&5
+          echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
+echo "configure:3511: checking for --enable-log" >&5
           no_cache=0
           # Check whether --enable-log or --disable-log was given.
 if test "${enable_log+set}" = set; then
@@ -3074,8 +3545,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6
-echo "configure:3079: checking "for --enable-streams"" >&5
+          echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
+echo "configure:3550: checking for --enable-streams" >&5
           no_cache=0
           # Check whether --enable-streams or --disable-streams was given.
 if test "${enable_streams+set}" = set; then
@@ -3113,8 +3584,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6
-echo "configure:3118: checking "for --enable-file"" >&5
+          echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
+echo "configure:3589: checking for --enable-file" >&5
           no_cache=0
           # Check whether --enable-file or --disable-file was given.
 if test "${enable_file+set}" = set; then
@@ -3152,8 +3623,47 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6
-echo "configure:3157: checking "for --enable-textfile"" >&5
+          echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
+echo "configure:3628: 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:3667: checking for --enable-textfile" >&5
           no_cache=0
           # Check whether --enable-textfile or --disable-textfile was given.
 if test "${enable_textfile+set}" = set; then
@@ -3191,8 +3701,47 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6
-echo "configure:3196: checking "for --enable-unicode"" >&5
+          echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
+echo "configure:3706: 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:3745: checking for --enable-unicode" >&5
           no_cache=0
           # Check whether --enable-unicode or --disable-unicode was given.
 if test "${enable_unicode+set}" = set; then
@@ -3230,8 +3779,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6
-echo "configure:3235: checking "for --enable-wcsrtombs"" >&5
+          echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6
+echo "configure:3784: checking for --enable-wcsrtombs" >&5
           no_cache=0
           # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
 if test "${enable_wcsrtombs+set}" = set; then
@@ -3269,8 +3818,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6
-echo "configure:3274: checking "for --enable-wxprintfv"" >&5
+          echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
+echo "configure:3823: checking for --enable-wxprintfv" >&5
           no_cache=0
           # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
 if test "${enable_wxprintfv+set}" = set; then
@@ -3308,8 +3857,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6
-echo "configure:3313: checking "for --enable-std_iostreams"" >&5
+          echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
+echo "configure:3862: checking for --enable-std_iostreams" >&5
           no_cache=0
           # Check whether --enable-std_iostreams or --disable-std_iostreams was given.
 if test "${enable_std_iostreams+set}" = set; then
@@ -3347,8 +3896,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-filesystem"""... $ac_c" 1>&6
-echo "configure:3352: checking "for --enable-filesystem"" >&5
+          echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
+echo "configure:3901: checking for --enable-filesystem" >&5
           no_cache=0
           # Check whether --enable-filesystem or --disable-filesystem was given.
 if test "${enable_filesystem+set}" = set; then
@@ -3386,8 +3935,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6
-echo "configure:3391: checking "for --enable-fs_inet"" >&5
+          echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
+echo "configure:3940: 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
@@ -3425,8 +3974,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6
-echo "configure:3430: checking "for --enable-fs_zip"" >&5
+          echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
+echo "configure:3979: 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
@@ -3464,8 +4013,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6
-echo "configure:3469: checking "for --enable-zipstream"" >&5
+          echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
+echo "configure:4018: checking for --enable-zipstream" >&5
           no_cache=0
           # Check whether --enable-zipstream or --disable-zipstream was given.
 if test "${enable_zipstream+set}" = set; then
@@ -3504,8 +4053,8 @@ fi
         
 
 
-          echo $ac_n "checking "for --enable-catch_segvs"""... $ac_c" 1>&6
-echo "configure:3509: checking "for --enable-catch_segvs"" >&5
+          echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
+echo "configure:4058: 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
@@ -3543,558 +4092,592 @@ fi
           fi
         
 
-
-
-          echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6
-echo "configure:3550: checking "for --enable-threads"" >&5
+          echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
+echo "configure:4097: checking for --enable-snglinst" >&5
           no_cache=0
-          # Check whether --enable-threads or --disable-threads was given.
-if test "${enable_threads+set}" = set; then
-  enableval="$enable_threads"
+          # Check whether --enable-snglinst or --disable-snglinst was given.
+if test "${enable_snglinst+set}" = set; then
+  enableval="$enable_snglinst"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_threads='wxUSE_THREADS=yes'
+                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
                           else
-                            ac_cv_use_threads='wxUSE_THREADS=no'
+                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
+                          ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
                         
 fi
 
 
-          eval "$ac_cv_use_threads"
+          eval "$ac_cv_use_snglinst"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_THREADS" = yes; then
+          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-serial"""... $ac_c" 1>&6
-echo "configure:3589: checking "for --enable-serial"" >&5
+
+          echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
+echo "configure:4137: checking for --enable-mimetype" >&5
           no_cache=0
-          # Check whether --enable-serial or --disable-serial was given.
-if test "${enable_serial+set}" = set; then
-  enableval="$enable_serial"
+          # Check whether --enable-mimetype or --disable-mimetype was given.
+if test "${enable_mimetype+set}" = set; then
+  enableval="$enable_mimetype"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_serial='wxUSE_SERIAL=yes'
+                            ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
                           else
-                            ac_cv_use_serial='wxUSE_SERIAL=no'
+                            ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SERIAL" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL
+                          ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
                         
 fi
 
 
-          eval "$ac_cv_use_serial"
+          eval "$ac_cv_use_mimetype"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_serial >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SERIAL" = yes; then
+          if test "$wxUSE_MIMETYPE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-if test "$wxUSE_GUI" = "yes"; then
-
-
-
-          echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6
-echo "configure:3632: checking "for --enable-docview"" >&5
+          echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6
+echo "configure:4176: checking for --enable-system_options" >&5
           no_cache=0
-          # Check whether --enable-docview or --disable-docview was given.
-if test "${enable_docview+set}" = set; then
-  enableval="$enable_docview"
+          # Check whether --enable-system_options or --disable-system_options was given.
+if test "${enable_system_options+set}" = set; then
+  enableval="$enable_system_options"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
+                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
                           else
-                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
+                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
+                          ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS
                         
 fi
 
 
-          eval "$ac_cv_use_docview"
+          eval "$ac_cv_use_system_options"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
+          if test "$wxUSE_SYSTEM_OPTIONS" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6
-echo "configure:3671: checking "for --enable-help"" >&5
+
+
+          echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
+echo "configure:4217: checking for --enable-threads" >&5
           no_cache=0
-          # Check whether --enable-help or --disable-help was given.
-if test "${enable_help+set}" = set; then
-  enableval="$enable_help"
+          # Check whether --enable-threads or --disable-threads was given.
+if test "${enable_threads+set}" = set; then
+  enableval="$enable_threads"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_help='wxUSE_HELP=yes'
+                            ac_cv_use_threads='wxUSE_THREADS=yes'
                           else
-                            ac_cv_use_help='wxUSE_HELP=no'
+                            ac_cv_use_threads='wxUSE_THREADS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
+                          ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
                         
 fi
 
 
-          eval "$ac_cv_use_help"
+          eval "$ac_cv_use_threads"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_HELP" = yes; then
+          if test "$wxUSE_THREADS" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6
-echo "configure:3710: checking "for --enable-constraints"" >&5
+          echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6
+echo "configure:4256: checking for --enable-serial" >&5
           no_cache=0
-          # Check whether --enable-constraints or --disable-constraints was given.
-if test "${enable_constraints+set}" = set; then
-  enableval="$enable_constraints"
+          # Check whether --enable-serial or --disable-serial was given.
+if test "${enable_serial+set}" = set; then
+  enableval="$enable_serial"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
+                            ac_cv_use_serial='wxUSE_SERIAL=yes'
                           else
-                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
+                            ac_cv_use_serial='wxUSE_SERIAL=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SERIAL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
+                          ac_cv_use_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL
                         
 fi
 
 
-          eval "$ac_cv_use_constraints"
+          eval "$ac_cv_use_serial"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_serial >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CONSTRAINTS" = yes; then
+          if test "$wxUSE_SERIAL" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6
-echo "configure:3749: checking "for --enable-printarch"" >&5
+if test "$wxUSE_GUI" = "yes"; then
+
+
+
+          echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
+echo "configure:4299: checking for --enable-docview" >&5
           no_cache=0
-          # Check whether --enable-printarch or --disable-printarch was given.
-if test "${enable_printarch+set}" = set; then
-  enableval="$enable_printarch"
+          # Check whether --enable-docview or --disable-docview was given.
+if test "${enable_docview+set}" = set; then
+  enableval="$enable_docview"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
                           else
-                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
+                          ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
                         
 fi
 
 
-          eval "$ac_cv_use_printarch"
+          eval "$ac_cv_use_docview"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then
+          if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6
-echo "configure:3788: checking "for --enable-mdi"" >&5
+          echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
+echo "configure:4338: checking for --enable-help" >&5
           no_cache=0
-          # Check whether --enable-mdi or --disable-mdi was given.
-if test "${enable_mdi+set}" = set; then
-  enableval="$enable_mdi"
+          # Check whether --enable-help or --disable-help was given.
+if test "${enable_help+set}" = set; then
+  enableval="$enable_help"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=yes'
+                            ac_cv_use_help='wxUSE_HELP=yes'
                           else
-                            ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no'
+                            ac_cv_use_help='wxUSE_HELP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
+                          ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
                         
 fi
 
 
-          eval "$ac_cv_use_mdi"
+          eval "$ac_cv_use_help"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_MDI_ARCHITECTURE" = yes; then
+          if test "$wxUSE_HELP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-          echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6
-echo "configure:3828: checking "for --enable-postscript"" >&5
+          echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
+echo "configure:4377: checking for --enable-mshtmlhelp" >&5
           no_cache=0
-          # Check whether --enable-postscript or --disable-postscript was given.
-if test "${enable_postscript+set}" = set; then
-  enableval="$enable_postscript"
+          # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
+if test "${enable_mshtmlhelp+set}" = set; then
+  enableval="$enable_mshtmlhelp"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
+                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
                           else
-                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
+                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
+                          ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP
                         
 fi
 
 
-          eval "$ac_cv_use_postscript"
+          eval "$ac_cv_use_mshtmlhelp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_POSTSCRIPT" = yes; then
+          if test "$wxUSE_MS_HTML_HELP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-
-          echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6
-echo "configure:3869: checking "for --enable-prologio"" >&5
+          echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
+echo "configure:4416: checking for --enable-html" >&5
           no_cache=0
-          # Check whether --enable-prologio or --disable-prologio was given.
-if test "${enable_prologio+set}" = set; then
-  enableval="$enable_prologio"
+          # Check whether --enable-html or --disable-html was given.
+if test "${enable_html+set}" = set; then
+  enableval="$enable_html"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_prologio='wxUSE_PROLOGIO=yes'
+                            ac_cv_use_html='wxUSE_HTML=yes'
                           else
-                            ac_cv_use_prologio='wxUSE_PROLOGIO=no'
+                            ac_cv_use_html='wxUSE_HTML=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
+                          ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
                         
 fi
 
 
-          eval "$ac_cv_use_prologio"
+          eval "$ac_cv_use_html"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_PROLOGIO" = yes; then
+          if test "$wxUSE_HTML" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6
-echo "configure:3908: checking "for --enable-resources"" >&5
+          echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6
+echo "configure:4455: checking for --enable-htmlhelp" >&5
           no_cache=0
-          # Check whether --enable-resources or --disable-resources was given.
-if test "${enable_resources+set}" = set; then
-  enableval="$enable_resources"
+          # Check whether --enable-htmlhelp or --disable-htmlhelp was given.
+if test "${enable_htmlhelp+set}" = set; then
+  enableval="$enable_htmlhelp"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_resources='wxUSE_RESOURCES=yes'
+                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
                           else
-                            ac_cv_use_resources='wxUSE_RESOURCES=no'
+                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
+                          ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP
                         
 fi
 
 
-          eval "$ac_cv_use_resources"
+          eval "$ac_cv_use_htmlhelp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_RESOURCES" = yes; then
+          if test "$wxUSE_WXHTML_HELP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-          echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6
-echo "configure:3948: checking "for --enable-xresources"" >&5
+          echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6
+echo "configure:4494: checking for --enable-constraints" >&5
           no_cache=0
-          # Check whether --enable-xresources or --disable-xresources was given.
-if test "${enable_xresources+set}" = set; then
-  enableval="$enable_xresources"
+          # Check whether --enable-constraints or --disable-constraints was given.
+if test "${enable_constraints+set}" = set; then
+  enableval="$enable_constraints"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_xresources='wxUSE_X_RESOURCES=yes'
+                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
                           else
-                            ac_cv_use_xresources='wxUSE_X_RESOURCES=no'
+                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_X_RESOURCES" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_xresources='wxUSE_X_RESOURCES='$DEFAULT_wxUSE_X_RESOURCES
+                          ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
                         
 fi
 
 
-          eval "$ac_cv_use_xresources"
+          eval "$ac_cv_use_constraints"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_xresources >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_X_RESOURCES" = yes; then
+          if test "$wxUSE_CONSTRAINTS" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
+          echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
+echo "configure:4533: checking for --enable-printarch" >&5
+          no_cache=0
+          # Check whether --enable-printarch or --disable-printarch was given.
+if test "${enable_printarch+set}" = set; then
+  enableval="$enable_printarch"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+                          else
+                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
+                        
+fi
+
+
+          eval "$ac_cv_use_printarch"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp
+          fi
 
+          if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-          echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6
-echo "configure:3989: checking "for --enable-clipboard"" >&5
+          echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
+echo "configure:4572: checking for --enable-mdi" >&5
           no_cache=0
-          # Check whether --enable-clipboard or --disable-clipboard was given.
-if test "${enable_clipboard+set}" = set; then
-  enableval="$enable_clipboard"
+          # Check whether --enable-mdi or --disable-mdi was given.
+if test "${enable_mdi+set}" = set; then
+  enableval="$enable_mdi"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
+                            ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=yes'
                           else
-                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=no'
+                            ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
+                          ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
                         
 fi
 
 
-          eval "$ac_cv_use_clipboard"
+          eval "$ac_cv_use_mdi"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CLIPBOARD" = yes; then
+          if test "$wxUSE_MDI_ARCHITECTURE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6
-echo "configure:4028: checking "for --enable-dnd"" >&5
+          echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
+echo "configure:4611: checking for --enable-loggui" >&5
           no_cache=0
-          # Check whether --enable-dnd or --disable-dnd was given.
-if test "${enable_dnd+set}" = set; then
-  enableval="$enable_dnd"
+          # Check whether --enable-loggui or --disable-loggui was given.
+if test "${enable_loggui+set}" = set; then
+  enableval="$enable_loggui"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
+                            ac_cv_use_loggui='wxUSE_LOGGUI=yes'
                           else
-                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
+                            ac_cv_use_loggui='wxUSE_LOGGUI=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP
+                          ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI
                         
 fi
 
 
-          eval "$ac_cv_use_dnd"
+          eval "$ac_cv_use_loggui"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_DRAG_AND_DROP" = yes; then
+          if test "$wxUSE_LOGGUI" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-metafile"""... $ac_c" 1>&6
-echo "configure:4067: checking "for --enable-metafile"" >&5
+          echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6
+echo "configure:4650: checking for --enable-logwin" >&5
           no_cache=0
-          # Check whether --enable-metafile or --disable-metafile was given.
-if test "${enable_metafile+set}" = set; then
-  enableval="$enable_metafile"
+          # 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_metafile='wxUSE_METAFILE=yes'
+                            ac_cv_use_logwin='wxUSE_LOGWINDOW=yes'
                           else
-                            ac_cv_use_metafile='wxUSE_METAFILE=no'
+                            ac_cv_use_logwin='wxUSE_LOGWINDOW=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
+                          ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW
                         
 fi
 
 
-          eval "$ac_cv_use_metafile"
+          eval "$ac_cv_use_logwin"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_METAFILE" = yes; then
+          if test "$wxUSE_LOGWINDOW" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
@@ -4102,39 +4685,39 @@ fi
         
 
 
-          echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6
-echo "configure:4107: checking "for --enable-wxtree"" >&5
+          echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6
+echo "configure:4690: checking for --enable-postscript" >&5
           no_cache=0
-          # Check whether --enable-wxtree or --disable-wxtree was given.
-if test "${enable_wxtree+set}" = set; then
-  enableval="$enable_wxtree"
+          # Check whether --enable-postscript or --disable-postscript was given.
+if test "${enable_postscript+set}" = set; then
+  enableval="$enable_postscript"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_wxtree='wxUSE_WXTREE=yes'
+                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
                           else
-                            ac_cv_use_wxtree='wxUSE_WXTREE=no'
+                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_WXTREE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_wxtree='wxUSE_WXTREE='$DEFAULT_wxUSE_WXTREE
+                          ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
                         
 fi
 
 
-          eval "$ac_cv_use_wxtree"
+          eval "$ac_cv_use_postscript"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_wxtree >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_WXTREE" = yes; then
+          if test "$wxUSE_POSTSCRIPT" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
@@ -4143,58 +4726,340 @@ fi
 
 
 
-          echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6
-echo "configure:4148: checking "for --enable-controls"" >&5
+
+          echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
+echo "configure:4732: checking for --enable-prologio" >&5
           no_cache=0
-          # Check whether --enable-controls or --disable-controls was given.
-if test "${enable_controls+set}" = set; then
-  enableval="$enable_controls"
+          # Check whether --enable-prologio or --disable-prologio was given.
+if test "${enable_prologio+set}" = set; then
+  enableval="$enable_prologio"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_controls='wxUSE_CONTROLS=yes'
+                            ac_cv_use_prologio='wxUSE_PROLOGIO=yes'
                           else
-                            ac_cv_use_controls='wxUSE_CONTROLS=no'
+                            ac_cv_use_prologio='wxUSE_PROLOGIO=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS
+                          ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
                         
 fi
 
 
-          eval "$ac_cv_use_controls"
+          eval "$ac_cv_use_prologio"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CONTROLS" = yes; then
+          if test "$wxUSE_PROLOGIO" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-if test "$wxUSE_CONTROLS" = "yes"; then
-  DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_CARET=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_BMPBUTTON=yes
-  DEFAULT_wxUSE_CHECKBOX=yes
-  DEFAULT_wxUSE_CHECKLISTBOX=yes
-  DEFAULT_wxUSE_CHOICE=yes
-  DEFAULT_wxUSE_GAUGE=yes
-  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_NEW_GRID=yes
-  DEFAULT_wxUSE_IMAGLIST=yes
-  DEFAULT_wxUSE_LISTBOX=yes
+          echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
+echo "configure:4771: checking for --enable-resources" >&5
+          no_cache=0
+          # Check whether --enable-resources or --disable-resources was given.
+if test "${enable_resources+set}" = set; then
+  enableval="$enable_resources"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_resources='wxUSE_RESOURCES=yes'
+                          else
+                            ac_cv_use_resources='wxUSE_RESOURCES=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
+                        
+fi
+
+
+          eval "$ac_cv_use_resources"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_RESOURCES" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+          echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
+echo "configure:4811: checking for --enable-xresources" >&5
+          no_cache=0
+          # Check whether --enable-xresources or --disable-xresources was given.
+if test "${enable_xresources+set}" = set; then
+  enableval="$enable_xresources"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_xresources='wxUSE_X_RESOURCES=yes'
+                          else
+                            ac_cv_use_xresources='wxUSE_X_RESOURCES=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_X_RESOURCES" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_xresources='wxUSE_X_RESOURCES='$DEFAULT_wxUSE_X_RESOURCES
+                        
+fi
+
+
+          eval "$ac_cv_use_xresources"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_xresources >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_X_RESOURCES" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+          echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
+echo "configure:4852: checking for --enable-clipboard" >&5
+          no_cache=0
+          # Check whether --enable-clipboard or --disable-clipboard was given.
+if test "${enable_clipboard+set}" = set; then
+  enableval="$enable_clipboard"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
+                          else
+                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
+                        
+fi
+
+
+          eval "$ac_cv_use_clipboard"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CLIPBOARD" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
+echo "configure:4891: checking for --enable-dnd" >&5
+          no_cache=0
+          # Check whether --enable-dnd or --disable-dnd was given.
+if test "${enable_dnd+set}" = set; then
+  enableval="$enable_dnd"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
+                          else
+                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP
+                        
+fi
+
+
+          eval "$ac_cv_use_dnd"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DRAG_AND_DROP" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:4930: 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:4970: checking for --enable-wxtree" >&5
+          no_cache=0
+          # Check whether --enable-wxtree or --disable-wxtree was given.
+if test "${enable_wxtree+set}" = set; then
+  enableval="$enable_wxtree"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_wxtree='wxUSE_WXTREE=yes'
+                          else
+                            ac_cv_use_wxtree='wxUSE_WXTREE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_WXTREE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_wxtree='wxUSE_WXTREE='$DEFAULT_wxUSE_WXTREE
+                        
+fi
+
+
+          eval "$ac_cv_use_wxtree"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wxtree >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_WXTREE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+          echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
+echo "configure:5011: checking for --enable-controls" >&5
+          no_cache=0
+          # Check whether --enable-controls or --disable-controls was given.
+if test "${enable_controls+set}" = set; then
+  enableval="$enable_controls"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_controls='wxUSE_CONTROLS=yes'
+                          else
+                            ac_cv_use_controls='wxUSE_CONTROLS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS
+                        
+fi
+
+
+          eval "$ac_cv_use_controls"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CONTROLS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+if test "$wxUSE_CONTROLS" = "yes"; then
+  DEFAULT_wxUSE_ACCEL=yes
+  DEFAULT_wxUSE_BMPBUTTON=yes
+  DEFAULT_wxUSE_BUTTON=yes
+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_CARET=yes
+  DEFAULT_wxUSE_COMBOBOX=yes
+  DEFAULT_wxUSE_CHECKBOX=yes
+  DEFAULT_wxUSE_CHECKLISTBOX=yes
+  DEFAULT_wxUSE_CHOICE=yes
+  DEFAULT_wxUSE_GAUGE=yes
+  DEFAULT_wxUSE_GRID=yes
+  DEFAULT_wxUSE_NEW_GRID=yes
+  DEFAULT_wxUSE_IMAGLIST=yes
+  DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
   DEFAULT_wxUSE_RADIOBOX=yes
@@ -4216,11 +5081,14 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_TREECTRL=yes
+  DEFAULT_wxUSE_POPUPWIN=yes
 elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_ACCEL=no
+  DEFAULT_wxUSE_BMPBUTTON=no
+  DEFAULT_wxUSE_BUTTON=no
+  DEFAULT_wxUSE_CALCTRL=no
   DEFAULT_wxUSE_CARET=no
   DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_BMPBUTTON=no
   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLISTBOX=no
   DEFAULT_wxUSE_CHOICE=no
@@ -4250,1339 +5118,1769 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_TREECTRL=no
+  DEFAULT_wxUSE_POPUPWIN=no
+fi
+
+
+          echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
+echo "configure:5127: checking for --enable-accel" >&5
+          no_cache=0
+          # Check whether --enable-accel or --disable-accel was given.
+if test "${enable_accel+set}" = set; then
+  enableval="$enable_accel"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_accel='wxUSE_ACCEL=yes'
+                          else
+                            ac_cv_use_accel='wxUSE_ACCEL=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL
+                        
+fi
+
+
+          eval "$ac_cv_use_accel"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_ACCEL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
+echo "configure:5166: checking for --enable-button" >&5
+          no_cache=0
+          # Check whether --enable-button or --disable-button was given.
+if test "${enable_button+set}" = set; then
+  enableval="$enable_button"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_button='wxUSE_BUTTON=yes'
+                          else
+                            ac_cv_use_button='wxUSE_BUTTON=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON
+                        
+fi
+
+
+          eval "$ac_cv_use_button"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_BUTTON" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
+echo "configure:5205: checking for --enable-bmpbutton" >&5
+          no_cache=0
+          # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
+if test "${enable_bmpbutton+set}" = set; then
+  enableval="$enable_bmpbutton"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
+                          else
+                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON
+                        
+fi
+
+
+          eval "$ac_cv_use_bmpbutton"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_BMPBUTTON" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
+echo "configure:5244: checking for --enable-calendar" >&5
+          no_cache=0
+          # Check whether --enable-calendar or --disable-calendar was given.
+if test "${enable_calendar+set}" = set; then
+  enableval="$enable_calendar"
+  
+                          if test "$enableval" = yes; then
+                            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:5283: 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:5322: 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
+  
+                          LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX
+                        
 fi
 
 
-          echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6
-echo "configure:4258: checking "for --enable-accel"" >&5
+          eval "$ac_cv_use_checkbox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CHECKBOX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
+echo "configure:5361: checking for --enable-checklst" >&5
           no_cache=0
-          # Check whether --enable-accel or --disable-accel was given.
-if test "${enable_accel+set}" = set; then
-  enableval="$enable_accel"
+          # Check whether --enable-checklst or --disable-checklst was given.
+if test "${enable_checklst+set}" = set; then
+  enableval="$enable_checklst"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_accel='wxUSE_ACCEL=yes'
+                            ac_cv_use_checklst='wxUSE_CHECKLST=yes'
                           else
-                            ac_cv_use_accel='wxUSE_ACCEL=no'
+                            ac_cv_use_checklst='wxUSE_CHECKLST=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL
+                          ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST
                         
 fi
 
 
-          eval "$ac_cv_use_accel"
+          eval "$ac_cv_use_checklst"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_ACCEL" = yes; then
+          if test "$wxUSE_CHECKLST" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6
-echo "configure:4297: checking "for --enable-caret"" >&5
+          echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
+echo "configure:5400: checking for --enable-choice" >&5
           no_cache=0
-          # Check whether --enable-caret or --disable-caret was given.
-if test "${enable_caret+set}" = set; then
-  enableval="$enable_caret"
+          # Check whether --enable-choice or --disable-choice was given.
+if test "${enable_choice+set}" = set; then
+  enableval="$enable_choice"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_caret='wxUSE_CARET=yes'
+                            ac_cv_use_choice='wxUSE_CHOICE=yes'
                           else
-                            ac_cv_use_caret='wxUSE_CARET=no'
+                            ac_cv_use_choice='wxUSE_CHOICE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
+                          ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE
                         
 fi
 
 
-          eval "$ac_cv_use_caret"
+          eval "$ac_cv_use_choice"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CARET" = yes; then
+          if test "$wxUSE_CHOICE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6
-echo "configure:4336: checking "for --enable-bmpbutton"" >&5
+          echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
+echo "configure:5439: checking for --enable-combobox" >&5
           no_cache=0
-          # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
-if test "${enable_bmpbutton+set}" = set; then
-  enableval="$enable_bmpbutton"
+          # Check whether --enable-combobox or --disable-combobox was given.
+if test "${enable_combobox+set}" = set; then
+  enableval="$enable_combobox"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
+                            ac_cv_use_combobox='wxUSE_COMBOBOX=yes'
                           else
-                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
+                            ac_cv_use_combobox='wxUSE_COMBOBOX=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON
+                          ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX
                         
 fi
 
 
-          eval "$ac_cv_use_bmpbutton"
+          eval "$ac_cv_use_combobox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_COMBOBOX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
+echo "configure:5478: checking for --enable-gauge" >&5
+          no_cache=0
+          # Check whether --enable-gauge or --disable-gauge was given.
+if test "${enable_gauge+set}" = set; then
+  enableval="$enable_gauge"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_gauge='wxUSE_GAUGE=yes'
+                          else
+                            ac_cv_use_gauge='wxUSE_GAUGE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
+                        
+fi
+
+
+          eval "$ac_cv_use_gauge"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GAUGE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
+echo "configure:5517: checking for --enable-grid" >&5
+          no_cache=0
+          # Check whether --enable-grid or --disable-grid was given.
+if test "${enable_grid+set}" = set; then
+  enableval="$enable_grid"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_grid='wxUSE_GRID=yes'
+                          else
+                            ac_cv_use_grid='wxUSE_GRID=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
+                        
+fi
+
+
+          eval "$ac_cv_use_grid"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GRID" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
+echo "configure:5556: checking for --enable-newgrid" >&5
+          no_cache=0
+          # Check whether --enable-newgrid or --disable-newgrid was given.
+if test "${enable_newgrid+set}" = set; then
+  enableval="$enable_newgrid"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_newgrid='wxUSE_NEW_GRID=yes'
+                          else
+                            ac_cv_use_newgrid='wxUSE_NEW_GRID=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID
+                        
+fi
+
+
+          eval "$ac_cv_use_newgrid"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_NEW_GRID" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
+echo "configure:5595: checking for --enable-imaglist" >&5
+          no_cache=0
+          # Check whether --enable-imaglist or --disable-imaglist was given.
+if test "${enable_imaglist+set}" = set; then
+  enableval="$enable_imaglist"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_imaglist='wxUSE_IMAGLIST=yes'
+                          else
+                            ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
+                        
+fi
+
+
+          eval "$ac_cv_use_imaglist"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_IMAGLIST" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
+echo "configure:5634: checking for --enable-listbox" >&5
+          no_cache=0
+          # Check whether --enable-listbox or --disable-listbox was given.
+if test "${enable_listbox+set}" = set; then
+  enableval="$enable_listbox"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_listbox='wxUSE_LISTBOX=yes'
+                          else
+                            ac_cv_use_listbox='wxUSE_LISTBOX=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX
+                        
+fi
+
+
+          eval "$ac_cv_use_listbox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_BMPBUTTON" = yes; then
+          if test "$wxUSE_LISTBOX" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6
-echo "configure:4375: checking "for --enable-checkbox"" >&5
+          echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
+echo "configure:5673: checking for --enable-listctrl" >&5
           no_cache=0
-          # Check whether --enable-checkbox or --disable-checkbox was given.
-if test "${enable_checkbox+set}" = set; then
-  enableval="$enable_checkbox"
+          # Check whether --enable-listctrl or --disable-listctrl was given.
+if test "${enable_listctrl+set}" = set; then
+  enableval="$enable_listctrl"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_checkbox='wxUSE_CHECKBOX=yes'
+                            ac_cv_use_listctrl='wxUSE_LISTCTRL=yes'
                           else
-                            ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
+                            ac_cv_use_listctrl='wxUSE_LISTCTRL=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX
+                          ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL
                         
 fi
 
 
-          eval "$ac_cv_use_checkbox"
+          eval "$ac_cv_use_listctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CHECKBOX" = yes; then
+          if test "$wxUSE_LISTCTRL" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6
-echo "configure:4414: checking "for --enable-checklst"" >&5
+          echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
+echo "configure:5712: checking for --enable-notebook" >&5
           no_cache=0
-          # Check whether --enable-checklst or --disable-checklst was given.
-if test "${enable_checklst+set}" = set; then
-  enableval="$enable_checklst"
+          # Check whether --enable-notebook or --disable-notebook was given.
+if test "${enable_notebook+set}" = set; then
+  enableval="$enable_notebook"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_checklst='wxUSE_CHECKLST=yes'
+                            ac_cv_use_notebook='wxUSE_NOTEBOOK=yes'
                           else
-                            ac_cv_use_checklst='wxUSE_CHECKLST=no'
+                            ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST
+                          ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
                         
 fi
 
 
-          eval "$ac_cv_use_checklst"
+          eval "$ac_cv_use_notebook"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CHECKLST" = yes; then
+          if test "$wxUSE_NOTEBOOK" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6
-echo "configure:4453: checking "for --enable-choice"" >&5
+          echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
+echo "configure:5751: checking for --enable-radiobox" >&5
           no_cache=0
-          # Check whether --enable-choice or --disable-choice was given.
-if test "${enable_choice+set}" = set; then
-  enableval="$enable_choice"
+          # Check whether --enable-radiobox or --disable-radiobox was given.
+if test "${enable_radiobox+set}" = set; then
+  enableval="$enable_radiobox"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_choice='wxUSE_CHOICE=yes'
+                            ac_cv_use_radiobox='wxUSE_RADIOBOX=yes'
                           else
-                            ac_cv_use_choice='wxUSE_CHOICE=no'
+                            ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE
+                          ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX
                         
 fi
 
 
-          eval "$ac_cv_use_choice"
+          eval "$ac_cv_use_radiobox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_CHOICE" = yes; then
+          if test "$wxUSE_RADIOBOX" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6
-echo "configure:4492: checking "for --enable-combobox"" >&5
+          echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
+echo "configure:5790: checking for --enable-radiobtn" >&5
           no_cache=0
-          # Check whether --enable-combobox or --disable-combobox was given.
-if test "${enable_combobox+set}" = set; then
-  enableval="$enable_combobox"
+          # Check whether --enable-radiobtn or --disable-radiobtn was given.
+if test "${enable_radiobtn+set}" = set; then
+  enableval="$enable_radiobtn"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_combobox='wxUSE_COMBOBOX=yes'
+                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
                           else
-                            ac_cv_use_combobox='wxUSE_COMBOBOX=no'
+                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX
+                          ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN
                         
 fi
 
 
-          eval "$ac_cv_use_combobox"
+          eval "$ac_cv_use_radiobtn"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_COMBOBOX" = yes; then
+          if test "$wxUSE_RADIOBTN" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6
-echo "configure:4531: checking "for --enable-gauge"" >&5
+          echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
+echo "configure:5829: checking for --enable-sash" >&5
           no_cache=0
-          # Check whether --enable-gauge or --disable-gauge was given.
-if test "${enable_gauge+set}" = set; then
-  enableval="$enable_gauge"
+          # Check whether --enable-sash or --disable-sash was given.
+if test "${enable_sash+set}" = set; then
+  enableval="$enable_sash"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_gauge='wxUSE_GAUGE=yes'
+                            ac_cv_use_sash='wxUSE_SASH=yes'
                           else
-                            ac_cv_use_gauge='wxUSE_GAUGE=no'
+                            ac_cv_use_sash='wxUSE_SASH=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
+                          ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH
                         
 fi
 
 
-          eval "$ac_cv_use_gauge"
+          eval "$ac_cv_use_sash"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_GAUGE" = yes; then
+          if test "$wxUSE_SASH" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6
-echo "configure:4570: checking "for --enable-grid"" >&5
+          echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
+echo "configure:5868: checking for --enable-scrollbar" >&5
           no_cache=0
-          # Check whether --enable-grid or --disable-grid was given.
-if test "${enable_grid+set}" = set; then
-  enableval="$enable_grid"
+          # Check whether --enable-scrollbar or --disable-scrollbar was given.
+if test "${enable_scrollbar+set}" = set; then
+  enableval="$enable_scrollbar"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_grid='wxUSE_GRID=yes'
+                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
                           else
-                            ac_cv_use_grid='wxUSE_GRID=no'
+                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
+                          ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR
                         
 fi
 
 
-          eval "$ac_cv_use_grid"
+          eval "$ac_cv_use_scrollbar"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_GRID" = yes; then
+          if test "$wxUSE_SCROLLBAR" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6
-echo "configure:4609: checking "for --enable-newgrid"" >&5
+          echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
+echo "configure:5907: checking for --enable-slider" >&5
           no_cache=0
-          # Check whether --enable-newgrid or --disable-newgrid was given.
-if test "${enable_newgrid+set}" = set; then
-  enableval="$enable_newgrid"
+          # Check whether --enable-slider or --disable-slider was given.
+if test "${enable_slider+set}" = set; then
+  enableval="$enable_slider"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_newgrid='wxUSE_NEW_GRID=yes'
+                            ac_cv_use_slider='wxUSE_SLIDER=yes'
                           else
-                            ac_cv_use_newgrid='wxUSE_NEW_GRID=no'
+                            ac_cv_use_slider='wxUSE_SLIDER=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID
+                          ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER
                         
 fi
 
 
-          eval "$ac_cv_use_newgrid"
+          eval "$ac_cv_use_slider"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_NEW_GRID" = yes; then
+          if test "$wxUSE_SLIDER" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6
-echo "configure:4648: checking "for --enable-imaglist"" >&5
+          echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
+echo "configure:5946: checking for --enable-spinbtn" >&5
           no_cache=0
-          # Check whether --enable-imaglist or --disable-imaglist was given.
-if test "${enable_imaglist+set}" = set; then
-  enableval="$enable_imaglist"
+          # Check whether --enable-spinbtn or --disable-spinbtn was given.
+if test "${enable_spinbtn+set}" = set; then
+  enableval="$enable_spinbtn"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_imaglist='wxUSE_IMAGLIST=yes'
+                            ac_cv_use_spinbtn='wxUSE_SPINBTN=yes'
                           else
-                            ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
+                            ac_cv_use_spinbtn='wxUSE_SPINBTN=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
+                          ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN
                         
 fi
 
 
-          eval "$ac_cv_use_imaglist"
+          eval "$ac_cv_use_spinbtn"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_IMAGLIST" = yes; then
+          if test "$wxUSE_SPINBTN" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6
-echo "configure:4687: checking "for --enable-listbox"" >&5
+          echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
+echo "configure:5985: checking for --enable-spinctrl" >&5
           no_cache=0
-          # Check whether --enable-listbox or --disable-listbox was given.
-if test "${enable_listbox+set}" = set; then
-  enableval="$enable_listbox"
+          # Check whether --enable-spinctrl or --disable-spinctrl was given.
+if test "${enable_spinctrl+set}" = set; then
+  enableval="$enable_spinctrl"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_listbox='wxUSE_LISTBOX=yes'
+                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
                           else
-                            ac_cv_use_listbox='wxUSE_LISTBOX=no'
+                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX
+                          ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL
                         
 fi
 
 
-          eval "$ac_cv_use_listbox"
+          eval "$ac_cv_use_spinctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_LISTBOX" = yes; then
+          if test "$wxUSE_SPINCTRL" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6
-echo "configure:4726: checking "for --enable-listctrl"" >&5
+          echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
+echo "configure:6024: checking for --enable-splitter" >&5
           no_cache=0
-          # Check whether --enable-listctrl or --disable-listctrl was given.
-if test "${enable_listctrl+set}" = set; then
-  enableval="$enable_listctrl"
+          # Check whether --enable-splitter or --disable-splitter was given.
+if test "${enable_splitter+set}" = set; then
+  enableval="$enable_splitter"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_listctrl='wxUSE_LISTCTRL=yes'
+                            ac_cv_use_splitter='wxUSE_SPLITTER=yes'
                           else
-                            ac_cv_use_listctrl='wxUSE_LISTCTRL=no'
+                            ac_cv_use_splitter='wxUSE_SPLITTER=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL
+                          ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER
                         
 fi
 
 
-          eval "$ac_cv_use_listctrl"
+          eval "$ac_cv_use_splitter"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_LISTCTRL" = yes; then
+          if test "$wxUSE_SPLITTER" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6
-echo "configure:4765: checking "for --enable-notebook"" >&5
+          echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
+echo "configure:6063: checking for --enable-statbmp" >&5
           no_cache=0
-          # Check whether --enable-notebook or --disable-notebook was given.
-if test "${enable_notebook+set}" = set; then
-  enableval="$enable_notebook"
+          # Check whether --enable-statbmp or --disable-statbmp was given.
+if test "${enable_statbmp+set}" = set; then
+  enableval="$enable_statbmp"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_notebook='wxUSE_NOTEBOOK=yes'
+                            ac_cv_use_statbmp='wxUSE_STATBMP=yes'
                           else
-                            ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
+                            ac_cv_use_statbmp='wxUSE_STATBMP=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
+                          ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
                         
 fi
 
 
-          eval "$ac_cv_use_notebook"
+          eval "$ac_cv_use_statbmp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_NOTEBOOK" = yes; then
+          if test "$wxUSE_STATBMP" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6
-echo "configure:4804: checking "for --enable-radiobox"" >&5
+          echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
+echo "configure:6102: checking for --enable-statbox" >&5
           no_cache=0
-          # Check whether --enable-radiobox or --disable-radiobox was given.
-if test "${enable_radiobox+set}" = set; then
-  enableval="$enable_radiobox"
+          # Check whether --enable-statbox or --disable-statbox was given.
+if test "${enable_statbox+set}" = set; then
+  enableval="$enable_statbox"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_radiobox='wxUSE_RADIOBOX=yes'
+                            ac_cv_use_statbox='wxUSE_STATBOX=yes'
                           else
-                            ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
+                            ac_cv_use_statbox='wxUSE_STATBOX=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_RADIOBOX" ${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_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX
+                          ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
                         
 fi
 
 
-          eval "$ac_cv_use_radiobox"
+          eval "$ac_cv_use_statbox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_RADIOBOX" = yes; then
+          if test "$wxUSE_STATBOX" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6
-echo "configure:4843: checking "for --enable-radiobtn"" >&5
+          echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
+echo "configure:6141: checking for --enable-statline" >&5
           no_cache=0
-          # Check whether --enable-radiobtn or --disable-radiobtn was given.
-if test "${enable_radiobtn+set}" = set; then
-  enableval="$enable_radiobtn"
+          # Check whether --enable-statline or --disable-statline was given.
+if test "${enable_statline+set}" = set; then
+  enableval="$enable_statline"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
+                            ac_cv_use_statline='wxUSE_STATLINE=yes'
                           else
-                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
+                            ac_cv_use_statline='wxUSE_STATLINE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN
+                          ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
                         
 fi
 
 
-          eval "$ac_cv_use_radiobtn"
+          eval "$ac_cv_use_statline"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_RADIOBTN" = yes; then
+          if test "$wxUSE_STATLINE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6
-echo "configure:4882: checking "for --enable-sash"" >&5
+          echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
+echo "configure:6180: checking for --enable-stattext" >&5
           no_cache=0
-          # Check whether --enable-sash or --disable-sash was given.
-if test "${enable_sash+set}" = set; then
-  enableval="$enable_sash"
+          # 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_sash='wxUSE_SASH=yes'
+                            ac_cv_use_stattext='wxUSE_STATTEXT=yes'
                           else
-                            ac_cv_use_sash='wxUSE_SASH=no'
+                            ac_cv_use_stattext='wxUSE_STATTEXT=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH
+                          ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT
                         
 fi
 
 
-          eval "$ac_cv_use_sash"
+          eval "$ac_cv_use_stattext"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SASH" = yes; then
+          if test "$wxUSE_STATTEXT" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6
-echo "configure:4921: checking "for --enable-scrollbar"" >&5
+          echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6
+echo "configure:6219: checking for --enable-statusbar" >&5
           no_cache=0
-          # Check whether --enable-scrollbar or --disable-scrollbar was given.
-if test "${enable_scrollbar+set}" = set; then
-  enableval="$enable_scrollbar"
+          # Check whether --enable-statusbar or --disable-statusbar was given.
+if test "${enable_statusbar+set}" = set; then
+  enableval="$enable_statusbar"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
+                            ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
                           else
-                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
+                            ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}`
+                          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_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR
+                          ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
                         
 fi
 
 
-          eval "$ac_cv_use_scrollbar"
+          eval "$ac_cv_use_statusbar"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SCROLLBAR" = yes; then
+          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-slider"""... $ac_c" 1>&6
-echo "configure:4960: checking "for --enable-slider"" >&5
+          echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
+echo "configure:6258: checking for --enable-tabdialog" >&5
           no_cache=0
-          # Check whether --enable-slider or --disable-slider was given.
-if test "${enable_slider+set}" = set; then
-  enableval="$enable_slider"
+          # Check whether --enable-tabdialog or --disable-tabdialog was given.
+if test "${enable_tabdialog+set}" = set; then
+  enableval="$enable_tabdialog"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_slider='wxUSE_SLIDER=yes'
+                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes'
                           else
-                            ac_cv_use_slider='wxUSE_SLIDER=no'
+                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}`
+                          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_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER
+                          ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
                         
 fi
 
 
-          eval "$ac_cv_use_slider"
+          eval "$ac_cv_use_tabdialog"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SLIDER" = yes; then
+          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-spinbtn"""... $ac_c" 1>&6
-echo "configure:4999: checking "for --enable-spinbtn"" >&5
+          echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
+echo "configure:6297: checking for --enable-textctrl" >&5
           no_cache=0
-          # Check whether --enable-spinbtn or --disable-spinbtn was given.
-if test "${enable_spinbtn+set}" = set; then
-  enableval="$enable_spinbtn"
+          # Check whether --enable-textctrl or --disable-textctrl was given.
+if test "${enable_textctrl+set}" = set; then
+  enableval="$enable_textctrl"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_spinbtn='wxUSE_SPINBTN=yes'
+                            ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
                           else
-                            ac_cv_use_spinbtn='wxUSE_SPINBTN=no'
+                            ac_cv_use_textctrl='wxUSE_TEXTCTRL=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}`
+                          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_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN
+                          ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL
                         
 fi
 
 
-          eval "$ac_cv_use_spinbtn"
+          eval "$ac_cv_use_textctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SPINBTN" = yes; then
+          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-spinctrl"""... $ac_c" 1>&6
-echo "configure:5038: checking "for --enable-spinctrl"" >&5
+          echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
+echo "configure:6336: checking for --enable-togglebtn" >&5
           no_cache=0
-          # Check whether --enable-spinctrl or --disable-spinctrl was given.
-if test "${enable_spinctrl+set}" = set; then
-  enableval="$enable_spinctrl"
+          # Check whether --enable-togglebtn or --disable-togglebtn was given.
+if test "${enable_togglebtn+set}" = set; then
+  enableval="$enable_togglebtn"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
+                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
                           else
-                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
+                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}`
+                          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_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL
+                          ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN
                         
 fi
 
 
-          eval "$ac_cv_use_spinctrl"
+          eval "$ac_cv_use_togglebtn"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SPINCTRL" = yes; then
+          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-splitter"""... $ac_c" 1>&6
-echo "configure:5077: checking "for --enable-splitter"" >&5
+          echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6
+echo "configure:6375: checking for --enable-toolbar" >&5
           no_cache=0
-          # Check whether --enable-splitter or --disable-splitter was given.
-if test "${enable_splitter+set}" = set; then
-  enableval="$enable_splitter"
+          # Check whether --enable-toolbar or --disable-toolbar was given.
+if test "${enable_toolbar+set}" = set; then
+  enableval="$enable_toolbar"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_splitter='wxUSE_SPLITTER=yes'
+                            ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
                           else
-                            ac_cv_use_splitter='wxUSE_SPLITTER=no'
+                            ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}`
+                          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_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER
+                          ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
                         
 fi
 
 
-          eval "$ac_cv_use_splitter"
+          eval "$ac_cv_use_toolbar"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_SPLITTER" = yes; then
+          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-statbmp"""... $ac_c" 1>&6
-echo "configure:5116: checking "for --enable-statbmp"" >&5
+          echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
+echo "configure:6414: checking for --enable-tbarnative" >&5
           no_cache=0
-          # Check whether --enable-statbmp or --disable-statbmp was given.
-if test "${enable_statbmp+set}" = set; then
-  enableval="$enable_statbmp"
+          # Check whether --enable-tbarnative or --disable-tbarnative was given.
+if test "${enable_tbarnative+set}" = set; then
+  enableval="$enable_tbarnative"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_statbmp='wxUSE_STATBMP=yes'
+                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
                           else
-                            ac_cv_use_statbmp='wxUSE_STATBMP=no'
+                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
+                          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_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
+                          ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
                         
 fi
 
 
-          eval "$ac_cv_use_statbmp"
+          eval "$ac_cv_use_tbarnative"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STATBMP" = yes; then
+          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-statbox"""... $ac_c" 1>&6
-echo "configure:5155: checking "for --enable-statbox"" >&5
+          echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
+echo "configure:6453: checking for --enable-tbarsmpl" >&5
           no_cache=0
-          # Check whether --enable-statbox or --disable-statbox was given.
-if test "${enable_statbox+set}" = set; then
-  enableval="$enable_statbox"
+          # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
+if test "${enable_tbarsmpl+set}" = set; then
+  enableval="$enable_tbarsmpl"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_statbox='wxUSE_STATBOX=yes'
+                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
                           else
-                            ac_cv_use_statbox='wxUSE_STATBOX=no'
+                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}`
+                          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_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
+                          ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
                         
 fi
 
 
-          eval "$ac_cv_use_statbox"
+          eval "$ac_cv_use_tbarsmpl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STATBOX" = yes; then
+          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-statline"""... $ac_c" 1>&6
-echo "configure:5194: checking "for --enable-statline"" >&5
+          echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
+echo "configure:6492: checking for --enable-treectrl" >&5
           no_cache=0
-          # Check whether --enable-statline or --disable-statline was given.
-if test "${enable_statline+set}" = set; then
-  enableval="$enable_statline"
+          # Check whether --enable-treectrl or --disable-treectrl was given.
+if test "${enable_treectrl+set}" = set; then
+  enableval="$enable_treectrl"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_statline='wxUSE_STATLINE=yes'
+                            ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
                           else
-                            ac_cv_use_statline='wxUSE_STATLINE=no'
+                            ac_cv_use_treectrl='wxUSE_TREECTRL=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
+                          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_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
+                          ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
                         
 fi
 
 
-          eval "$ac_cv_use_statline"
+          eval "$ac_cv_use_treectrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STATLINE" = yes; then
+          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-statusbar"""... $ac_c" 1>&6
-echo "configure:5233: checking "for --enable-statusbar"" >&5
+          echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6
+echo "configure:6531: checking for --enable-popupwin" >&5
           no_cache=0
-          # Check whether --enable-statusbar or --disable-statusbar was given.
-if test "${enable_statusbar+set}" = set; then
-  enableval="$enable_statusbar"
+          # Check whether --enable-popupwin or --disable-popupwin was given.
+if test "${enable_popupwin+set}" = set; then
+  enableval="$enable_popupwin"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
+                            ac_cv_use_popupwin='wxUSE_POPUPWIN=yes'
                           else
-                            ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
+                            ac_cv_use_popupwin='wxUSE_POPUPWIN=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
+                          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_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
+                          ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN
                         
 fi
 
 
-          eval "$ac_cv_use_statusbar"
+          eval "$ac_cv_use_popupwin"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_STATUSBAR" = yes; then
+          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-tabdialog"""... $ac_c" 1>&6
-echo "configure:5272: checking "for --enable-tabdialog"" >&5
+
+
+          echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6
+echo "configure:6572: checking for --enable-commondlg" >&5
           no_cache=0
-          # Check whether --enable-tabdialog or --disable-tabdialog was given.
-if test "${enable_tabdialog+set}" = set; then
-  enableval="$enable_tabdialog"
+          # Check whether --enable-commondlg or --disable-commondlg was given.
+if test "${enable_commondlg+set}" = set; then
+  enableval="$enable_commondlg"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes'
+                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
                           else
-                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
+                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}`
+                          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_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
+                          ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
                         
 fi
 
 
-          eval "$ac_cv_use_tabdialog"
+          eval "$ac_cv_use_commondlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TABDIALOG" = yes; then
+          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-togglebtn"""... $ac_c" 1>&6
-echo "configure:5311: checking "for --enable-togglebtn"" >&5
+          echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6
+echo "configure:6611: checking for --enable-choicedlg" >&5
           no_cache=0
-          # Check whether --enable-togglebtn or --disable-togglebtn was given.
-if test "${enable_togglebtn+set}" = set; then
-  enableval="$enable_togglebtn"
+          # 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_togglebtn='wxUSE_TOGGLEBTN=yes'
+                            ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
                           else
-                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
+                            ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}`
+                          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_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN
+                          ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG
                         
 fi
 
 
-          eval "$ac_cv_use_togglebtn"
+          eval "$ac_cv_use_choicedlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TOGGLEBTN" = yes; then
+          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-toolbar"""... $ac_c" 1>&6
-echo "configure:5350: checking "for --enable-toolbar"" >&5
+          echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6
+echo "configure:6650: checking for --enable-coldlg" >&5
           no_cache=0
-          # Check whether --enable-toolbar or --disable-toolbar was given.
-if test "${enable_toolbar+set}" = set; then
-  enableval="$enable_toolbar"
+          # Check whether --enable-coldlg or --disable-coldlg was given.
+if test "${enable_coldlg+set}" = set; then
+  enableval="$enable_coldlg"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+                            ac_cv_use_coldlg='wxUSE_COLOURDLG=yes'
                           else
-                            ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
+                            ac_cv_use_coldlg='wxUSE_COLOURDLG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
+                          ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG
                         
 fi
 
 
-          eval "$ac_cv_use_toolbar"
+          eval "$ac_cv_use_coldlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TOOLBAR" = yes; then
+          if test "$wxUSE_COLOURDLG" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6
-echo "configure:5389: checking "for --enable-tbarnative"" >&5
+          echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
+echo "configure:6689: checking for --enable-filedlg" >&5
           no_cache=0
-          # Check whether --enable-tbarnative or --disable-tbarnative was given.
-if test "${enable_tbarnative+set}" = set; then
-  enableval="$enable_tbarnative"
+          # Check whether --enable-filedlg or --disable-filedlg was given.
+if test "${enable_filedlg+set}" = set; then
+  enableval="$enable_filedlg"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+                            ac_cv_use_filedlg='wxUSE_FILEDLG=yes'
                           else
-                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+                            ac_cv_use_filedlg='wxUSE_FILEDLG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${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
 
-                          ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
+                          ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG
                         
 fi
 
 
-          eval "$ac_cv_use_tbarnative"
+          eval "$ac_cv_use_filedlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
+          if test "$wxUSE_FILEDLG" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6
-echo "configure:5428: checking "for --enable-tbarsmpl"" >&5
+          echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
+echo "configure:6728: checking for --enable-fontdlg" >&5
           no_cache=0
-          # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
-if test "${enable_tbarsmpl+set}" = set; then
-  enableval="$enable_tbarsmpl"
+          # Check whether --enable-fontdlg or --disable-fontdlg was given.
+if test "${enable_fontdlg+set}" = set; then
+  enableval="$enable_fontdlg"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
+                            ac_cv_use_fontdlg='wxUSE_FONTDLG=yes'
                           else
-                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
+                            ac_cv_use_fontdlg='wxUSE_FONTDLG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${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
 
-                          ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
+                          ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG
                         
 fi
 
 
-          eval "$ac_cv_use_tbarsmpl"
+          eval "$ac_cv_use_fontdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
+          if test "$wxUSE_FONTDLG" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6
-echo "configure:5467: checking "for --enable-treectrl"" >&5
+          echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
+echo "configure:6767: checking for --enable-dirdlg" >&5
           no_cache=0
-          # Check whether --enable-treectrl or --disable-treectrl was given.
-if test "${enable_treectrl+set}" = set; then
-  enableval="$enable_treectrl"
+          # Check whether --enable-dirdlg or --disable-dirdlg was given.
+if test "${enable_dirdlg+set}" = set; then
+  enableval="$enable_dirdlg"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
+                            ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
                           else
-                            ac_cv_use_treectrl='wxUSE_TREECTRL=no'
+                            ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_TREECTRL" ${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
 
-                          ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
+                          ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
                         
 fi
 
 
-          eval "$ac_cv_use_treectrl"
+          eval "$ac_cv_use_dirdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_TREECTRL" = yes; then
+          if test "$wxUSE_DIRDLG" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-
-
-          echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6
-echo "configure:5508: checking "for --enable-commondlg"" >&5
+          echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
+echo "configure:6806: checking for --enable-msgdlg" >&5
           no_cache=0
-          # Check whether --enable-commondlg or --disable-commondlg was given.
-if test "${enable_commondlg+set}" = set; then
-  enableval="$enable_commondlg"
+          # Check whether --enable-msgdlg or --disable-msgdlg was given.
+if test "${enable_msgdlg+set}" = set; then
+  enableval="$enable_msgdlg"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
+                            ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'
                           else
-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
+                            ac_cv_use_msgdlg='wxUSE_MSGDLG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_COMMONDLGS" ${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
 
-                          ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
+                          ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG
                         
 fi
 
 
-          eval "$ac_cv_use_commondlg"
+          eval "$ac_cv_use_msgdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_COMMONDLGS" = yes; then
+          if test "$wxUSE_MSGDLG" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6
-echo "configure:5547: checking "for --enable-dirdlg"" >&5
+          echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
+echo "configure:6845: checking for --enable-numberdlg" >&5
           no_cache=0
-          # Check whether --enable-dirdlg or --disable-dirdlg was given.
-if test "${enable_dirdlg+set}" = set; then
-  enableval="$enable_dirdlg"
+          # Check whether --enable-numberdlg or --disable-numberdlg was given.
+if test "${enable_numberdlg+set}" = set; then
+  enableval="$enable_numberdlg"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
+                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
                           else
-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
+                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_DIRDLG" ${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
 
-                          ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
+                          ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG
                         
 fi
 
 
-          eval "$ac_cv_use_dirdlg"
+          eval "$ac_cv_use_numberdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_DIRDLG" = yes; then
+          if test "$wxUSE_NUMBERDLG" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6
-echo "configure:5586: checking "for --enable-textdlg"" >&5
+          echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
+echo "configure:6884: checking for --enable-textdlg" >&5
           no_cache=0
           # Check whether --enable-textdlg or --disable-textdlg was given.
 if test "${enable_textdlg+set}" = set; then
@@ -5620,8 +6918,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6
-echo "configure:5625: checking "for --enable-tipdlg"" >&5
+          echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
+echo "configure:6923: checking for --enable-tipdlg" >&5
           no_cache=0
           # Check whether --enable-tipdlg or --disable-tipdlg was given.
 if test "${enable_tipdlg+set}" = set; then
@@ -5659,8 +6957,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6
-echo "configure:5664: checking "for --enable-progressdlg"" >&5
+          echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
+echo "configure:6962: checking for --enable-progressdlg" >&5
           no_cache=0
           # Check whether --enable-progressdlg or --disable-progressdlg was given.
 if test "${enable_progressdlg+set}" = set; then
@@ -5698,86 +6996,127 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6
-echo "configure:5703: checking "for --enable-miniframe"" >&5
+          echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
+echo "configure:7001: checking for --enable-wizarddlg" >&5
           no_cache=0
-          # Check whether --enable-miniframe or --disable-miniframe was given.
-if test "${enable_miniframe+set}" = set; then
-  enableval="$enable_miniframe"
+          # Check whether --enable-wizarddlg or --disable-wizarddlg was given.
+if test "${enable_wizarddlg+set}" = set; then
+  enableval="$enable_wizarddlg"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
+                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
                           else
-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
+                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_MINIFRAME" ${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
 
-                          ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
+                          ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG
                         
 fi
 
 
-          eval "$ac_cv_use_miniframe"
+          eval "$ac_cv_use_wizarddlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_MINIFRAME" = yes; then
+          if test "$wxUSE_WIZARDDLG" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6
-echo "configure:5742: checking "for --enable-html"" >&5
+
+
+          echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
+echo "configure:7042: checking for --enable-menus" >&5
           no_cache=0
-          # Check whether --enable-html or --disable-html was given.
-if test "${enable_html+set}" = set; then
-  enableval="$enable_html"
+          # Check whether --enable-menus or --disable-menus was given.
+if test "${enable_menus+set}" = set; then
+  enableval="$enable_menus"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_html='wxUSE_HTML=yes'
+                            ac_cv_use_menus='wxUSE_MENUS=yes'
                           else
-                            ac_cv_use_html='wxUSE_HTML=no'
+                            ac_cv_use_menus='wxUSE_MENUS=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_HTML" ${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
 
-                          ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
+                          ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS
                         
 fi
 
 
-          eval "$ac_cv_use_html"
+          eval "$ac_cv_use_menus"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_HTML" = yes; then
+          if test "$wxUSE_MENUS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
+echo "configure:7081: checking for --enable-miniframe" >&5
+          no_cache=0
+          # Check whether --enable-miniframe or --disable-miniframe was given.
+if test "${enable_miniframe+set}" = set; then
+  enableval="$enable_miniframe"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
+                          else
+                            ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
+                        
+fi
+
+
+          eval "$ac_cv_use_miniframe"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MINIFRAME" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6
-echo "configure:5781: checking "for --enable-tooltips"" >&5
+          echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
+echo "configure:7120: checking for --enable-tooltips" >&5
           no_cache=0
           # Check whether --enable-tooltips or --disable-tooltips was given.
 if test "${enable_tooltips+set}" = set; then
@@ -5815,8 +7154,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6
-echo "configure:5820: checking "for --enable-splines"" >&5
+          echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
+echo "configure:7159: checking for --enable-splines" >&5
           no_cache=0
           # Check whether --enable-splines or --disable-splines was given.
 if test "${enable_splines+set}" = set; then
@@ -5854,8 +7193,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6
-echo "configure:5859: checking "for --enable-validators"" >&5
+          echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
+echo "configure:7198: checking for --enable-validators" >&5
           no_cache=0
           # Check whether --enable-validators or --disable-validators was given.
 if test "${enable_validators+set}" = set; then
@@ -5893,8 +7232,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6
-echo "configure:5898: checking "for --enable-busyinfo"" >&5
+          echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
+echo "configure:7237: checking for --enable-busyinfo" >&5
           no_cache=0
           # Check whether --enable-busyinfo or --disable-busyinfo was given.
 if test "${enable_busyinfo+set}" = set; then
@@ -5932,8 +7271,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6
-echo "configure:5937: checking "for --enable-joystick"" >&5
+          echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
+echo "configure:7276: checking for --enable-joystick" >&5
           no_cache=0
           # Check whether --enable-joystick or --disable-joystick was given.
 if test "${enable_joystick+set}" = set; then
@@ -5971,10 +7310,127 @@ fi
           fi
         
 
+          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:7315: checking for --enable-metafile" >&5
+          no_cache=0
+          # Check whether --enable-metafile or --disable-metafile was given.
+if test "${enable_metafile+set}" = set; then
+  enableval="$enable_metafile"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_metafile='wxUSE_METAFILE=yes'
+                          else
+                            ac_cv_use_metafile='wxUSE_METAFILE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
+                        
+fi
+
+
+          eval "$ac_cv_use_metafile"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_METAFILE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6
+echo "configure:7354: checking for --enable-dragimage" >&5
+          no_cache=0
+          # Check whether --enable-dragimage or --disable-dragimage was given.
+if test "${enable_dragimage+set}" = set; then
+  enableval="$enable_dragimage"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
+                          else
+                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE
+                        
+fi
+
+
+          eval "$ac_cv_use_dragimage"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DRAGIMAGE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+          echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
+echo "configure:7395: checking for --enable-image" >&5
+          no_cache=0
+          # Check whether --enable-image or --disable-image was given.
+if test "${enable_image+set}" = set; then
+  enableval="$enable_image"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_image='wxUSE_IMAGE=yes'
+                          else
+                            ac_cv_use_image='wxUSE_IMAGE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE
+                        
+fi
+
+
+          eval "$ac_cv_use_image"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp
+          fi
 
+          if test "$wxUSE_IMAGE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-          echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6
-echo "configure:5978: checking "for --enable-gif"" >&5
+          echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
+echo "configure:7434: checking for --enable-gif" >&5
           no_cache=0
           # Check whether --enable-gif or --disable-gif was given.
 if test "${enable_gif+set}" = set; then
@@ -6012,8 +7468,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6
-echo "configure:6017: checking "for --enable-pcx"" >&5
+          echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
+echo "configure:7473: checking for --enable-pcx" >&5
           no_cache=0
           # Check whether --enable-pcx or --disable-pcx was given.
 if test "${enable_pcx+set}" = set; then
@@ -6051,8 +7507,8 @@ fi
           fi
         
 
-          echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6
-echo "configure:6056: checking "for --enable-pnm"" >&5
+          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7512: checking for --enable-pnm" >&5
           no_cache=0
           # Check whether --enable-pnm or --disable-pnm was given.
 if test "${enable_pnm+set}" = set; then
@@ -6090,6 +7546,45 @@ fi
           fi
         
 
+          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7551: 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
 
 
@@ -6099,7 +7594,7 @@ fi
 
 
 echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:6103: checking for toolkit" >&5
+echo "configure:7598: checking for toolkit" >&5
 
 if test "$wxUSE_GUI" = "yes"; then
 
@@ -6124,7 +7619,7 @@ else
   done
 fi
 
-NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-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 )
@@ -6158,7 +7653,8 @@ for toolkit in `echo $ALL_TOOLKITS`; do
       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
@@ -6232,7 +7728,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
-echo "configure:6236: checking for $ac_word" >&5
+echo "configure:7732: 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
@@ -6262,7 +7758,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
-echo "configure:6266: checking for $ac_word" >&5
+echo "configure:7762: 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
@@ -6313,7 +7809,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
-echo "configure:6317: checking for $ac_word" >&5
+echo "configure:7813: 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
@@ -6345,7 +7841,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:6349: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:7845: 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.
@@ -6356,12 +7852,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 6360 "configure"
+#line 7856 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:6365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7861: \"$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
@@ -6387,12 +7883,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:6391: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:7887: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:6396: checking whether we are using GNU C" >&5
+echo "configure:7892: 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
@@ -6401,7 +7897,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:6405: \"$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:7901: \"$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
@@ -6420,7 +7916,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:6424: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:7920: 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
@@ -6455,7 +7951,7 @@ fi
 CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:6459: checking how to run the C preprocessor" >&5
+echo "configure:7955: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -6470,13 +7966,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 6474 "configure"
+#line 7970 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7976: \"$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
   :
@@ -6487,13 +7983,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 6491 "configure"
+#line 7987 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7993: \"$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
   :
@@ -6504,13 +8000,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 6508 "configure"
+#line 8004 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8010: \"$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
   :
@@ -6537,13 +8033,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
-echo "configure:6541: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:8037: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 6547 "configure"
+#line 8043 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -6561,7 +8057,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 6565 "configure"
+#line 8061 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -6597,7 +8093,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
-echo "configure:6601: checking for $ac_word" >&5
+echo "configure:8097: 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
@@ -6629,7 +8125,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:6633: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:8129: 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.
@@ -6640,12 +8136,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 6644 "configure"
+#line 8140 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:6649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8145: \"$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
@@ -6671,12 +8167,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:6675: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8171: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:6680: checking whether we are using GNU C++" >&5
+echo "configure:8176: 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
@@ -6685,7 +8181,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6689: \"$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:8185: \"$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
@@ -6704,7 +8200,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:6708: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:8204: 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
@@ -6737,7 +8233,7 @@ fi
 
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:6741: checking how to run the C++ preprocessor" >&5
+echo "configure:8237: 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
@@ -6750,12 +8246,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
-#line 6754 "configure"
+#line 8250 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8255: \"$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
   :
@@ -6793,7 +8289,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
-echo "configure:6797: checking for $ac_word" >&5
+echo "configure:8293: 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
@@ -6824,7 +8320,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
-echo "configure:6828: checking for $ac_word" >&5
+echo "configure:8324: 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
@@ -6864,7 +8360,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
-echo "configure:6868: checking for a BSD compatible install" >&5
+echo "configure:8364: 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
@@ -6920,7 +8416,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
-echo "configure:6924: checking for $ac_word" >&5
+echo "configure:8420: 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
@@ -6948,8 +8444,8 @@ else
 fi
 
 
-echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:6953: checking "make for VPATH support"" >&5
+echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
+echo "configure:8449: checking make for VPATH support" >&5
 cat - << EOF > confMake
 check : file
 	cp \$? \$@
@@ -6968,9 +8464,17 @@ if test "$RESULT" = 0; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
-  { echo "configure: error: You need a make-utility that is able to use the variable
+  { echo "configure: error: 
+You need a make-utility that is able to use the variable
 VPATH correctly.
-If your version of make does not support VPATH correctly" 1>&2; exit 1; }
+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
@@ -6978,7 +8482,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
-echo "configure:6982: checking for $ac_word" >&5
+echo "configure:8486: 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
@@ -7012,7 +8516,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
-echo "configure:7016: checking for $ac_word" >&5
+echo "configure:8520: 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
@@ -7046,7 +8550,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:7050: checking for yywrap in -l$ac_lib" >&5
+echo "configure:8554: 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
@@ -7054,7 +8558,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7058 "configure"
+#line 8562 "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
@@ -7065,7 +8569,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8573: \"$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
@@ -7089,7 +8593,7 @@ fi
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:7093: checking whether ln -s works" >&5
+echo "configure:8597: 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
@@ -7233,83 +8737,97 @@ rm -f confcache
 AFMINSTALL=
 
 if test "$wxUSE_GUI" = "yes"; then
+    USE_GUI=1
 
-USE_GUI=1
+    TOOLKIT=
+    TOOLKIT_INCLUDE=
 
-TOOLKIT=
-TOOLKIT_INCLUDE=
+    GUI_TK_LIBRARY=
+    GUI_TK_LINK=
 
-GUIOBJS=
-COMMONOBJS=
-GENERICOBJS=
+    WXGTK12=
+    WXGTK127=
+    WXGTK20=
 
-GUI_TK_LIBRARY=
-GUI_TK_LINK=
+    WXWINE=
 
-WXGTK12=
-WXGTK127=
-WXGTK20=
+    if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
+        ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for windows.h""... $ac_c" 1>&6
+echo "configure:8758: checking for windows.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 8763 "configure"
+#include "confdefs.h"
+#include <windows.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
 
-WXWINE=
+                { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+            
+fi
 
-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:7261: checking for Windows headers" >&5
         
-ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE;
-  do
-    if test -f "$ac_dir/windows.h"; then
-      ac_find_includes=$ac_dir
-      break
-    fi
-  done
-
-        if test "$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
+        INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+                        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
 
-        if test "$wxUSE_MINGW" = 1; then
-        LDFLAGS="$LDFLAGS -mwindows"
-    fi
+                if test "$wxUSE_ODBC" = "yes" ; then
+            LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
+        fi
 
-    TOOLKIT=MSW
+                if test "$wxUSE_MINGW" = 1; then
+            LDFLAGS="$LDFLAGS -mwindows"
+        fi
 
-    GUIOBJS="\$(MSW_GUIOBJS)"
-    GUIHEADERS="\$(MSW_HEADERS)"
-    COMMONOBJS="\$(MSW_COMMONOBJS)"
-    GENERICOBJS="\$(MSW_GENERICOBJS)"
-    UNIXOBJS=
-    GUIDIST=MSW_DIST
+        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__"
+                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)"
+                RESPROGRAM="\$(RES_PROGRAM)"
+    fi
 
-fi
+    if test "$wxUSE_GTK" = 1; then
+        echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
+echo "configure:8819: checking for GTK+ version" >&5
 
-if test "$wxUSE_GTK" = 1; then
-            # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+        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"
@@ -7334,10 +8852,10 @@ else
 fi
 
 
-  for module in . gthread
+  for module in . 
   do
       case "$module" in
-         gthread) 
+         gthread)
              gtk_config_args="$gtk_config_args gthread"
          ;;
       esac
@@ -7359,7 +8877,7 @@ 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:7363: checking for $ac_word" >&5
+echo "configure:8881: 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
@@ -7394,7 +8912,7 @@ fi
 
   min_gtk_version=1.3.1
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:7398: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:8916: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG_2_0" = "no" ; then
     no_gtk=yes
@@ -7417,14 +8935,14 @@ echo "configure:7398: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 7421 "configure"
+#line 8939 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-int 
+int
 main ()
 {
   int major, minor, micro;
@@ -7443,7 +8961,7 @@ main ()
       (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", 
+      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");
@@ -7454,16 +8972,16 @@ main ()
       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_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);
+             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);
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
     }
 #endif /* defined (GTK_MAJOR_VERSION) ... */
   else
@@ -7479,7 +8997,7 @@ main ()
         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);
+               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");
@@ -7495,7 +9013,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:7499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -7513,7 +9031,7 @@ 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
-     WXGTK20=1     
+     wx_cv_lib_gtk=2.0
   else
      echo "$ac_t""no" 1>&6
      if test "$GTK_CONFIG_2_0" = "no" ; then
@@ -7529,7 +9047,7 @@ fi
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 7533 "configure"
+#line 9051 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -7539,7 +9057,7 @@ int main() {
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:7543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9061: \"$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"
@@ -7547,7 +9065,7 @@ if { (eval echo configure:7543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && t
           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 "***"
           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 "***"
@@ -7571,8 +9089,16 @@ rm -f conftest*
      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
@@ -7589,7 +9115,7 @@ rm -f conftest*
   # 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:7593: checking for $ac_word" >&5
+echo "configure:9119: 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
@@ -7624,7 +9150,7 @@ fi
 
   min_gtk_version=1.2.7
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:7628: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9154: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
@@ -7637,7 +9163,7 @@ echo "configure:7628: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 7641 "configure"
+#line 9167 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -7670,7 +9196,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:7674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -7689,7 +9215,7 @@ fi
   fi
   if test "x$no_gtk" = x ; then
      echo "$ac_t""yes" 1>&6
-     WXGTK127=1
+     wx_cv_lib_gtk=1.2.7
   else
      echo "$ac_t""no" 1>&6
      GTK_CFLAGS=""
@@ -7699,7 +9225,10 @@ 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
@@ -7716,7 +9245,7 @@ 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:7720: checking for $ac_word" >&5
+echo "configure:9249: 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
@@ -7751,7 +9280,7 @@ fi
 
   min_gtk_version=1.2.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:7755: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9284: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
@@ -7764,7 +9293,7 @@ echo "configure:7755: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 7768 "configure"
+#line 9297 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -7797,7 +9326,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:7801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -7816,7 +9345,7 @@ fi
   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=""
@@ -7826,44 +9355,49 @@ fi
   
   
 
-    
-  fi
-  
-  
-  rm -f conf.gtktest
-
-
-    if test "$WXGTK12" != 1 -a "$WXGTK20" != 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
+                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:7867: checking for gdk_im_open in -lgdk" >&5
+                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+echo "configure:9401: 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
@@ -7871,7 +9405,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgdk  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7875 "configure"
+#line 9409 "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
@@ -7882,7 +9416,7 @@ int main() {
 gdk_im_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9420: \"$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
@@ -7905,12 +9439,47 @@ else
   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:7913: 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:9448: 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:9482: checking for WINE includes" >&5
+        
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do
@@ -7920,22 +9489,22 @@ for ac_dir in $SEARCH_INCLUDE;
     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:7934: checking for Xpm library" >&5
-    
+        XPM_LINK=""
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:9503: checking for Xpm library" >&5
+        
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
@@ -7943,27 +9512,27 @@ for ac_dir in $SEARCH_LIB;
     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
 
-        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:7962: checking for Mesa library" >&5
-    
+        MESA_LINK=""
+        echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
+echo "configure:9531: checking for Mesa library" >&5
+        
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
@@ -7971,38 +9540,28 @@ for ac_dir in $SEARCH_LIB;
     done
   done
 
-    if test "$ac_find_libraries" != "" ; then
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
-        MESA_LINK="-lMesaGL"
-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        { echo "configure: error: no" 1>&2; exit 1; }
-    fi
-
-    GUI_TK_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
-
-    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 "$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
 
-# 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
-echo "configure:8006: checking for X" >&5
+echo "configure:9565: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -8064,12 +9623,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 8068 "configure"
+#line 9627 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9632: \"$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*
@@ -8138,14 +9697,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8142 "configure"
+#line 9701 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:8149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9708: \"$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.
@@ -8251,17 +9810,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
-echo "configure:8255: checking whether -R must be followed by a space" >&5
+echo "configure:9814: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 8258 "configure"
+#line 9817 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:8265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -8277,14 +9836,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 8281 "configure"
+#line 9840 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:8288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -8316,7 +9875,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
-echo "configure:8320: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:9879: 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
@@ -8324,7 +9883,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8328 "configure"
+#line 9887 "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
@@ -8335,7 +9894,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:8339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9898: \"$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
@@ -8357,7 +9916,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
-echo "configure:8361: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:9920: 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
@@ -8365,7 +9924,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8369 "configure"
+#line 9928 "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
@@ -8376,7 +9935,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:8380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9939: \"$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
@@ -8405,12 +9964,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
-echo "configure:8409: checking for gethostbyname" >&5
+echo "configure:9968: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8414 "configure"
+#line 9973 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -8433,7 +9992,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9996: \"$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
@@ -8454,7 +10013,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:8458: checking for gethostbyname in -lnsl" >&5
+echo "configure:10017: 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
@@ -8462,7 +10021,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8466 "configure"
+#line 10025 "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
@@ -8473,7 +10032,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:8477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10036: \"$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
@@ -8503,12 +10062,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
-echo "configure:8507: checking for connect" >&5
+echo "configure:10066: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8512 "configure"
+#line 10071 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -8531,7 +10090,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10094: \"$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
@@ -8552,7 +10111,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:8556: checking for connect in -lsocket" >&5
+echo "configure:10115: 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
@@ -8560,7 +10119,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8564 "configure"
+#line 10123 "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
@@ -8571,7 +10130,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:8575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10134: \"$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
@@ -8595,12 +10154,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:8599: checking for remove" >&5
+echo "configure:10158: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8604 "configure"
+#line 10163 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -8623,7 +10182,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10186: \"$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
@@ -8644,7 +10203,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:8648: checking for remove in -lposix" >&5
+echo "configure:10207: 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
@@ -8652,7 +10211,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8656 "configure"
+#line 10215 "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
@@ -8663,7 +10222,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:8667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10226: \"$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
@@ -8687,12 +10246,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:8691: checking for shmat" >&5
+echo "configure:10250: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8696 "configure"
+#line 10255 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -8715,7 +10274,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10278: \"$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
@@ -8736,7 +10295,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:8740: checking for shmat in -lipc" >&5
+echo "configure:10299: 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
@@ -8744,7 +10303,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8748 "configure"
+#line 10307 "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
@@ -8755,7 +10314,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:8759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10318: \"$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
@@ -8788,7 +10347,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
-echo "configure:8792: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:10351: 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
@@ -8796,7 +10355,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8800 "configure"
+#line 10359 "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
@@ -8807,7 +10366,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:8811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10370: \"$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
@@ -8831,25 +10390,25 @@ fi
 
 fi
 
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS"
+    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+    LDFLAGS="$LDFLAGS $X_LIBS"
 
-if test "$wxUSE_MOTIF" = 1; then
-    if test "$no_x" = "yes"; then
-      { echo "configure: error: X11 not found" 1>&2; exit 1; }
-    fi
+    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:8852: checking for Motif/Lesstif headers" >&5
-    
+        echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
+echo "configure:10411: checking for Motif/Lesstif headers" >&5
+        
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do
@@ -8859,50 +10418,50 @@ for ac_dir in $SEARCH_INCLUDE;
     fi
   done
 
-    if test "$ac_find_includes" != "" ; then
-        echo "$ac_t""found $ac_find_includes" 1>&6
-    else
-        cat > conftest.$ac_ext <<EOF
-#line 8867 "configure"
+        if test "$ac_find_includes" != "" ; then
+            echo "$ac_t""found $ac_find_includes" 1>&6
+        else
+            cat > conftest.$ac_ext <<EOF
+#line 10426 "configure"
 #include "confdefs.h"
 
-                #include <Xm/Xm.h>
-            
+                    #include <Xm/Xm.h>
+                
 int main() {
 
-                int version;
+                    int version;
 
-                version = xmUseVersion;
-            
+                    version = xmUseVersion;
+                
 ; return 0; }
 EOF
-if { (eval echo configure:8880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-                echo "$ac_t""found in default search path" 1>&6
-                COMPILED_X_PROGRAM=1
-            
+                    echo "$ac_t""found in default search path" 1>&6
+                    COMPILED_X_PROGRAM=1
+                
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   
-                echo "$ac_t""no" 1>&6
-                { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; }
+                    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
+        fi
 
-    if test "$COMPILED_X_PROGRAM" = 0; then
-        echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:8901: 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:10460: checking for Motif/Lesstif library" >&5
+            
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXm.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
@@ -8910,8 +10469,8 @@ for ac_dir in $SEARCH_LIB;
     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=$?
@@ -8921,7 +10480,7 @@ for ac_dir in $SEARCH_LIB;
     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
@@ -8931,53 +10490,53 @@ for ac_dir in $SEARCH_LIB;
   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 8940 "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 10499 "configure"
 #include "confdefs.h"
 
-                    #include <Xm/Xm.h>
-                
+                        #include <Xm/Xm.h>
+                    
 int main() {
 
-                    int version;
+                        int version;
 
-                    version = xmUseVersion;
-                
+                        version = xmUseVersion;
+                    
 ; return 0; }
 EOF
-if { (eval echo configure:8953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-                    echo "$ac_t""found in default search path" 1>&6
-                    COMPILED_X_PROGRAM=1
-                
+                        echo "$ac_t""found in default search path" 1>&6
+                        COMPILED_X_PROGRAM=1
+                    
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   
-                    echo "$ac_t""no" 1>&6
-                    { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
+                        echo "$ac_t""no" 1>&6
+                        { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
+                    
                 
-            
 fi
 rm -f conftest*
+            fi
         fi
-    fi
 
-                                                                                                                            
-    XPM_LINK=""
-    echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:8976: checking for Xpm library" >&5
-    
+                                                                                                                                                                                                                                                        
+        XPM_LINK=""
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:10535: checking for Xpm library" >&5
+        
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
@@ -8985,8 +10544,8 @@ for ac_dir in $SEARCH_LIB;
     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
@@ -8995,107 +10554,117 @@ for ac_dir in $SEARCH_LIB;
     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
 
-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        cat > conftest.$ac_ext <<EOF
-#line 9008 "configure"
+            echo "$ac_t""found at $ac_find_libraries" 1>&6
+        else
+            cat > conftest.$ac_ext <<EOF
+#line 10567 "configure"
 #include "confdefs.h"
 
-                #include <X11/xpm.h>
-            
+                    #include <X11/xpm.h>
+                
 int main() {
 
-                int version;
+                    int version;
 
-                version = XpmLibraryVersion();
-            
+                    version = XpmLibraryVersion();
+                
 ; return 0; }
 EOF
-if { (eval echo configure:9021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-            XPM_LINK="-lXpm "
-            cat >> confdefs.h <<\EOF
+                XPM_LINK="-lXpm "
+                cat >> confdefs.h <<\EOF
 #define wxHAVE_LIB_XPM 1
 EOF
 
-                echo "$ac_t""found in default search path" 1>&6
-                COMPILED_X_PROGRAM=0
-            
+                    echo "$ac_t""found in default search path" 1>&6
+                    COMPILED_X_PROGRAM=0
+                
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   
-                echo "$ac_t""no" 1>&6
-                echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+                    echo "$ac_t""no" 1>&6
+                    echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+                
             
-        
 fi
 rm -f conftest*
+        fi
+
+        GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
+        TOOLKIT=MOTIF
+        GUIDIST=MOTIF_DIST
     fi
 
-    GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
-    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_MAC" = 1; then
-    TOOLKIT=MAC
-    UNIXOBJS="\$(UNIX_OBJS)"
-    UNIXDEPS="\$(UNIX_DEPS)"
-        GUIDIST=MACX_DIST
-fi
+        if test "$TOOLKIT" != "PM" ; then
+        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
+    else
+        TOOLKIT_DIR="os2"
+    fi
 
-if test "$wxUSE_PM" = 1; then
-    TOOLKIT=PM
+        TOOLKIT_NAME="${TOOLKIT_DIR}"
 
-    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_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
 
-if test "$TOOLKIT" != "PM" ; then
-    TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
-else
-    TOOLKIT_DIR="os2"
-fi
+        if test "$TOOLKIT_NAME" = "motif"; then
+        TOOLKIT_VPATH="${TOOLKIT_VPATH}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+    fi
 
-        if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-        TOOLKIT_NAME="${TOOLKIT_DIR}d"
+        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
-        TOOLKIT_NAME="${TOOLKIT_DIR}"
+        SETUPH_DIR="${TOOLKIT_DIR}"
+    fi
+
+        if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+        TOOLKIT_NAME="${TOOLKIT_NAME}d"
     fi
 
         TOOLKIT_DEF="-D__WX${TOOLKIT}__"
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__"
+    fi
 
         WX_LIBRARY="wx_${TOOLKIT_NAME}"
 
-        ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)"
+        if test "$wxUSE_UNIVERSAL" = "yes"; then
+        ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+    else
+        ALL_OBJECTS="\$(GUIOBJS)"
+    fi
+
+    ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
+
+    if test "$TOOLKIT" != "MSW"; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
+    fi
+
+    if test "$wxUSE_HTML" = "yes"; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)"
+    fi
 
         if test "$TOOLKIT" != "MSW"; then
         if test "$wxUSE_ODBC" = "yes" ; then
@@ -9103,6 +10672,10 @@ fi
         fi
     fi
 
+            if test "x$REGEX_INCLUDE" != "x" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+    fi
+
     if test "$wxUSE_LIBJPEG" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
     fi
@@ -9118,9 +10691,27 @@ fi
     if test "$wxUSE_FREETYPE" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
     fi
-    ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)"
 
-    PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
+        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
+
+    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"
 
@@ -9131,6 +10722,8 @@ else
 
         TOOLKIT_DIR="base"
 
+        TOOLKIT_VPATH="."
+
         if test "$wxUSE_DEBUG_FLAG" = "yes"; then
         TOOLKIT_NAME="${TOOLKIT_DIR}d"
     else
@@ -9142,23 +10735,22 @@ else
         ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)"
     ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)"
 
+            if test "x$REGEX_INCLUDE" != "x" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+    fi
+
     if test "$wxUSE_ZLIB" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
     fi
 
         WX_LIBRARY="wx_${TOOLKIT_NAME}"
 
-    PORT_FILES="src/files.lst"
+    PORT_FILES="\${top_srcdir}/src/files.lst"
     RPM_FILES="src/rpmfiles.lst"
     RPM_SPEC="wxBase.spec"
 
         GUIDIST="BASE_DIST"
     DISTDIR="wxBase"
-
-        if test "$USE_UNIX" = 1 ; then
-	ALL_OBJECTS="${ALL_OBJECTS} dl_macosx.o"
-	ALL_DEPFILES="${ALL_DEPFILES} dl_macosx.d"
-    fi
 fi
 
 WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
@@ -9262,7 +10854,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
         WX_ALL="CREATE_LINKS"
       ;;
-      *-*-freebsd* | *-*-netbsd* )
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* )
         SHARED_LD="${CC} -shared -o"
         PIC_FLAG="-fPIC"
         if test "$wxUSE_OPENGL" = "yes"; then
@@ -9274,8 +10866,11 @@ if test "$wxUSE_SHARED" = "yes"; then
         fi
       ;;
       *-*-darwin* )
-        SHARED_LD="libtool -dynamic -o"
-        PIC_FLAG="-fPIC"
+	TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__DARWIN__ -D__POWERPC__"
+	CFLAGS="${CFLAGS} -fno-common"
+	CPPFLAGS="${CPPFLAGS} -fno-common"
+        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"
@@ -9283,6 +10878,17 @@ if test "$wxUSE_SHARED" = "yes"; then
             WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
             WX_ALL="CREATE_LINKS"
         fi
+        	if test "$wxUSE_MAC" = 1 ; then
+	        WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
+	fi
+                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"
@@ -9306,7 +10912,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         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}"
         if test "$wxUSE_OPENGL" = "yes"; then
@@ -9363,22 +10969,62 @@ else
     WX_TARGET_LIBRARY_TYPE="a"
 fi
 
-
-for ac_hdr in strings.h
+
+for ac_hdr in strings.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10978: 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 10983 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10988: \"$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:9372: checking for $ac_hdr" >&5
+echo "configure:11018: 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 9377 "configure"
+#line 11023 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11028: \"$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*
@@ -9408,17 +11054,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
-echo "configure:9412: checking for $ac_hdr" >&5
+echo "configure:11058: 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 9417 "configure"
+#line 11063 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11068: \"$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*
@@ -9444,21 +11090,21 @@ else
 fi
 done
 
-for ac_hdr in fcntl.h
+for ac_hdr in wchar.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9452: checking for $ac_hdr" >&5
+echo "configure:11098: 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 9457 "configure"
+#line 11103 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11108: \"$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*
@@ -9484,21 +11130,21 @@ else
 fi
 done
 
-for ac_hdr in wchar.h
+for ac_hdr in wcstr.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9492: checking for $ac_hdr" >&5
+echo "configure:11138: 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 9497 "configure"
+#line 11143 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11148: \"$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*
@@ -9524,21 +11170,21 @@ else
 fi
 done
 
-for ac_hdr in wcstr.h
+for ac_hdr in fnmatch.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9532: checking for $ac_hdr" >&5
+echo "configure:11178: 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 9537 "configure"
+#line 11183 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11188: \"$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*
@@ -9564,21 +11210,21 @@ else
 fi
 done
 
-for ac_hdr in fnmatch.h
+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:9572: checking for $ac_hdr" >&5
+echo "configure:11218: 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 9577 "configure"
+#line 11223 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11228: \"$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*
@@ -9604,21 +11250,21 @@ else
 fi
 done
 
-for ac_hdr in iconv.h
+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:9612: checking for $ac_hdr" >&5
+echo "configure:11258: 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 9617 "configure"
+#line 11263 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11268: \"$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*
@@ -9644,21 +11290,24 @@ else
 fi
 done
 
-for ac_hdr in langinfo.h
+
+if test "$wxUSE_GUI" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes"; then
+                for ac_hdr in X11/XKBlib.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9652: checking for $ac_hdr" >&5
+echo "configure:11301: 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 9657 "configure"
+#line 11306 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11311: \"$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*
@@ -9684,24 +11333,25 @@ else
 fi
 done
 
+    fi
+fi
 
-if test "$wxUSE_GUI" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes"; then
-                for ac_hdr in X11/XKBlib.h
+if test "$USE_WIN32" = 1; then
+    for ac_hdr in w32api.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9695: checking for $ac_hdr" >&5
+echo "configure:11345: 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 9700 "configure"
+#line 11350 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11355: \"$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*
@@ -9727,17 +11377,16 @@ else
 fi
 done
 
-    fi
 fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:9736: checking for ANSI C header files" >&5
+echo "configure:11385: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9741 "configure"
+#line 11390 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -9745,7 +11394,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11398: \"$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*
@@ -9762,7 +11411,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
-#line 9766 "configure"
+#line 11415 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -9780,7 +11429,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
-#line 9784 "configure"
+#line 11433 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -9801,7 +11450,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 9805 "configure"
+#line 11454 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -9812,7 +11461,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:9816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -9836,12 +11485,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:9840: checking for mode_t" >&5
+echo "configure:11489: 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
-#line 9845 "configure"
+#line 11494 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9869,12 +11518,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:9873: checking for off_t" >&5
+echo "configure:11522: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9878 "configure"
+#line 11527 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9902,12 +11551,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:9906: checking for pid_t" >&5
+echo "configure:11555: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9911 "configure"
+#line 11560 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9935,12 +11584,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:9939: checking for size_t" >&5
+echo "configure:11588: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9944 "configure"
+#line 11593 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9968,12 +11617,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:9972: checking for uid_t in sys/types.h" >&5
+echo "configure:11621: 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 9977 "configure"
+#line 11626 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -10002,15 +11651,177 @@ EOF
 fi
 
 
+echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
+echo "configure:11656: 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 11662 "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:11673: \"$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 11681 "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:11692: \"$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:11726: 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 11731 "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:11744: \"$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:11767: checking if size_t is unsigned long" >&5
+if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11772 "configure"
+#include "confdefs.h"
+#include <stddef.h>
+int main() {
+
+                return 0; }
+
+                struct Foo { void foo(size_t); void foo(unsigned long); };
+
+                int bar() {
+            
+; return 0; }
+EOF
+if { (eval echo configure:11785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_size_t_is_ulong=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_size_t_is_ulong=yes
+        
+fi
+rm -f conftest*
+    
+fi
+
+echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&6
+
+    if test "$wx_cv_size_t_is_ulong" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxSIZE_T_IS_ULONG 1
+EOF
+
+    fi
+fi
+
+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 "configure:10008: checking for pw_gecos in struct passwd" >&5
+echo "configure:11819: checking for pw_gecos in struct passwd" >&5
 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 10014 "configure"
+#line 11825 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 int main() {
@@ -10021,7 +11832,7 @@ int main() {
              
 ; return 0; }
 EOF
-if { (eval echo configure:10025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                 wx_cv_struct_pw_gecos=yes
@@ -10051,12 +11862,12 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:10055: checking for working const" >&5
+echo "configure:11866: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10060 "configure"
+#line 11871 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -10105,7 +11916,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:10109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -10126,21 +11937,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:10130: checking for inline" >&5
+echo "configure:11941: 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
-#line 10137 "configure"
+#line 11948 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:10144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -10167,7 +11978,7 @@ esac
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:10171: checking size of char" >&5
+echo "configure:11982: 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
@@ -10175,7 +11986,7 @@ else
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 10179 "configure"
+#line 11990 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10186,7 +11997,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12001: \"$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
@@ -10205,47 +12016,8 @@ cat >> confdefs.h <<EOF
 EOF
 
 
-echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:10210: checking size of wchar_t" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_wchar_t=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 10218 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(wchar_t));
-  exit(0);
-}
-EOF
-if { (eval echo configure:10229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_wchar_t=`cat conftestval`
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_wchar_t=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_wchar_t" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
-EOF
-
-
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:10249: checking size of short" >&5
+echo "configure:12021: 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
@@ -10253,7 +12025,7 @@ else
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 10257 "configure"
+#line 12029 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10264,7 +12036,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12040: \"$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
@@ -10284,7 +12056,7 @@ EOF
 
 
 echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:10288: checking size of int *" >&5
+echo "configure:12060: 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
@@ -10292,7 +12064,7 @@ else
   ac_cv_sizeof_int_p=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 10296 "configure"
+#line 12068 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10303,7 +12075,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12079: \"$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
@@ -10323,7 +12095,7 @@ EOF
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:10327: checking size of int" >&5
+echo "configure:12099: 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
@@ -10331,7 +12103,7 @@ else
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 10335 "configure"
+#line 12107 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10342,7 +12114,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12118: \"$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
@@ -10362,7 +12134,7 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:10366: checking size of long" >&5
+echo "configure:12138: 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
@@ -10370,7 +12142,7 @@ else
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 10374 "configure"
+#line 12146 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10381,7 +12153,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12157: \"$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
@@ -10401,7 +12173,7 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10405: checking size of long long" >&5
+echo "configure:12177: 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
@@ -10409,7 +12181,7 @@ else
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 10413 "configure"
+#line 12185 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10420,7 +12192,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12196: \"$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
@@ -10440,15 +12212,67 @@ EOF
 
 
 
+echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
+echo "configure:12217: 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 12227 "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:12246: \"$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 "configure:10445: checking whether byte ordering is bigendian" >&5
+echo "configure:12269: 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
-#line 10452 "configure"
+#line 12276 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -10459,11 +12283,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 10467 "configure"
+#line 12291 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -10474,7 +12298,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -10494,7 +12318,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 10498 "configure"
+#line 12322 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -10507,7 +12331,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:10511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12335: \"$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
@@ -10554,17 +12378,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
-echo "configure:10558: checking for $ac_hdr" >&5
+echo "configure:12382: 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 10563 "configure"
+#line 12387 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12392: \"$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*
@@ -10591,13 +12415,13 @@ fi
 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
 
-    else
-      :
     fi
 
     ac_ext=c
@@ -10612,7 +12436,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 
   echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:10616: checking if C++ compiler supports bool" >&5
+echo "configure:12440: 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
@@ -10627,7 +12451,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
     cat > conftest.$ac_ext <<EOF
-#line 10631 "configure"
+#line 12455 "configure"
 #include "confdefs.h"
 
       
@@ -10639,13 +12463,9 @@ int main() {
       
 ; return 0; }
 EOF
-if { (eval echo configure:10643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-        cat >> confdefs.h <<\EOF
-#define HAVE_BOOL 1
-EOF
-
         wx_cv_cpp_bool=yes
       
 else
@@ -10680,52 +12500,8 @@ EOF
 
 
 
-echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6
-echo "configure:10685: 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 10691 "configure"
-#include "confdefs.h"
-#include <features.h>
-int main() {
-
-
-#ifndef __GNU_LIBRARY__
- Compile error wanted
-#endif
-
-
-; return 0; }
-EOF
-if { (eval echo configure:10704: \"$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 "configure:10729: checking for wcslen in -lc" >&5
+echo "configure:12505: 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
@@ -10733,7 +12509,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10737 "configure"
+#line 12513 "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
@@ -10744,7 +12520,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12524: \"$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
@@ -10770,7 +12546,7 @@ else
   echo "$ac_t""no" 1>&6
 
             echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:10774: checking for wcslen in -lw" >&5
+echo "configure:12550: 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
@@ -10778,7 +12554,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10782 "configure"
+#line 12558 "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
@@ -10789,7 +12565,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:10793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12569: \"$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
@@ -10820,12 +12596,12 @@ fi
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:10824: checking for vprintf" >&5
+echo "configure:12600: 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
-#line 10829 "configure"
+#line 12605 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -10848,7 +12624,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12628: \"$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
@@ -10872,12 +12648,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:10876: checking for _doprnt" >&5
+echo "configure:12652: 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 10881 "configure"
+#line 12657 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -10900,7 +12676,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12680: \"$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
@@ -10926,25 +12702,18 @@ 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 for vsnprintf""... $ac_c" 1>&6
-echo "configure:10942: checking for vsnprintf" >&5
+echo "configure:12711: 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 10948 "configure"
+#line 12717 "configure"
 #include "confdefs.h"
 
                     #include <stdio.h>
@@ -10969,13 +12738,9 @@ int main() {
                  
 ; return 0; }
 EOF
-if { (eval echo configure:10973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-                    cat >> confdefs.h <<\EOF
-#define HAVE_VSNPRINTF 1
-EOF
-
                     wx_cv_func_vsnprintf=yes
                  
 else
@@ -10984,7 +12749,7 @@ else
   rm -rf conftest*
   
                     cat > conftest.$ac_ext <<EOF
-#line 10988 "configure"
+#line 12753 "configure"
 #include "confdefs.h"
 
                                       #include <stdio.h>
@@ -11009,13 +12774,9 @@ int main() {
                                    
 ; return 0; }
 EOF
-if { (eval echo configure:11013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-                                      cat >> confdefs.h <<\EOF
-#define HAVE_VSNPRINTF 1
-EOF
-
                                       wx_cv_func_vsnprintf=yes
                                    
 else
@@ -11023,7 +12784,6 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   
-                                      echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
                                       wx_cv_func_vsnprintf=no
                                    
 fi
@@ -11036,14 +12796,23 @@ 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:11041: checking for vsscanf" >&5
+echo "configure:12810: 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 11047 "configure"
+#line 12816 "configure"
 #include "confdefs.h"
 
                     #include <stdio.h>
@@ -11066,13 +12835,9 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:11070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12839: \"$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
                 
 else
@@ -11089,6 +12854,57 @@ fi
 
 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
+
+fi
+
+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:12877: checking if iconv() takes char**" >&5
+if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    cat > conftest.$ac_ext <<EOF
+#line 12883 "configure"
+#include "confdefs.h"
+#include <iconv.h>
+int main() {
+
+        char **inbuf, **outbuf;
+        iconv_t cd;
+        size_t insz, outsz;
+        iconv(cd, inbuf, &insz, outbuf, &outsz);
+    
+; return 0; }
+EOF
+if { (eval echo configure:12895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_iconv_takes_char=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_iconv_takes_char=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_iconv_takes_char" 1>&6
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
@@ -11096,19 +12912,24 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+if test "$wx_cv_iconv_takes_char" = yes ; then
+    cat >> confdefs.h <<\EOF
+#define WX_ICONV_TAKES_CHAR 1
+EOF
+
+fi
 
-if test "$TOOLKIT" != "MSW"; then
 
 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
-echo "configure:11107: checking for $ac_func" >&5
+echo "configure:12928: 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 11112 "configure"
+#line 12933 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11131,7 +12952,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12956: \"$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
@@ -11172,13 +12993,13 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
       echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6
-echo "configure:11176: checking for sa_handler type" >&5
+echo "configure:12997: checking for sa_handler type" >&5
 if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 11182 "configure"
+#line 13003 "configure"
 #include "confdefs.h"
 #include <signal.h>
 int main() {
@@ -11190,7 +13011,7 @@ int main() {
                      
 ; return 0; }
 EOF
-if { (eval echo configure:11194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                         wx_cv_type_sa_handler=int
@@ -11227,12 +13048,12 @@ fi
 for ac_func in vfork
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11231: checking for $ac_func" >&5
+echo "configure:13052: 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 11236 "configure"
+#line 13057 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11255,7 +13076,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13080: \"$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
@@ -11280,15 +13101,78 @@ fi
 done
 
 
+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:13109: 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 13114 "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:13137: \"$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
+
 for ac_func in timegm
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11287: checking for $ac_func" >&5
+echo "configure:13171: 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 11292 "configure"
+#line 13176 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11311,7 +13195,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13199: \"$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
@@ -11339,12 +13223,12 @@ done
 for ac_func in putenv setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11343: checking for $ac_func" >&5
+echo "configure:13227: 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 11348 "configure"
+#line 13232 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11367,7 +13251,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13255: \"$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
@@ -11401,7 +13285,7 @@ EOF
     HAVE_SOME_SLEEP_FUNC=1
 fi
 
-if test "$USE_MAC" = 1; then
+if test "$USE_DARWIN" = 1; then
             cat >> confdefs.h <<\EOF
 #define HAVE_USLEEP 1
 EOF
@@ -11414,12 +13298,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
     for ac_func in nanosleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11418: checking for $ac_func" >&5
+echo "configure:13302: 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 11423 "configure"
+#line 13307 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11442,7 +13326,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13330: \"$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
@@ -11467,7 +13351,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:11471: checking for nanosleep in -lposix4" >&5
+echo "configure:13355: 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
@@ -11475,7 +13359,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11479 "configure"
+#line 13363 "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
@@ -11486,7 +13370,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:11490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13374: \"$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
@@ -11514,12 +13398,12 @@ else
                     for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11518: checking for $ac_func" >&5
+echo "configure:13402: 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 11523 "configure"
+#line 13407 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11542,7 +13426,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13430: \"$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
@@ -11566,10 +13450,11 @@ EOF
 
 else
   echo "$ac_t""no" 1>&6
+echo "configure: warning: wxSleep() function will not work" 1>&2
+                    
 fi
 done
 
-                    echo "configure: warning: wxSleep() function will not work" 1>&2
                 
             
 fi
@@ -11584,12 +13469,12 @@ fi
 for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11588: checking for $ac_func" >&5
+echo "configure:13473: 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 11593 "configure"
+#line 13478 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11612,7 +13497,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13501: \"$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
@@ -11649,12 +13534,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
-echo "configure:11653: checking for $ac_func" >&5
+echo "configure:13538: 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 11658 "configure"
+#line 13543 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11680,7 +13565,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13569: \"$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
@@ -11717,12 +13602,12 @@ INET_LINK=
 for ac_func in inet_addr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11721: checking for $ac_func" >&5
+echo "configure:13606: 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 11726 "configure"
+#line 13611 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11745,7 +13630,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13634: \"$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
@@ -11770,7 +13655,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:11774: checking for inet_addr in -lnsl" >&5
+echo "configure:13659: 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
@@ -11778,7 +13663,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11782 "configure"
+#line 13667 "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
@@ -11789,7 +13674,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:11793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13678: \"$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
@@ -11808,7 +13693,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
-echo "configure:11812: checking for inet_addr in -lresolv" >&5
+echo "configure:13697: 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
@@ -11816,7 +13701,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11820 "configure"
+#line 13705 "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
@@ -11827,7 +13712,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:11831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13716: \"$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
@@ -11860,12 +13745,12 @@ done
 for ac_func in inet_aton
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11864: checking for $ac_func" >&5
+echo "configure:13749: 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 11869 "configure"
+#line 13754 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11888,7 +13773,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13777: \"$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
@@ -11913,7 +13798,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
             echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
-echo "configure:11917: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:13802: 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
@@ -11921,7 +13806,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$INET_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11925 "configure"
+#line 13810 "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
@@ -11932,7 +13817,7 @@ int main() {
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:11936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13821: \"$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
@@ -12045,7 +13930,7 @@ if test "$wxUSE_THREADS" = "yes" ; then
     fi
 
                 echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
-echo "configure:12049: checking for pthread_create in -l$THREADS_LIB" >&5
+echo "configure:13934: 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
@@ -12053,7 +13938,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12057 "configure"
+#line 13942 "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
@@ -12064,7 +13949,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:12068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13953: \"$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
@@ -12087,7 +13972,7 @@ else
   echo "$ac_t""no" 1>&6
 
                         echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:12091: checking for pthread_create in -lc_r" >&5
+echo "configure:13976: 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
@@ -12095,7 +13980,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12099 "configure"
+#line 13984 "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
@@ -12106,7 +13991,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
-if { (eval echo configure:12110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13995: \"$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
@@ -12128,61 +14013,19 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 
-                                echo $ac_n "checking for pthread_create in -lcc_dynamic""... $ac_c" 1>&6
-echo "configure:12133: checking for pthread_create in -lcc_dynamic" >&5
-ac_lib_var=`echo cc_dynamic'_'pthread_create | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcc_dynamic  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 12141 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_create();
-
-int main() {
-pthread_create()
-; return 0; }
-EOF
-if { (eval echo configure:12152: \"$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
-  
-                    THREADS_OBJ="threadpsx.lo"
-                    THREADS_LINK="cc_dynamic"
-                
-else
-  echo "$ac_t""no" 1>&6
-
-                                        ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
+                                ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
-echo "configure:12176: checking for sys/prctl.h" >&5
+echo "configure:14019: checking for sys/prctl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12181 "configure"
+#line 14024 "configure"
 #include "confdefs.h"
 #include <sys/prctl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14029: \"$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*
@@ -12199,15 +14042,12 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-                        THREADS_OBJ="threadsgi.lo"
-                    
+                    THREADS_OBJ="threadsgi.lo"
+                
 else
   echo "$ac_t""no" 1>&6
 fi
 
-                
-fi
-
             
 fi
 
@@ -12225,12 +14065,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
-echo "configure:12229: checking for $ac_func" >&5
+echo "configure:14069: 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 12234 "configure"
+#line 14074 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12253,7 +14093,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14097: \"$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
@@ -12283,17 +14123,17 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12287: checking for $ac_hdr" >&5
+echo "configure:14127: 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 12292 "configure"
+#line 14132 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14137: \"$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*
@@ -12321,7 +14161,7 @@ done
 
 
   echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12325: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:14165: 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
@@ -12329,7 +14169,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12333 "configure"
+#line 14173 "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
@@ -12340,7 +14180,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:12344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14184: \"$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
@@ -12361,16 +14201,16 @@ EOF
 
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
-echo "configure:12366: 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:14206: checking for sched_yield in -lposix4" >&5
+ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-l"posix4"  $LIBS"
+LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12374 "configure"
+#line 14214 "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
@@ -12381,7 +14221,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:12385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14225: \"$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
@@ -12412,7 +14252,7 @@ fi
 
               HAVE_PRIOR_FUNCS=0
   echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12416: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+echo "configure:14256: 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
@@ -12420,7 +14260,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12424 "configure"
+#line 14264 "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
@@ -12431,7 +14271,7 @@ int main() {
 pthread_attr_getschedpolicy()
 ; return 0; }
 EOF
-if { (eval echo configure:12435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14275: \"$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
@@ -12447,7 +14287,7 @@ 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:12451: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
+echo "configure:14291: 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
@@ -12455,7 +14295,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12459 "configure"
+#line 14299 "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
@@ -12466,7 +14306,7 @@ int main() {
 pthread_attr_setschedparam()
 ; return 0; }
 EOF
-if { (eval echo configure:12470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12482,7 +14322,7 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12486: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
+echo "configure:14326: 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
@@ -12490,7 +14330,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12494 "configure"
+#line 14334 "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
@@ -12501,7 +14341,7 @@ int main() {
 sched_get_priority_max()
 ; return 0; }
 EOF
-if { (eval echo configure:12505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14345: \"$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
@@ -12519,16 +14359,16 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   HAVE_PRIOR_FUNCS=1
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_get_priority_max in -l"posix4"""... $ac_c" 1>&6
-echo "configure:12524: checking for sched_get_priority_max in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
+echo "configure:14364: 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"
-LIBS="-l"posix4"  $LIBS"
+LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12532 "configure"
+#line 14372 "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
@@ -12539,7 +14379,7 @@ int main() {
 sched_get_priority_max()
 ; return 0; }
 EOF
-if { (eval echo configure:12543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14383: \"$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
@@ -12586,7 +14426,7 @@ EOF
   fi
 
   echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12590: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:14430: 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
@@ -12594,7 +14434,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12598 "configure"
+#line 14438 "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
@@ -12605,7 +14445,7 @@ int main() {
 pthread_cancel()
 ; return 0; }
 EOF
-if { (eval echo configure:12609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12631,13 +14471,13 @@ fi
 
 
   echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:12635: checking for pthread_cleanup_push/pop" >&5
+echo "configure:14475: checking for pthread_cleanup_push/pop" >&5
 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 12641 "configure"
+#line 14481 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -12647,14 +14487,10 @@ int main() {
                  
 ; return 0; }
 EOF
-if { (eval echo configure:12651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     wx_cv_func_pthread_cleanup_push=yes
-                    cat >> confdefs.h <<\EOF
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-EOF
-
                  
 else
   echo "configure: failed program was:" >&5
@@ -12670,6 +14506,102 @@ fi
 
 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:14519: 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 14525 "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:14535: \"$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:14562: 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 14568 "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:14577: \"$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"
 
       if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
@@ -12687,14 +14619,16 @@ if test "$wxUSE_THREADS" = "yes"; then
 EOF
 
 
+    if test "x$wxUSE_DARWIN" != "x1"; then
     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
-echo "configure:12698: checking if -D_REENTRANT is needed" >&5
+echo "configure:14632: 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"
@@ -12720,20 +14654,87 @@ EOF
 
 fi
 
-if test "$WXGTK127" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define __WXGTK127__ $WXGTK127
-EOF
-
+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 "$wxUSE_MAC" = 1 ; then
+  TOOLKIT_DEF="${TOOLKIT_DEF} -DTARGET_CARBON"
+  CFLAGS="${CFLAGS} -fpascal-strings"
+  CPPFLAGS="${CPPFLAGS} -cpp-precomp -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:14676: 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:14706: 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
-
-if test "$WXWINE" = 1 ; then
-  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
+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
 
-if test "$wxUSE_MAC" = 1 ; then
-  TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -DTARGET_CARBON"
-  TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE}"
+  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
@@ -12791,12 +14792,13 @@ fi
 
 DEP_INFO_FLAGS=
 CODE_GEN_FLAGS=
+CODE_GEN_FLAGS_CXX=
 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
-        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"
@@ -12824,6 +14826,126 @@ else
     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
+
+
+REGEX_INCLUDE=
+if test "$wxUSE_REGEX" != "no"; then
+            ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for regex.h""... $ac_c" 1>&6
+echo "configure:14851: checking for regex.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 14856 "configure"
+#include "confdefs.h"
+#include <regex.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:14861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  for ac_func in regcomp
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14880: 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 14885 "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:14908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+    if test "x$ac_cv_func_regcomp" != "xyes"; then
+                        if test "$wxUSE_REGEX" = "sys"; then
+            { echo "configure: error: system regex library not found! Use --with-regex to use the built-in regex library." 1>&2; exit 1; }
+        fi
+
+                REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
+    fi
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_REGEX 1
+EOF
+
+fi
 
 ZLIB_INCLUDE=
 if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
@@ -12837,17 +14959,17 @@ EOF
     ZLIB_LINK=
     ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:12841: checking for zlib.h" >&5
+echo "configure:14963: checking for zlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12846 "configure"
+#line 14968 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14973: \"$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*
@@ -12864,7 +14986,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
-echo "configure:12868: checking for deflate in -lz" >&5
+echo "configure:14990: 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
@@ -12872,7 +14994,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12876 "configure"
+#line 14998 "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
@@ -12883,7 +15005,7 @@ int main() {
 deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:12887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15009: \"$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
@@ -12930,17 +15052,17 @@ EOF
     PNG_LINK=
     ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:12934: checking for png.h" >&5
+echo "configure:15056: checking for png.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12939 "configure"
+#line 15061 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15066: \"$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*
@@ -12957,7 +15079,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
-echo "configure:12961: checking for png_check_sig in -lpng" >&5
+echo "configure:15083: 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
@@ -12965,7 +15087,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12969 "configure"
+#line 15091 "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
@@ -12976,7 +15098,7 @@ int main() {
 png_check_sig()
 ; return 0; }
 EOF
-if { (eval echo configure:12980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15102: \"$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
@@ -13019,36 +15141,43 @@ EOF
     JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
   else
     JPEG_LINK=
-    ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:13025: checking for jpeglib.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+                echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
+echo "configure:15146: 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 13030 "configure"
+#line 15151 "configure"
 #include "confdefs.h"
-#include <jpeglib.h>
+
+                #undef HAVE_STDLIB_H
+                #include <stdio.h>
+                #include <jpeglib.h>
+            
+int main() {
+
+            
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+if { (eval echo configure:15163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  ac_cv_header_jpeglib_h=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"
+  ac_cv_header_jpeglib_h=no
+        
 fi
 rm -f conftest*
+    
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:13052: checking for jpeg_read_header in -ljpeg" >&5
+
+    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:15181: 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
@@ -13056,7 +15185,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13060 "configure"
+#line 15189 "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
@@ -13067,7 +15196,7 @@ int main() {
 jpeg_read_header()
 ; return 0; }
 EOF
-if { (eval echo configure:13071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15200: \"$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
@@ -13087,9 +15216,7 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-else
-  echo "$ac_t""no" 1>&6
-fi
+    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; }
@@ -13103,23 +15230,23 @@ if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then
 #define wxUSE_LIBTIFF 1
 EOF
 
-  if test "$wxUSE_LIBTIFF" = "yes" ; then  
+  if test "$wxUSE_LIBTIFF" = "yes" ; then
     TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
   else
     TIFF_LINK=
     ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:13113: checking for tiffio.h" >&5
+echo "configure:15240: checking for tiffio.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13118 "configure"
+#line 15245 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15250: \"$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*
@@ -13136,7 +15263,7 @@ 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:13140: checking for TIFFError in -ltiff" >&5
+echo "configure:15267: 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
@@ -13144,7 +15271,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13148 "configure"
+#line 15275 "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
@@ -13155,7 +15282,7 @@ int main() {
 TIFFError()
 ; return 0; }
 EOF
-if { (eval echo configure:13159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15286: \"$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
@@ -13197,17 +15324,17 @@ EOF
     FREETYPE_LINK=
     ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
-echo "configure:13201: checking for freetype.h" >&5
+echo "configure:15328: checking for freetype.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13206 "configure"
+#line 15333 "configure"
 #include "confdefs.h"
 #include <freetype.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15338: \"$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*
@@ -13224,7 +15351,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6
-echo "configure:13228: checking for FT_Render_Glyph in -lfreetype" >&5
+echo "configure:15355: 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
@@ -13232,7 +15359,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lfreetype -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13236 "configure"
+#line 15363 "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
@@ -13243,7 +15370,7 @@ int main() {
 FT_Render_Glyph()
 ; return 0; }
 EOF
-if { (eval echo configure:13247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15374: \"$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
@@ -13277,17 +15404,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
-echo "configure:13281: checking for GL/gl.h" >&5
+echo "configure:15408: checking for GL/gl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13286 "configure"
+#line 15413 "configure"
 #include "confdefs.h"
 #include <GL/gl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13291: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15418: \"$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*
@@ -13313,7 +15440,7 @@ EOF
 EOF
 
     echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
-echo "configure:13317: checking for glFlush in -lGL" >&5
+echo "configure:15444: 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
@@ -13321,7 +15448,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13325 "configure"
+#line 15452 "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
@@ -13332,7 +15459,7 @@ int main() {
 glFlush()
 ; return 0; }
 EOF
-if { (eval echo configure:13336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15463: \"$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
@@ -13354,7 +15481,7 @@ else
   echo "$ac_t""no" 1>&6
 
         echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
-echo "configure:13358: checking for glFlush in -lMesaGL" >&5
+echo "configure:15485: 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
@@ -13362,7 +15489,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lMesaGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13366 "configure"
+#line 15493 "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
@@ -13373,7 +15500,7 @@ int main() {
 glFlush()
 ; return 0; }
 EOF
-if { (eval echo configure:13377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15504: \"$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
@@ -13436,6 +15563,13 @@ EOF
 
 fi
 
+if test "$wxUSE_TIMER" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_TIMER 1
+EOF
+
+fi
+
 if test "$wxUSE_WAVE" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_WAVE 1
@@ -13443,6 +15577,34 @@ EOF
 
 fi
 
+if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CMDLINE_PARSER 1
+EOF
+
+fi
+
+if test "$wxUSE_STOPWATCH" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_STOPWATCH 1
+EOF
+
+fi
+
+if test "$wxUSE_DATETIME" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_DATETIME 1
+EOF
+
+fi
+
+if test "$wxUSE_TIMEDATE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_TIMEDATE 1
+EOF
+
+fi
+
 if test "$wxUSE_FILE" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_FILE 1
@@ -13450,6 +15612,13 @@ EOF
 
 fi
 
+if test "$wxUSE_FFILE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FFILE 1
+EOF
+
+fi
+
 if test "$wxUSE_FILESYSTEM" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_FILESYSTEM 1
@@ -13485,6 +15654,13 @@ EOF
 
 fi
 
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_SNGLINST_CHECKER 1
+EOF
+
+fi
+
 if test "$wxUSE_BUSYINFO" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_BUSYINFO 1
@@ -13540,6 +15716,20 @@ if test "$wxUSE_LOG" = "yes"; then
 #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
@@ -13572,16 +15762,16 @@ EOF
 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
-echo "configure:13580: checking for $ac_func" >&5
+echo "configure:15770: 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 13585 "configure"
+#line 15775 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13604,7 +15794,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15798: \"$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
@@ -13630,13 +15820,13 @@ done
 
 
         echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
-echo "configure:13634: checking for timezone variable in <time.h>" >&5
+echo "configure:15824: checking for timezone variable in <time.h>" >&5
 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                         cat > conftest.$ac_ext <<EOF
-#line 13640 "configure"
+#line 15830 "configure"
 #include "confdefs.h"
 
                                 #include <time.h>
@@ -13644,14 +15834,14 @@ else
 int main() {
 
                                 int tz;
-                                tz = __timezone;
+                                tz = timezone;
                             
 ; return 0; }
 EOF
-if { (eval echo configure:13652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-                                wx_cv_var_timezone=__timezone
+                                wx_cv_var_timezone=timezone
                             
 else
   echo "configure: failed program was:" >&5
@@ -13659,7 +15849,7 @@ else
   rm -rf conftest*
   
                                 cat > conftest.$ac_ext <<EOF
-#line 13663 "configure"
+#line 15853 "configure"
 #include "confdefs.h"
 
                                         #include <time.h>
@@ -13671,7 +15861,7 @@ int main() {
                                     
 ; return 0; }
 EOF
-if { (eval echo configure:13675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                         wx_cv_var_timezone=_timezone
@@ -13682,7 +15872,7 @@ else
   rm -rf conftest*
   
                                         cat > conftest.$ac_ext <<EOF
-#line 13686 "configure"
+#line 15876 "configure"
 #include "confdefs.h"
 
                                                 #include <time.h>
@@ -13690,14 +15880,14 @@ else
 int main() {
 
                                                 int tz;
-                                                tz = timezone;
+                                                tz = __timezone;
                                             
 ; return 0; }
 EOF
-if { (eval echo configure:13698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-                                                wx_cv_var_timezone=timezone
+                                                wx_cv_var_timezone=__timezone
                                             
 else
   echo "configure: failed program was:" >&5
@@ -13729,12 +15919,12 @@ EOF
         for ac_func in localtime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13733: checking for $ac_func" >&5
+echo "configure:15923: 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 13738 "configure"
+#line 15928 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13757,7 +15947,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15951: \"$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
@@ -13784,13 +15974,13 @@ done
 
     if test "$ac_cv_func_localtime" = "yes"; then
         echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:13788: checking for tm_gmtoff in struct tm" >&5
+echo "configure:15978: checking for tm_gmtoff in struct tm" >&5
 if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
             cat > conftest.$ac_ext <<EOF
-#line 13794 "configure"
+#line 15984 "configure"
 #include "confdefs.h"
 
                     #include <time.h>
@@ -13802,14 +15992,10 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:13806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     wx_cv_struct_tm_has_gmtoff=yes
-                    cat >> confdefs.h <<\EOF
-#define WX_GMTOFF_IN_TM 1
-EOF
-
                 
 else
   echo "configure: failed program was:" >&5
@@ -13823,17 +16009,24 @@ rm -f conftest*
 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
-echo "configure:13832: checking for $ac_func" >&5
+echo "configure:16025: 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 13837 "configure"
+#line 16030 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13856,7 +16049,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16053: \"$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
@@ -13883,7 +16076,7 @@ done
 
     if test "$ac_cv_func_gettimeofday" = "yes"; then
         echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
-echo "configure:13887: checking whether gettimeofday takes two arguments" >&5
+echo "configure:16080: 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
@@ -13898,7 +16091,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
-#line 13902 "configure"
+#line 16095 "configure"
 #include "confdefs.h"
 
                     #include <sys/time.h>
@@ -13912,7 +16105,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:13916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=yes
 else
@@ -13920,7 +16113,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 13924 "configure"
+#line 16117 "configure"
 #include "confdefs.h"
 
                         #include <sys/time.h>
@@ -13933,7 +16126,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:13937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=no
 else
@@ -13979,12 +16172,12 @@ if test "$TOOLKIT" != "MSW"; then
 
 if test "$wxUSE_SOCKETS" = "yes"; then
         echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:13983: checking for socket" >&5
+echo "configure:16176: checking for socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13988 "configure"
+#line 16181 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -14007,7 +16200,7 @@ socket();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16204: \"$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
@@ -14025,7 +16218,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
-echo "configure:14029: checking for socket in -lsocket" >&5
+echo "configure:16222: 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
@@ -14033,7 +16226,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14037 "configure"
+#line 16230 "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
@@ -14044,7 +16237,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:14048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16241: \"$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
@@ -14077,7 +16270,7 @@ 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
-echo "configure:14081: checking what is the type of the third argument of getsockname" >&5
+echo "configure:16274: 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
@@ -14092,7 +16285,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
-#line 14096 "configure"
+#line 16289 "configure"
 #include "confdefs.h"
 
                     #include <sys/types.h>
@@ -14105,7 +16298,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:14109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=socklen_t
 else
@@ -14113,7 +16306,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 14117 "configure"
+#line 16310 "configure"
 #include "confdefs.h"
 
                         #include <sys/types.h>
@@ -14126,7 +16319,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:14130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=size_t
 else
@@ -14134,7 +16327,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 14138 "configure"
+#line 16331 "configure"
 #include "confdefs.h"
 
                             #include <sys/types.h>
@@ -14147,7 +16340,7 @@ int main() {
                         
 ; return 0; }
 EOF
-if { (eval echo configure:14151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=int
 else
@@ -14209,17 +16402,17 @@ if test "$wxUSE_JOYSTICK" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14213: checking for $ac_hdr" >&5
+echo "configure:16406: 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 14218 "configure"
+#line 16411 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16416: \"$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*
@@ -14269,18 +16462,18 @@ if test "$TOOLKIT" != "MSW"; then
 HAVE_DL_FUNCS=0
 HAVE_SHL_FUNCS=0
 if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
-    if test "$USE_MAC" = 1; then
+    if test "$USE_DARWIN" = 1; then
                 HAVE_DL_FUNCS=1
     else
                                 for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14279: checking for $ac_func" >&5
+echo "configure:16472: 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 14284 "configure"
+#line 16477 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14303,7 +16496,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16500: \"$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
@@ -14331,7 +16524,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14335: checking for dlopen in -ldl" >&5
+echo "configure:16528: 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
@@ -14339,7 +16532,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14343 "configure"
+#line 16536 "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
@@ -14350,7 +16543,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:14354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16547: \"$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
@@ -14379,12 +16572,12 @@ else
                             for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14383: checking for $ac_func" >&5
+echo "configure:16576: 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 14388 "configure"
+#line 16581 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14407,7 +16600,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16604: \"$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
@@ -14435,7 +16628,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
-echo "configure:14439: checking for dld in -lshl_load" >&5
+echo "configure:16632: 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
@@ -14443,7 +16636,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lshl_load  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14447 "configure"
+#line 16640 "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
@@ -14454,7 +16647,7 @@ int main() {
 dld()
 ; return 0; }
 EOF
-if { (eval echo configure:14458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16651: \"$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
@@ -14493,12 +16686,12 @@ done
         for ac_func in dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14497: checking for $ac_func" >&5
+echo "configure:16690: 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 14502 "configure"
+#line 16695 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14521,7 +16714,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16718: \"$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
@@ -14546,7 +16739,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
-echo "configure:14550: checking for dlerror in -ldl" >&5
+echo "configure:16743: 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
@@ -14554,7 +16747,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14558 "configure"
+#line 16751 "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
@@ -14565,7 +16758,7 @@ int main() {
 dlerror()
 ; return 0; }
 EOF
-if { (eval echo configure:14569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16762: \"$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
@@ -14619,6 +16812,13 @@ else
 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
@@ -14657,9 +16857,6 @@ EOF
 
     WXODBCFLAG="-D_IODBC_"
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-    IODBCOBJS="\$(IODBC_OBJS)"
-else
-    IODBCOBJS=
 fi
 
 
@@ -14688,32 +16885,95 @@ EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
 fi
-
-if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_MDI_ARCHITECTURE 1
+
+if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MDI_ARCHITECTURE 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+fi
+
+if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
+    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
+    fi
+fi
+
+if test "$wxUSE_HELP" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_HELP 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
+
+    if test "$USE_WIN32" = 1; then
+      if test "$wxUSE_MS_HTML_HELP" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_MS_HTML_HELP 1
+EOF
+
+        ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6
+echo "configure:16924: checking for htmlhelp.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 16929 "configure"
+#include "confdefs.h"
+#include <htmlhelp.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:16934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+                cat >> confdefs.h <<\EOF
+#define wxUSE_MS_HTML_HELP 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
-fi
+            
+else
+  echo "$ac_t""no" 1>&6
 
-if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-EOF
+                echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h so it won't be compiled without it" 1>&2
+                wxUSE_MS_HTML_HELP=no
+            
+fi
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
-    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
+      fi
     fi
-fi
 
-if test "$wxUSE_HELP" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_HELP 1
+    if test "$wxUSE_WXHTML_HELP" = "yes"; then
+      if test "$wxUSE_HTML" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_WXHTML_HELP 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
+      else
+        echo "configure: warning: Cannot use wxHTML-based help without wxHTML so it won't be compiled" 1>&2
+        wxUSE_WXHTML_HELP=no
+      fi
+    fi
 fi
 
 if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
@@ -14736,15 +16996,11 @@ EOF
 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
 
-        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
@@ -14769,6 +17025,10 @@ fi
 if test "$wxUSE_CLIPBOARD" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_CLIPBOARD 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
 EOF
 
 fi
@@ -14786,23 +17046,28 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
         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
                 
         for ac_hdr in ole2.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14796: checking for $ac_hdr" >&5
+echo "configure:17061: 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 14801 "configure"
+#line 17066 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17071: \"$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*
@@ -14829,12 +17094,16 @@ fi
 done
 
 
-	        	        if test "$ac_cv_header_ole2_h" = "yes" ; 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"
+                cat >> confdefs.h <<\EOF
+#define wxUSE_OLE 1
+EOF
+
 
                                                 if test "$wxUSE_METAFILE" = "yes"; then
                     cat >> confdefs.h <<\EOF
@@ -14871,11 +17140,42 @@ EOF
 fi
 
 
+USES_CONTROLS=0
+if test "$wxUSE_CONTROLS" = "yes"; then
+  USES_CONTROLS=1
+fi
+
 if test "$wxUSE_ACCEL" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_ACCEL 1
 EOF
 
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BUTTON 1
+EOF
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BMPBUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BMPBUTTON 1
+EOF
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_CALCTRL" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CALENDARCTRL 1
+EOF
+
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"
 fi
 
 if test "$wxUSE_CARET" = "yes"; then
@@ -14883,6 +17183,7 @@ if test "$wxUSE_CARET" = "yes"; then
 #define wxUSE_CARET 1
 EOF
 
+  USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 
@@ -14891,6 +17192,7 @@ if test "$wxUSE_COMBOBOX" = "yes"; then
 #define wxUSE_COMBOBOX 1
 EOF
 
+  USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHOICE" = "yes"; then
@@ -14898,13 +17200,7 @@ if test "$wxUSE_CHOICE" = "yes"; then
 #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
@@ -14912,6 +17208,7 @@ if test "$wxUSE_CHECKBOX" = "yes"; then
 #define wxUSE_CHECKBOX 1
 EOF
 
+  USES_CONTROLS=1
 fi
 
 if test "$wxUSE_CHECKLST" = "yes"; then
@@ -14919,6 +17216,7 @@ if test "$wxUSE_CHECKLST" = "yes"; then
 #define wxUSE_CHECKLISTBOX 1
 EOF
 
+  USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
@@ -14927,6 +17225,7 @@ if test "$wxUSE_GAUGE" = "yes"; then
 #define wxUSE_GAUGE 1
 EOF
 
+  USES_CONTROLS=1
 fi
 
 if test "$wxUSE_NEW_GRID" = "yes"; then
@@ -14935,6 +17234,7 @@ if test "$wxUSE_NEW_GRID" = "yes"; then
 #define wxUSE_NEW_GRID 1
 EOF
 
+  USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 
@@ -14943,6 +17243,7 @@ if test "$wxUSE_GRID" = "yes"; then
 #define wxUSE_GRID 1
 EOF
 
+  USES_CONTROLS=1
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
@@ -14958,6 +17259,7 @@ if test "$wxUSE_LISTBOX" = "yes"; then
 #define wxUSE_LISTBOX 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then
@@ -14966,6 +17268,7 @@ if test "$wxUSE_LISTCTRL" = "yes"; then
 #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
@@ -14977,6 +17280,7 @@ if test "$wxUSE_NOTEBOOK" = "yes"; then
 #define wxUSE_NOTEBOOK 1
 EOF
 
+    USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
@@ -14985,6 +17289,7 @@ if test "$wxUSE_RADIOBOX" = "yes"; then
 #define wxUSE_RADIOBOX 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
 if test "$wxUSE_RADIOBTN" = "yes"; then
@@ -14992,6 +17297,7 @@ if test "$wxUSE_RADIOBTN" = "yes"; then
 #define wxUSE_RADIOBTN 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SASH" = "yes"; then
@@ -15007,6 +17313,7 @@ if test "$wxUSE_SCROLLBAR" = "yes"; then
 #define wxUSE_SCROLLBAR 1
 EOF
 
+    USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi
 
@@ -15015,6 +17322,7 @@ if test "$wxUSE_SLIDER" = "yes"; then
 #define wxUSE_SLIDER 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPINBTN" = "yes"; then
@@ -15022,6 +17330,7 @@ if test "$wxUSE_SPINBTN" = "yes"; then
 #define wxUSE_SPINBTN 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPINCTRL" = "yes"; then
@@ -15029,6 +17338,7 @@ if test "$wxUSE_SPINCTRL" = "yes"; then
 #define wxUSE_SPINCTRL 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
 if test "$wxUSE_SPLITTER" = "yes"; then
@@ -15044,6 +17354,7 @@ if test "$wxUSE_STATBMP" = "yes"; then
 #define wxUSE_STATBMP 1
 EOF
 
+    USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATBOX" = "yes"; then
@@ -15051,6 +17362,15 @@ if test "$wxUSE_STATBOX" = "yes"; then
 #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
@@ -15061,6 +17381,7 @@ if test "$wxUSE_STATLINE" = "yes"; then
 #define wxUSE_STATLINE 1
 EOF
 
+        USES_CONTROLS=1
     fi
 fi
 
@@ -15069,6 +17390,7 @@ if test "$wxUSE_STATUSBAR" = "yes"; then
 #define wxUSE_STATUSBAR 1
 EOF
 
+    USES_CONTROLS=1
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
 fi
@@ -15081,11 +17403,28 @@ EOF
     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
-  cat >> confdefs.h <<\EOF
+    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
@@ -15094,6 +17433,7 @@ if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
 EOF
 
     wxUSE_TOOLBAR="yes"
+    USES_CONTROLS=1
 fi
 
 if test "$wxUSE_TOOLBAR" = "yes"; then
@@ -15101,19 +17441,21 @@ if test "$wxUSE_TOOLBAR" = "yes"; then
 #define wxUSE_TOOLBAR 1
 EOF
 
+    USES_CONTROLS=1
 
         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
 
+        USES_CONTROLS=1
+    fi
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
 fi
 
 if test "$wxUSE_TOOLTIPS" = "yes"; then
@@ -15137,56 +17479,69 @@ if test "$wxUSE_TREECTRL" = "yes"; then
 #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
 
-
-
-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
+if test "$wxUSE_POPUPWIN" = "yes"; then
+    if test "$wxUSE_MAC" = 1; then
+        echo "configure: warning: Popup window is not yet supported under Mac OS" 1>&2
     else
-        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
+        cat >> confdefs.h <<\EOF
+#define wxUSE_POPUPWIN 1
 EOF
 
-        fi
+        USES_CONTROLS=1
     fi
 fi
 
-if test "$wxUSE_TEXTDLG" = "yes"; then
+if test "$USES_CONTROLS" = 1; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_TEXTDLG 1
+#define wxUSE_CONTROLS 1
 EOF
 
 fi
 
-if test "$wxUSE_STARTUP_TIPS" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2
-    else
-        cat >> confdefs.h <<\EOF
-#define wxUSE_STARTUP_TIPS 1
+
+
+if test "$wxUSE_DRAGIMAGE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DRAGIMAGE 1
 EOF
 
-    fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
 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_MENUS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MENUS 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
+fi
+
+if test "$wxUSE_METAFILE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
+EOF
+
+fi
+
+if test "$wxUSE_MIMETYPE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MIMETYPE 1
+EOF
+
+fi
+
+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SYSTEM_OPTIONS 1
 EOF
 
-    fi
 fi
 
 if test "$wxUSE_MINIFRAME" = "yes"; then
@@ -15214,6 +17569,13 @@ EOF
     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
@@ -15235,6 +17597,108 @@ EOF
 
 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\""
@@ -15252,12 +17716,9 @@ EOF
 GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
 OPENGL_LIBS="$OPENGL_LINK"
 
-if test "$USE_MAC" = 1 ; then
-    EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -framework System"
-    CFLAGS="${CFLAGS} -fpascal-strings"
-    CPPFLAGS="${CPPFLAGS} -fpascal-strings"
-else
-    EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
+EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
+if test "$wxUSE_MAC" = 1 ; then
+    EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
 fi
 if test "$wxUSE_GUI" = "yes"; then
     EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
@@ -15265,7 +17726,9 @@ 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 $FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
+INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include \
+$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
+$FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
 
 if test "$wxUSE_GTK" = 1; then
     WXCONFIG_INCLUDE=""
@@ -15285,9 +17748,13 @@ LDFLAGS="$LDFLAGS $PROFILE"
 
 if test "$wxUSE_GUI" = "yes"; then
         
-            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag \
-                     drawing dynamic event 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
@@ -15387,11 +17854,10 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 
-
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:15395: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:17861: 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
@@ -15420,14 +17886,14 @@ fi
 
 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
-            
+
 
 
 if test "$wxUSE_GUI" = "yes"; then
@@ -15436,6 +17902,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
+            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
@@ -15609,13 +18077,15 @@ s%@LEX@%$LEX%g
 s%@LEXLIB@%$LEXLIB%g
 s%@LN_S@%$LN_S%g
 s%@GTK_CONFIG_2_0@%$GTK_CONFIG_2_0%g
-s%@GTK_CONFIG@%$GTK_CONFIG%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%@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
@@ -15644,6 +18114,7 @@ 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%@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%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g
@@ -15651,22 +18122,14 @@ 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_NAME@%$TOOLKIT_NAME%g
 s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
+s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g
 s%@WXCONFIG_INCLUDE@%$WXCONFIG_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%@ALL_OBJECTS@%$ALL_OBJECTS%g
 s%@ALL_DEPFILES@%$ALL_DEPFILES%g
 s%@GUIDIST@%$GUIDIST%g
@@ -15689,6 +18152,10 @@ s%@RCOUTPUTSWITCH@%$RCOUTPUTSWITCH%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
@@ -15911,7 +18378,7 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
-            TOOLKIT_DIR="${TOOLKIT_DIR}"
+            SETUPH_DIR="${SETUPH_DIR}"
             TOOLKIT_NAME="${TOOLKIT_NAME}"
             LN_S="${LN_S}"
           
@@ -15919,11 +18386,13 @@ cat >> $CONFIG_STATUS <<EOF
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 
-            chmod +x wx-config
-            mv wx-config wx${TOOLKIT_NAME}-config
-            ${LN_S} wx${TOOLKIT_NAME}-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
@@ -15940,7 +18409,7 @@ cat >> $CONFIG_STATUS <<\EOF
               mkdir lib/wx/include/wx/${TOOLKIT_NAME}
             fi
             if test -f setup.h; then
-                cp -f setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
+                cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
             fi
 
             
@@ -15950,13 +18419,13 @@ cat >> $CONFIG_STATUS <<\EOF
             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
-                mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+                cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h
             fi
-            
+
           
 exit 0
 EOF