]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
extact common GAddress declarations to the common header instead of duplicating them...
[wxWidgets.git] / configure
index d74a1b7d371718193f89bde72c882ead0a39a05e..cf8eddb5043d5389cd3f011c303ad3ee7538653f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
 #! /bin/sh
-# From configure.in Id: configure.in 49376 2007-10-23 22:19:34Z VZ .
+# From configure.in Id: configure.in 55576 2008-09-12 20:57:41Z VZ .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -737,9 +737,11 @@ CXXWARNINGS
 EXTRALIBS
 EXTRALIBS_XML
 EXTRALIBS_HTML
 EXTRALIBS
 EXTRALIBS_XML
 EXTRALIBS_HTML
+EXTRALIBS_MEDIA
 EXTRALIBS_GUI
 EXTRALIBS_OPENGL
 EXTRALIBS_SDL
 EXTRALIBS_GUI
 EXTRALIBS_OPENGL
 EXTRALIBS_SDL
+EXTRALIBS_STC
 WITH_PLUGIN_SDL
 EXTRALIBS_GTKPRINT
 EXTRALIBS_GNOMEPRINT
 WITH_PLUGIN_SDL
 EXTRALIBS_GTKPRINT
 EXTRALIBS_GNOMEPRINT
@@ -830,6 +832,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
+COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
 COND_MONOLITHIC_0_SHARED_0_USE_STC_1
 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
 COND_MONOLITHIC_0_SHARED_0_USE_STC_1
 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
@@ -839,6 +842,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
+COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
 COND_MONOLITHIC_0_SHARED_1_USE_STC_1
 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
 COND_MONOLITHIC_0_SHARED_1_USE_STC_1
 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
@@ -847,6 +851,7 @@ COND_MONOLITHIC_0_USE_GUI_1
 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1
 COND_MONOLITHIC_0_USE_HTML_1
 COND_MONOLITHIC_0_USE_MEDIA_1
 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1
 COND_MONOLITHIC_0_USE_HTML_1
 COND_MONOLITHIC_0_USE_MEDIA_1
+COND_MONOLITHIC_0_USE_PROPGRID_1
 COND_MONOLITHIC_0_USE_QA_1
 COND_MONOLITHIC_0_USE_RICHTEXT_1
 COND_MONOLITHIC_0_USE_STC_1
 COND_MONOLITHIC_0_USE_QA_1
 COND_MONOLITHIC_0_USE_RICHTEXT_1
 COND_MONOLITHIC_0_USE_STC_1
@@ -859,16 +864,18 @@ COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1
 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
 COND_PLATFORM_MACOSX_1
 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
 COND_PLATFORM_MACOSX_1
-COND_PLATFORM_MACOSX_1_TOOLKIT_
-COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA
-COND_PLATFORM_MACOSX_1_TOOLKIT_GTK
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1
-COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF
-COND_PLATFORM_MACOSX_1_TOOLKIT_X11
+COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
 COND_PLATFORM_MACOSX_1_USE_GUI_1
 COND_PLATFORM_MACOSX_1_USE_GUI_1
+COND_PLATFORM_MACOSX_1_USE_OPENGL_1
 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
 COND_PLATFORM_MACOS_1
 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
 COND_PLATFORM_MACOS_1
+COND_PLATFORM_MAC_0
+COND_PLATFORM_MAC_1
+COND_PLATFORM_MSDOS_0
 COND_PLATFORM_MSDOS_1
 COND_PLATFORM_OS2_1
 COND_PLATFORM_UNIX_0
 COND_PLATFORM_MSDOS_1
 COND_PLATFORM_OS2_1
 COND_PLATFORM_UNIX_0
@@ -880,6 +887,9 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0
 COND_PLATFORM_WIN32_0
 COND_PLATFORM_WIN32_1
 COND_SHARED_0
 COND_PLATFORM_WIN32_0
 COND_PLATFORM_WIN32_1
 COND_SHARED_0
+COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
+COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
+COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
@@ -901,12 +911,11 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_USE_GUI_1
 COND_TOOLKIT_MAC
 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_USE_GUI_1
 COND_TOOLKIT_MAC
-COND_TOOLKIT_MAC_USE_GUI_1
-COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_MGL
 COND_TOOLKIT_MGL_USE_GUI_1
 COND_TOOLKIT_MOTIF
 COND_TOOLKIT_MGL
 COND_TOOLKIT_MGL_USE_GUI_1
 COND_TOOLKIT_MOTIF
@@ -916,6 +925,13 @@ COND_TOOLKIT_MSW
 COND_TOOLKIT_MSW_USE_GUI_1
 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_MSW_WXUNIV_0
 COND_TOOLKIT_MSW_USE_GUI_1
 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_MSW_WXUNIV_0
+COND_TOOLKIT_OSX_CARBON
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_OSX_COCOA
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_OSX_IPHONE
 COND_TOOLKIT_PM
 COND_TOOLKIT_PM_USE_GUI_1
 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_PM
 COND_TOOLKIT_PM_USE_GUI_1
 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0
@@ -936,6 +952,7 @@ COND_USE_GUI_1_WXUNIV_1
 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
 COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
 COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
 COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
 COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
+COND_USE_OPENGL_1
 COND_USE_PCH_1
 COND_USE_PLUGINS_0
 COND_USE_RTTI_0
 COND_USE_PCH_1
 COND_USE_PLUGINS_0
 COND_USE_RTTI_0
@@ -1630,7 +1647,6 @@ Optional Features:
   --disable-gtk2          use GTK+ 1.2 instead of 2.0
   --enable-gpe            use GNOME PDA Environment features if possible
   --disable-shared        create static library instead of shared
   --disable-gtk2          use GTK+ 1.2 instead of 2.0
   --enable-gpe            use GNOME PDA Environment features if possible
   --disable-shared        create static library instead of shared
-  --disable-optimise      create optimised code
   --enable-debug          same as debug_flag and debug_info
   --enable-stl            use STL for containers
   --enable-std_iostreams  use standard C++ stream classes
   --enable-debug          same as debug_flag and debug_info
   --enable-stl            use STL for containers
   --enable-std_iostreams  use standard C++ stream classes
@@ -1638,11 +1654,12 @@ Optional Features:
   --disable-unicode       compile without Unicode support
   --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)
   --enable-utf8           use UTF-8 representation for strings (Unix only)
   --disable-unicode       compile without Unicode support
   --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)
   --enable-utf8           use UTF-8 representation for strings (Unix only)
-  --enable-utf8only      only support UTF-8 locales in UTF-8 build (Unix only)
+  --enable-utf8only       only support UTF-8 locales in UTF-8 build (Unix only)
   --enable-extended_rtti  use extended RTTI (XTI)
   --enable-omf            use OMF object format
   --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)
   --enable-debug_info     create code with debugging information
   --enable-extended_rtti  use extended RTTI (XTI)
   --enable-omf            use OMF object format
   --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)
   --enable-debug_info     create code with debugging information
+  --disable-optimise      compile without optimisations
   --enable-debug_gdb      create code with extra GDB debugging information
   --enable-debug_cntxt    use wxDebugContext
   --enable-mem_tracing    create code with memory tracing
   --enable-debug_gdb      create code with extra GDB debugging information
   --enable-debug_cntxt    use wxDebugContext
   --enable-mem_tracing    create code with memory tracing
@@ -1659,12 +1676,14 @@ Optional Features:
   --enable-objc_uniquifying enable Objective-C class name uniquifying
   --disable-visibility    disable use of ELF symbols visibility even if supported
   --enable-intl           use internationalization system
   --enable-objc_uniquifying enable Objective-C class name uniquifying
   --disable-visibility    disable use of ELF symbols visibility even if supported
   --enable-intl           use internationalization system
+  --enable-xlocale        use x-locale support (requires wxLocale)
   --enable-config         use wxConfig (and derived) classes
   --enable-protocols      use wxProtocol and derived classes
   --enable-ftp            use wxFTP (requires wxProtocol
   --enable-http           use wxHTTP (requires wxProtocol
   --enable-fileproto      use wxFileProto class (requires wxProtocol
   --enable-sockets        use socket/network classes
   --enable-config         use wxConfig (and derived) classes
   --enable-protocols      use wxProtocol and derived classes
   --enable-ftp            use wxFTP (requires wxProtocol
   --enable-http           use wxHTTP (requires wxProtocol
   --enable-fileproto      use wxFileProto class (requires wxProtocol
   --enable-sockets        use socket/network classes
+  --enable-ipv6           enable IPv6 support in wxSocket
   --enable-ole            use OLE classes (Win32 only)
   --enable-dataobj        use data object classes
   --enable-ipc            use interprocess communication (wxSocket etc.)
   --enable-ole            use OLE classes (Win32 only)
   --enable-dataobj        use data object classes
   --enable-ipc            use interprocess communication (wxSocket etc.)
@@ -1695,7 +1714,9 @@ Optional Features:
   --enable-log            use logging system
   --enable-longlong       use wxLongLong class
   --enable-mimetype       use wxMimeTypesManager
   --enable-log            use logging system
   --enable-longlong       use wxLongLong class
   --enable-mimetype       use wxMimeTypesManager
+  --enable-printfposparam use wxVsnprintf() which supports positional parameters
   --enable-snglinst       use wxSingleInstanceChecker class
   --enable-snglinst       use wxSingleInstanceChecker class
+  --enable-sound          use wxSound class
   --enable-stdpaths       use wxStandardPaths class
   --enable-stopwatch      use wxStopWatch class
   --enable-streams        use wxStream etc classes
   --enable-stdpaths       use wxStandardPaths class
   --enable-stopwatch      use wxStopWatch class
   --enable-streams        use wxStream etc classes
@@ -1704,13 +1725,9 @@ Optional Features:
   --enable-textbuf        use wxTextBuffer class
   --enable-textfile       use wxTextFile class
   --enable-timer          use wxTimer class
   --enable-textbuf        use wxTextBuffer class
   --enable-textfile       use wxTextFile class
   --enable-timer          use wxTimer class
-  --enable-sound          use wxSound class
-  --enable-mediactrl      use wxMediaCtrl class
-  --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
-  --enable-printfposparam use wxVsnprintf() which supports positional parameters
+  --enable-variant        use wxVariant class
   --enable-zipstream      use wxZip streams
   --enable-url            use wxURL class
   --enable-zipstream      use wxZip streams
   --enable-url            use wxURL class
-  --enable-variant        use wxVariant class
   --enable-protocol       use wxProtocol class
   --enable-protocol-http  HTTP support in wxProtocol
   --enable-protocol-ftp   FTP support in wxProtocol
   --enable-protocol       use wxProtocol class
   --enable-protocol-http  HTTP support in wxProtocol
   --enable-protocol-ftp   FTP support in wxProtocol
@@ -1725,18 +1742,21 @@ Optional Features:
   --enable-htmlhelp       use wxHTML-based help
   --enable-xrc            use XRC resources sub-library
   --enable-aui            use AUI docking library
   --enable-htmlhelp       use wxHTML-based help
   --enable-xrc            use XRC resources sub-library
   --enable-aui            use AUI docking library
+  --enable-propgrid       use wxPropertyGrid library
   --enable-stc            use wxStyledTextCtrl library
   --enable-constraints    use layout-constraints system
   --enable-stc            use wxStyledTextCtrl library
   --enable-constraints    use layout-constraints system
-  --enable-printarch      use printing architecture
-  --enable-mdi            use multiple document interface architecture
-  --enable-mdidoc         use docview architecture with MDI
   --enable-loggui         use standard GUI logger
   --enable-logwin         use wxLogWindow
   --enable-logdialog      use wxLogDialog
   --enable-loggui         use standard GUI logger
   --enable-logwin         use wxLogWindow
   --enable-logdialog      use wxLogDialog
+  --enable-mdi            use multiple document interface architecture
+  --enable-mdidoc         use docview architecture with MDI
+  --enable-mediactrl      use wxMediaCtrl class
+  --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
   --enable-webkit         use wxWebKitCtrl (Mac)
   --enable-richtext       use wxRichTextCtrl
   --enable-graphics_ctx   use graphics context 2D drawing API
   --enable-postscript     use wxPostscriptDC device context (default for gtk+)
   --enable-webkit         use wxWebKitCtrl (Mac)
   --enable-richtext       use wxRichTextCtrl
   --enable-graphics_ctx   use graphics context 2D drawing API
   --enable-postscript     use wxPostscriptDC device context (default for gtk+)
+  --enable-printarch      use printing architecture
   --enable-svg            use wxSVGFileDC device context
   --enable-clipboard      use wxClipboard class
   --enable-dnd            use Drag'n'Drop classes
   --enable-svg            use wxSVGFileDC device context
   --enable-clipboard      use wxClipboard class
   --enable-dnd            use Drag'n'Drop classes
@@ -1774,6 +1794,7 @@ Optional Features:
   --enable-listbox        use wxListBox class
   --enable-listctrl       use wxListCtrl class
   --enable-notebook       use wxNotebook class
   --enable-listbox        use wxListBox class
   --enable-listctrl       use wxListCtrl class
   --enable-notebook       use wxNotebook class
+  --enable-notifmsg       use wxNotificationMessage class
   --enable-odcombobox     use wxOwnerDrawnComboBox class
   --enable-radiobox       use wxRadioBox class
   --enable-radiobtn       use wxRadioButton class
   --enable-odcombobox     use wxOwnerDrawnComboBox class
   --enable-radiobox       use wxRadioBox class
   --enable-radiobtn       use wxRadioButton class
@@ -1834,12 +1855,13 @@ Optional Features:
   --enable-iff            use iff images (IFF file format)
   --enable-pnm            use pnm images (PNM file format)
   --enable-xpm            use xpm images (XPM file format)
   --enable-iff            use iff images (IFF file format)
   --enable-pnm            use pnm images (PNM file format)
   --enable-xpm            use xpm images (XPM file format)
-  --enable-icocur         use Windows ICO and CUR formats
+  --enable-ico_cur        use Windows ICO and CUR formats
   --enable-dccache        cache temporary wxDC objects (Win32 only)
   --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)
   --enable-dccache        cache temporary wxDC objects (Win32 only)
   --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)
-  --enable-ownerdrawn     use owner drawn controls (Win32 only)
+  --enable-ownerdrawn     use owner drawn controls (Win32 and OS/2 only)
   --enable-uxtheme        enable support for Windows XP themed look (Win32 only)
   --enable-wxdib          use wxDIB class (Win32 only)
   --enable-uxtheme        enable support for Windows XP themed look (Win32 only)
   --enable-wxdib          use wxDIB class (Win32 only)
+  --enable-autoidman      use automatic ids management
   --disable-largefile     omit support for large files
   --disable-gtktest       do not try to compile and run a test GTK+ program
   --disable-gtktest       Do not try to compile and run a test GTK program
   --disable-largefile     omit support for large files
   --disable-gtktest       do not try to compile and run a test GTK+ program
   --disable-gtktest       Do not try to compile and run a test GTK program
@@ -1859,7 +1881,9 @@ Optional Packages:
   --with-themes=all|list  use only the specified comma-separated list of wxUniversal themes
   --with-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"
   --with-motif            use Motif/Lesstif
   --with-themes=all|list  use only the specified comma-separated list of wxUniversal themes
   --with-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"
   --with-motif            use Motif/Lesstif
-  --with-mac              use Mac OS X
+  --with-osx_carbon       use Mac OS X (Carbon)
+  --with-osx_cocoa        use Mac OS X (Cocoa)
+  --with-mac              use Mac OS X (Default)
   --with-cocoa            use Cocoa
   --with-wine             use Wine
   --with-msw              use MS-Windows
   --with-cocoa            use Cocoa
   --with-wine             use Wine
   --with-msw              use MS-Windows
@@ -1872,6 +1896,7 @@ Optional Packages:
   --with-libjpeg          use libjpeg (JPEG file format)
   --with-libtiff          use libtiff (TIFF file format)
   --with-libxpm           use libxpm (XPM file format)
   --with-libjpeg          use libjpeg (JPEG file format)
   --with-libtiff          use libtiff (TIFF file format)
   --with-libxpm           use libxpm (XPM file format)
+  --with-libiconv         use libiconv (character conversion)
   --with-libmspack        use libmspack (CHM help files loading)
   --without-gtkprint      don't use GTK printing support
   --without-gnomeprint    don't use GNOME printing libraries
   --with-libmspack        use libmspack (CHM help files loading)
   --without-gtkprint      don't use GTK printing support
   --without-gnomeprint    don't use GNOME printing libraries
@@ -2576,11 +2601,12 @@ USE_ALPHA=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
-ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
 
 DEFAULT_wxUSE_COCOA=0
 DEFAULT_wxUSE_GTK=0
 
 DEFAULT_wxUSE_COCOA=0
 DEFAULT_wxUSE_GTK=0
-DEFAULT_wxUSE_MAC=0
+DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
@@ -2591,7 +2617,8 @@ DEFAULT_wxUSE_DFB=0
 
 DEFAULT_DEFAULT_wxUSE_COCOA=0
 DEFAULT_DEFAULT_wxUSE_GTK=0
 
 DEFAULT_DEFAULT_wxUSE_COCOA=0
 DEFAULT_DEFAULT_wxUSE_GTK=0
-DEFAULT_DEFAULT_wxUSE_MAC=0
+DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
 DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
@@ -2875,14 +2902,14 @@ _ACEOF
 #define TARGET_CARBON 1
 _ACEOF
 
 #define TARGET_CARBON 1
 _ACEOF
 
-    DEFAULT_DEFAULT_wxUSE_MAC=1
+    DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
     DEFAULT_STD_FLAG=no
   ;;
   powerpc-apple-macos* )
         USE_UNIX=0
             ac_cv_c_bigendian=yes
     SO_SUFFIX=shlib
     DEFAULT_STD_FLAG=no
   ;;
   powerpc-apple-macos* )
         USE_UNIX=0
             ac_cv_c_bigendian=yes
     SO_SUFFIX=shlib
-            DEFAULT_DEFAULT_wxUSE_MAC=1
+            DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
     DEFAULT_STD_FLAG=no
   ;;
 
     DEFAULT_STD_FLAG=no
   ;;
 
@@ -2906,14 +2933,6 @@ esac
 
 
 
 
 
 
-
-          wx_arg_cache_file="configarg.cache"
-          echo "loading argument cache $wx_arg_cache_file"
-          rm -f ${wx_arg_cache_file}.tmp
-          touch ${wx_arg_cache_file}.tmp
-          touch ${wx_arg_cache_file}
-
-
 DEFAULT_wxUSE_ALL_FEATURES=yes
 
 DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
 DEFAULT_wxUSE_ALL_FEATURES=yes
 
 DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
@@ -2927,10 +2946,11 @@ DEFAULT_wxUSE_LIBSDL=no
 DEFAULT_wxUSE_OPENGL=no
 
 DEFAULT_wxUSE_ACCESSIBILITY=no
 DEFAULT_wxUSE_OPENGL=no
 
 DEFAULT_wxUSE_ACCESSIBILITY=no
-DEFAULT_wxUSE_DATAVIEWCTRL=no
 DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
 DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
+DEFAULT_wxUSE_IPV6=no
 DEFAULT_wxUSE_MEDIACTRL=no
 DEFAULT_wxUSE_TAB_DIALOG=no
 DEFAULT_wxUSE_MEDIACTRL=no
 DEFAULT_wxUSE_TAB_DIALOG=no
+DEFAULT_wxUSE_GSTREAMER8=no
 
 DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 
 DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
@@ -2944,21 +2964,6 @@ DEFAULT_wxUSE_GTK2=yes
 DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
 
 
 DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
 
 
-for toolkit in `echo $ALL_TOOLKITS`; do
-  LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
-  if test "x$LINE" != "x" ; then
-    has_toolkit_in_cache=1
-    eval "DEFAULT_$LINE"
-    eval "CACHE_$toolkit=1"
-
-    LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}`
-    if test "x$LINE" != "x" ; then
-        eval "DEFAULT_$LINE"
-    fi
-  fi
-done
-
-
 
 
 
 
 
 
@@ -2982,27 +2987,15 @@ if test "${enable_gui+set}" = set; then
                           else
                             wx_cv_use_gui='wxUSE_GUI=no'
                           fi
                           else
                             wx_cv_use_gui='wxUSE_GUI=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gui"
                           wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gui"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_GUI=$wxUSE_GUI" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GUI = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GUI = yes; then
@@ -3038,27 +3031,15 @@ if test "${enable_monolithic+set}" = set; then
                           else
                             wx_cv_use_monolithic='wxUSE_MONOLITHIC=no'
                           fi
                           else
                             wx_cv_use_monolithic='wxUSE_MONOLITHIC=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_monolithic"
                           wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_monolithic"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MONOLITHIC=$wxUSE_MONOLITHIC" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MONOLITHIC = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MONOLITHIC = yes; then
@@ -3094,27 +3075,15 @@ if test "${enable_plugins+set}" = set; then
                           else
                             wx_cv_use_plugins='wxUSE_PLUGINS=no'
                           fi
                           else
                             wx_cv_use_plugins='wxUSE_PLUGINS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_plugins"
                           wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_plugins"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PLUGINS=$wxUSE_PLUGINS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PLUGINS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PLUGINS = yes; then
@@ -3150,27 +3119,15 @@ if test "${with_subdirs+set}" = set; then
                         else
                           wx_cv_use_subdirs='wxWITH_SUBDIRS=no'
                         fi
                         else
                           wx_cv_use_subdirs='wxWITH_SUBDIRS=no'
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_subdirs"
                         wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_subdirs"
-          if test "x$cache" = xyes; then
-            echo "wxWITH_SUBDIRS=$wxWITH_SUBDIRS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxWITH_SUBDIRS = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxWITH_SUBDIRS = yes; then
@@ -3212,27 +3169,15 @@ if test "${enable_official_build+set}" = set; then
                           else
                             wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
                           fi
                           else
                             wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_official_build"
                           wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_official_build"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_OFFICIAL_BUILD=$wxUSE_OFFICIAL_BUILD" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_OFFICIAL_BUILD = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_OFFICIAL_BUILD = yes; then
@@ -3277,27 +3222,15 @@ if test "${enable_all_features+set}" = set; then
                           else
                             wx_cv_use_all_features='wxUSE_ALL_FEATURES=no'
                           fi
                           else
                             wx_cv_use_all_features='wxUSE_ALL_FEATURES=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_all_features"
                           wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_all_features"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ALL_FEATURES=$wxUSE_ALL_FEATURES" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ALL_FEATURES = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ALL_FEATURES = yes; then
@@ -3337,27 +3270,15 @@ if test "${enable_universal+set}" = set; then
                           else
                             wx_cv_use_universal='wxUSE_UNIVERSAL=no'
                           fi
                           else
                             wx_cv_use_universal='wxUSE_UNIVERSAL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_universal"
                           wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_universal"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_UNIVERSAL=$wxUSE_UNIVERSAL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_UNIVERSAL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_UNIVERSAL = yes; then
@@ -3394,9 +3315,21 @@ if test "${with_motif+set}" = set; then
 fi
 
 
 fi
 
 
+# Check whether --with-osx_carbon was given.
+if test "${with_osx_carbon+set}" = set; then
+  withval=$with_osx_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-osx_cocoa was given.
+if test "${with_osx_cocoa+set}" = set; then
+  withval=$with_osx_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
+fi
+
+
 # Check whether --with-mac was given.
 if test "${with_mac+set}" = set; then
 # Check whether --with-mac was given.
 if test "${with_mac+set}" = set; then
-  withval=$with_mac; wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1
+  withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
 fi
 
 
 fi
 
 
@@ -3468,27 +3401,15 @@ if test "${enable_nanox+set}" = set; then
                           else
                             wx_cv_use_nanox='wxUSE_NANOX=no'
                           fi
                           else
                             wx_cv_use_nanox='wxUSE_NANOX=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_nanox"
                           wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_nanox"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_NANOX=$wxUSE_NANOX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NANOX = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NANOX = yes; then
@@ -3530,27 +3451,15 @@ if test "${enable_gpe+set}" = set; then
                           else
                             wx_cv_use_gpe='wxUSE_GPE=no'
                           fi
                           else
                             wx_cv_use_gpe='wxUSE_GPE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gpe"
                           wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gpe"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_GPE=$wxUSE_GPE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GPE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GPE = yes; then
@@ -3567,6 +3476,106 @@ echo "${ECHO_T}$result" >&6; }
 
 
 
 
 
 
+{ echo "$as_me:$LINENO: checking for toolkit" >&5
+echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; }
+
+
+
+# In Wine, we need to default to MSW, not GTK or MOTIF
+if test "$wxUSE_WINE" = "yes"; then
+    DEFAULT_DEFAULT_wxUSE_GTK=0
+    DEFAULT_DEFAULT_wxUSE_MOTIF=0
+    DEFAULT_DEFAULT_wxUSE_MSW=1
+    wxUSE_SHARED=no
+    CC=${CC:-winegcc}
+    CXX=${CXX:-wineg++}
+fi
+
+
+if test "$wxUSE_GUI" = "yes"; then
+
+    if test "$USE_BEOS" = 1; then
+        { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5
+echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+
+    if test "$TOOLKIT_GIVEN" = 1; then
+            for toolkit in $ALL_TOOLKITS; do
+        var=wxUSE_$toolkit
+        eval "value=\$${var}"
+        if test "x$value" = "xno"; then
+          eval "$var=0"
+        elif test "x$value" != "x"; then
+          eval "$var=1"
+        fi
+
+        if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
+          eval "wx${toolkit}_VERSION=$value"
+        fi
+      done
+    else
+            for toolkit in $ALL_TOOLKITS; do
+        var=DEFAULT_DEFAULT_wxUSE_$toolkit
+        eval "wxUSE_$toolkit=\$${var}"
+      done
+    fi
+
+            NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+                  + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
+
+        case "${host}" in
+      *-pc-os2_emx | *-pc-os2-emx )
+        NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
+    esac
+
+    case "$NUM_TOOLKITS" in
+      1)
+      ;;
+      0)
+        { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5
+echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;}
+   { (exit 1); exit 1; }; }
+      ;;
+      *)
+        { { echo "$as_me:$LINENO: error: Please specify at most one toolkit" >&5
+echo "$as_me: error: Please specify at most one toolkit" >&2;}
+   { (exit 1); exit 1; }; }
+    esac
+
+    # to be removed when --disable-gtk2 isn't needed
+    if test "x$wxUSE_GTK2" = "xyes"; then
+        wxGTK_VERSION=2
+    elif test "x$wxUSE_GTK2" = "xno"; then
+        wxGTK_VERSION=1
+    fi
+
+    for toolkit in $ALL_TOOLKITS; do
+        var=wxUSE_$toolkit
+        eval "value=\$${var}"
+        if test "$value" = 1; then
+          toolkit_echo=`echo $toolkit | tr '[A-Z]' '[a-z]'`
+          { echo "$as_me:$LINENO: result: $toolkit_echo" >&5
+echo "${ECHO_T}$toolkit_echo" >&6; }
+        fi
+    done
+else
+    if test "x$host_alias" != "x"; then
+        { echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5
+echo "${ECHO_T}base ($host_alias hosted) only" >&6; }
+    else
+        { echo "$as_me:$LINENO: result: base only" >&5
+echo "${ECHO_T}base only" >&6; }
+    fi
+fi
+
+wxUSE_MAC=0
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then
+    wxUSE_MAC=1
+fi
+
+
 
           { echo "$as_me:$LINENO: checking for --with-libpng" >&5
 echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; }
 
           { echo "$as_me:$LINENO: checking for --with-libpng" >&5
 echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; }
@@ -3587,27 +3596,15 @@ if test "${with_libpng+set}" = set; then
 echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
 echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libpng"
                         wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libpng"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LIBPNG=$wxUSE_LIBPNG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_LIBPNG" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
 
           if test "$wxUSE_LIBPNG" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
@@ -3647,27 +3644,15 @@ if test "${with_libjpeg+set}" = set; then
 echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
 echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libjpeg"
                         wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libjpeg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LIBJPEG=$wxUSE_LIBJPEG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_LIBJPEG" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
 
           if test "$wxUSE_LIBJPEG" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
@@ -3707,27 +3692,15 @@ if test "${with_libtiff+set}" = set; then
 echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
 echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libtiff"
                         wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libtiff"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LIBTIFF=$wxUSE_LIBTIFF" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_LIBTIFF" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
 
           if test "$wxUSE_LIBTIFF" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
@@ -3767,27 +3740,15 @@ if test "${with_libxpm+set}" = set; then
 echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
 echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libxpm"
                         wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_libxpm"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LIBXPM=$wxUSE_LIBXPM" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_LIBXPM" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
 
           if test "$wxUSE_LIBXPM" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
@@ -3808,6 +3769,50 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or
           fi
 
 
           fi
 
 
+          withstring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { echo "$as_me:$LINENO: checking for --${withstring:-with}-libiconv" >&5
+echo $ECHO_N "checking for --${withstring:-with}-libiconv... $ECHO_C" >&6; }
+
+# Check whether --with-libiconv was given.
+if test "${with_libiconv+set}" = set; then
+  withval=$with_libiconv;
+                        if test "$withval" = yes; then
+                          wx_cv_use_libiconv='wxUSE_LIBICONV=yes'
+                        else
+                          wx_cv_use_libiconv='wxUSE_LIBICONV=no'
+                        fi
+
+else
+
+                        wx_cv_use_libiconv='wxUSE_LIBICONV=${'DEFAULT_wxUSE_LIBICONV":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_libiconv"
+
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_LIBICONV = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_LIBICONV
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           withstring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           withstring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -3828,27 +3833,15 @@ if test "${with_libmspack+set}" = set; then
                         else
                           wx_cv_use_libmspack='wxUSE_LIBMSPACK=no'
                         fi
                         else
                           wx_cv_use_libmspack='wxUSE_LIBMSPACK=no'
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_libmspack"
                         wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_libmspack"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LIBMSPACK=$wxUSE_LIBMSPACK" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBMSPACK = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBMSPACK = yes; then
@@ -3884,27 +3877,15 @@ if test "${with_gtkprint+set}" = set; then
                         else
                           wx_cv_use_gtkprint='wxUSE_GTKPRINT=no'
                         fi
                         else
                           wx_cv_use_gtkprint='wxUSE_GTKPRINT=no'
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_GTKPRINT=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gtkprint"
                         wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gtkprint"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_GTKPRINT=$wxUSE_GTKPRINT" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_GTKPRINT = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_GTKPRINT = yes; then
@@ -3940,27 +3921,15 @@ if test "${with_gnomeprint+set}" = set; then
                         else
                           wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no'
                         fi
                         else
                           wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no'
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gnomeprint"
                         wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gnomeprint"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBGNOMEPRINT = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBGNOMEPRINT = yes; then
@@ -3996,27 +3965,15 @@ if test "${with_gnomevfs+set}" = set; then
                         else
                           wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no'
                         fi
                         else
                           wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no'
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gnomevfs"
                         wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gnomevfs"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBGNOMEVFS = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBGNOMEVFS = yes; then
@@ -4052,27 +4009,15 @@ if test "${with_hildon+set}" = set; then
                         else
                           wx_cv_use_hildon='wxUSE_LIBHILDON=no'
                         fi
                         else
                           wx_cv_use_hildon='wxUSE_LIBHILDON=no'
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_hildon"
                         wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_hildon"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBHILDON = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBHILDON = yes; then
@@ -4108,27 +4053,15 @@ if test "${with_opengl+set}" = set; then
                         else
                           wx_cv_use_opengl='wxUSE_OPENGL=no'
                         fi
                         else
                           wx_cv_use_opengl='wxUSE_OPENGL=no'
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_opengl"
                         wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_opengl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_OPENGL=$wxUSE_OPENGL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_OPENGL = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_OPENGL = yes; then
@@ -4167,27 +4100,15 @@ if test "${with_dmalloc+set}" = set; then
                         else
                           wx_cv_use_dmalloc='wxUSE_DMALLOC=no'
                         fi
                         else
                           wx_cv_use_dmalloc='wxUSE_DMALLOC=no'
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dmalloc"
                         wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dmalloc"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DMALLOC=$wxUSE_DMALLOC" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_DMALLOC = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_DMALLOC = yes; then
@@ -4223,27 +4144,15 @@ if test "${with_sdl+set}" = set; then
                         else
                           wx_cv_use_sdl='wxUSE_LIBSDL=no'
                         fi
                         else
                           wx_cv_use_sdl='wxUSE_LIBSDL=no'
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sdl"
                         wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sdl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LIBSDL=$wxUSE_LIBSDL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBSDL = yes; then
 
           if test x"$withstring" = xwithout; then
             if test $wxUSE_LIBSDL = yes; then
@@ -4278,27 +4187,15 @@ if test "${with_regex+set}" = set; then
 echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
 echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_regex"
                         wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_regex"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_REGEX=$wxUSE_REGEX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_REGEX" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
 
           if test "$wxUSE_REGEX" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
@@ -4338,27 +4235,15 @@ if test "${with_zlib+set}" = set; then
 echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
 echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_zlib"
                         wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_zlib"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ZLIB=$wxUSE_ZLIB" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_ZLIB" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
 
           if test "$wxUSE_ZLIB" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
@@ -4398,27 +4283,15 @@ if test "${with_expat+set}" = set; then
 echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
 echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
-                        cache=yes
 
 else
 
 
 else
 
-                        LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                        else
-                            cache=no
-                        fi
-
                         wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_expat"
                         wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
           eval "$wx_cv_use_expat"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_EXPAT=$wxUSE_EXPAT" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test "$wxUSE_EXPAT" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
 
           if test "$wxUSE_EXPAT" = yes; then
             { echo "$as_me:$LINENO: result: yes" >&5
@@ -4447,18 +4320,6 @@ if test "${with_macosx_sdk+set}" = set; then
   withval=$with_macosx_sdk;
         wxUSE_MACOSX_SDK=$withval
         wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
   withval=$with_macosx_sdk;
         wxUSE_MACOSX_SDK=$withval
         wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
-        echo "wxUSE_MACOSX_SDK=$wxUSE_MACOSX_SDK" >> ${wx_arg_cache_file}.tmp
-
-else
-
-        # NOTE: Empty string on purpose so that --without-macosx-sdk (thus no)
-        # will override --enable-universal_binary's automatic SDK usage.
-        wxUSE_MACOSX_SDK=
-        LINE=`grep "^wxUSE_MACOSX_SDK=" ${wx_arg_cache_file}`
-        if test "x$LINE" != x ; then
-            eval "$LINE"
-            echo "$LINE" >> ${wx_arg_cache_file}.tmp
-        fi
 
 fi
 
 
 fi
 
@@ -4473,19 +4334,6 @@ if test "${with_macosx_version_min+set}" = set; then
   withval=$with_macosx_version_min;
         wxUSE_MACOSX_VERSION_MIN=$withval
         wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
   withval=$with_macosx_version_min;
         wxUSE_MACOSX_VERSION_MIN=$withval
         wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
-        echo "wxUSE_MACOSX_VERSION_MIN=$wxUSE_MACOSX_VERSION_MIN" >> ${wx_arg_cache_file}.tmp
-
-else
-
-        # default "yes" because when not using an SDK it means the same as no
-        # but when using an SDK it means to use the SDK version
-        wxUSE_MACOSX_VERSION_MIN=yes
-        # See if there is a value in the cache
-        LINE=`grep "^wxUSE_MACOSX_VERSION_MIN=" ${wx_arg_cache_file}`
-        if test "x$LINE" != x ; then
-            eval "$LINE"
-            echo "$LINE" >> ${wx_arg_cache_file}.tmp
-        fi
 
 fi
 
 
 fi
 
@@ -4514,27 +4362,15 @@ if test "${enable_shared+set}" = set; then
                           else
                             wx_cv_use_shared='wxUSE_SHARED=no'
                           fi
                           else
                             wx_cv_use_shared='wxUSE_SHARED=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_shared"
                           wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_shared"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SHARED=$wxUSE_SHARED" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SHARED = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SHARED = yes; then
@@ -4550,62 +4386,6 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
-          enablestring=disable
-          defaultval=
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
-          # Check whether --enable-optimise was given.
-if test "${enable_optimise+set}" = set; then
-  enableval=$enable_optimise;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
-                          else
-                            wx_cv_use_optimise='wxUSE_OPTIMISE=no'
-                          fi
-                          cache=yes
-
-else
-
-                          LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_optimise"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_OPTIMISE=$wxUSE_OPTIMISE" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OPTIMISE = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_OPTIMISE
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
           enablestring=
           defaultval=
           if test -z "$defaultval"; then
           enablestring=
           defaultval=
           if test -z "$defaultval"; then
@@ -4626,27 +4406,15 @@ if test "${enable_debug+set}" = set; then
                           else
                             wx_cv_use_debug='wxUSE_DEBUG=no'
                           fi
                           else
                             wx_cv_use_debug='wxUSE_DEBUG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debug"
                           wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debug"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DEBUG=$wxUSE_DEBUG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUG = yes; then
@@ -4682,27 +4450,15 @@ if test "${enable_stl+set}" = set; then
                           else
                             wx_cv_use_stl='wxUSE_STL=no'
                           fi
                           else
                             wx_cv_use_stl='wxUSE_STL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stl"
                           wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STL=$wxUSE_STL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STL = yes; then
@@ -4738,27 +4494,15 @@ if test "${enable_std_iostreams+set}" = set; then
                           else
                             wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
                           fi
                           else
                             wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_std_iostreams"
                           wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_std_iostreams"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STD_IOSTREAM=$wxUSE_STD_IOSTREAM" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STD_IOSTREAM = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STD_IOSTREAM = yes; then
@@ -4794,27 +4538,15 @@ if test "${enable_std_string+set}" = set; then
                           else
                             wx_cv_use_std_string='wxUSE_STD_STRING=no'
                           fi
                           else
                             wx_cv_use_std_string='wxUSE_STD_STRING=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_std_string"
                           wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_std_string"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STD_STRING=$wxUSE_STD_STRING" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STD_STRING = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STD_STRING = yes; then
@@ -4850,27 +4582,15 @@ if test "${enable_unicode+set}" = set; then
                           else
                             wx_cv_use_unicode='wxUSE_UNICODE=no'
                           fi
                           else
                             wx_cv_use_unicode='wxUSE_UNICODE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_unicode"
                           wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_unicode"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_UNICODE=$wxUSE_UNICODE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_UNICODE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_UNICODE = yes; then
@@ -4906,27 +4626,15 @@ if test "${enable_mslu+set}" = set; then
                           else
                             wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
                           fi
                           else
                             wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mslu"
                           wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mslu"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_UNICODE_MSLU=$wxUSE_UNICODE_MSLU" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_UNICODE_MSLU = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_UNICODE_MSLU = yes; then
@@ -4949,27 +4657,15 @@ echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; }
 if test "${enable_utf8+set}" = set; then
   enableval=$enable_utf8;
                           wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
 if test "${enable_utf8+set}" = set; then
   enableval=$enable_utf8;
                           wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                          else
-                            cache=no
-                          fi
-
                           wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
 
 fi
 
 
           eval "$wx_cv_use_utf8"
                           wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
 
 fi
 
 
           eval "$wx_cv_use_utf8"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_UNICODE_UTF8=$wxUSE_UNICODE_UTF8" >> ${wx_arg_cache_file}.tmp
-          fi
 
           { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
 echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
 
           { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
 echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
@@ -4995,27 +4691,15 @@ if test "${enable_utf8only+set}" = set; then
                           else
                             wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
                           fi
                           else
                             wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_utf8only"
                           wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_utf8only"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_UNICODE_UTF8_LOCALE=$wxUSE_UNICODE_UTF8_LOCALE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then
@@ -5051,27 +4735,15 @@ if test "${enable_extended_rtti+set}" = set; then
                           else
                             wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
                           fi
                           else
                             wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_extended_rtti"
                           wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_extended_rtti"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_EXTENDED_RTTI=$wxUSE_EXTENDED_RTTI" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_EXTENDED_RTTI = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_EXTENDED_RTTI = yes; then
@@ -5086,7 +4758,7 @@ fi
           { echo "$as_me:$LINENO: result: $result" >&5
 echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: result: $result" >&5
 echo "${ECHO_T}$result" >&6; }
 
-if test "$USE_OS2" = "1"; then
+if test "$USE_OS2" = 1; then
     DEFAULT_wxUSE_OMF=no
 
           enablestring=
     DEFAULT_wxUSE_OMF=no
 
           enablestring=
@@ -5109,27 +4781,15 @@ if test "${enable_omf+set}" = set; then
                           else
                             wx_cv_use_omf='wxUSE_OMF=no'
                           fi
                           else
                             wx_cv_use_omf='wxUSE_OMF=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_omf"
                           wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_omf"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_OMF=$wxUSE_OMF" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_OMF = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_OMF = yes; then
@@ -5147,13 +4807,13 @@ echo "${ECHO_T}$result" >&6; }
 fi
 
 if test "$wxUSE_DEBUG" = "yes"; then
 fi
 
 if test "$wxUSE_DEBUG" = "yes"; then
-  DEFAULT_wxUSE_DEBUG_FLAG=yes
-  DEFAULT_wxUSE_DEBUG_INFO=yes
-  BUILD=debug
+    DEFAULT_wxUSE_DEBUG_FLAG=yes
+    DEFAULT_wxUSE_DEBUG_INFO=yes
+    BUILD=debug
 elif test "$wxUSE_DEBUG" = "no"; then
 elif test "$wxUSE_DEBUG" = "no"; then
-  DEFAULT_wxUSE_DEBUG_FLAG=no
-  DEFAULT_wxUSE_DEBUG_INFO=no
-  BUILD=release
+    DEFAULT_wxUSE_DEBUG_FLAG=no
+    DEFAULT_wxUSE_DEBUG_INFO=no
+    BUILD=release
 fi
 
 
 fi
 
 
@@ -5177,27 +4837,15 @@ if test "${enable_debug_flag+set}" = set; then
                           else
                             wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                           fi
                           else
                             wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debug_flag"
                           wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debug_flag"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DEBUG_FLAG=$wxUSE_DEBUG_FLAG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUG_FLAG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUG_FLAG = yes; then
@@ -5233,27 +4881,15 @@ if test "${enable_debug_info+set}" = set; then
                           else
                             wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
                           fi
                           else
                             wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debug_info"
                           wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debug_info"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DEBUG_INFO=$wxUSE_DEBUG_INFO" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUG_INFO = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUG_INFO = yes; then
@@ -5269,6 +4905,61 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
+if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
+    wxUSE_DEBUG=yes
+    BUILD=debug
+fi
+
+if test "$wxUSE_DEBUG" = "yes"; then
+    DEFAULT_wxUSE_OPTIMISE=no
+fi
+
+
+          enablestring=disable
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
+          # Check whether --enable-optimise was given.
+if test "${enable_optimise+set}" = set; then
+  enableval=$enable_optimise;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
+                          else
+                            wx_cv_use_optimise='wxUSE_OPTIMISE=no'
+                          fi
+
+else
+
+                          wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_optimise"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_OPTIMISE = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_OPTIMISE
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+
           enablestring=
           defaultval=
           if test -z "$defaultval"; then
           enablestring=
           defaultval=
           if test -z "$defaultval"; then
@@ -5289,27 +4980,15 @@ if test "${enable_debug_gdb+set}" = set; then
                           else
                             wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
                           fi
                           else
                             wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debug_gdb"
                           wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debug_gdb"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DEBUG_GDB=$wxUSE_DEBUG_GDB" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUG_GDB = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUG_GDB = yes; then
@@ -5345,27 +5024,15 @@ if test "${enable_debug_cntxt+set}" = set; then
                           else
                             wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
                           fi
                           else
                             wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debug_cntxt"
                           wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debug_cntxt"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DEBUG_CONTEXT=$wxUSE_DEBUG_CONTEXT" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUG_CONTEXT = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUG_CONTEXT = yes; then
@@ -5401,27 +5068,15 @@ if test "${enable_mem_tracing+set}" = set; then
                           else
                             wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
                           fi
                           else
                             wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mem_tracing"
                           wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mem_tracing"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MEM_TRACING=$wxUSE_MEM_TRACING" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MEM_TRACING = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MEM_TRACING = yes; then
@@ -5457,27 +5112,15 @@ if test "${enable_profile+set}" = set; then
                           else
                             wx_cv_use_profile='wxUSE_PROFILE=no'
                           fi
                           else
                             wx_cv_use_profile='wxUSE_PROFILE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_profile"
                           wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_profile"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PROFILE=$wxUSE_PROFILE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROFILE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROFILE = yes; then
@@ -5513,27 +5156,15 @@ if test "${enable_no_rtti+set}" = set; then
                           else
                             wx_cv_use_no_rtti='wxUSE_NO_RTTI=no'
                           fi
                           else
                             wx_cv_use_no_rtti='wxUSE_NO_RTTI=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_rtti"
                           wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_rtti"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_NO_RTTI=$wxUSE_NO_RTTI" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NO_RTTI = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NO_RTTI = yes; then
@@ -5569,27 +5200,15 @@ if test "${enable_no_exceptions+set}" = set; then
                           else
                             wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
                           fi
                           else
                             wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_exceptions"
                           wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_exceptions"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_NO_EXCEPTIONS=$wxUSE_NO_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NO_EXCEPTIONS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NO_EXCEPTIONS = yes; then
@@ -5625,27 +5244,15 @@ if test "${enable_permissive+set}" = set; then
                           else
                             wx_cv_use_permissive='wxUSE_PERMISSIVE=no'
                           fi
                           else
                             wx_cv_use_permissive='wxUSE_PERMISSIVE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_permissive"
                           wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_permissive"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PERMISSIVE=$wxUSE_PERMISSIVE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PERMISSIVE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PERMISSIVE = yes; then
@@ -5681,27 +5288,15 @@ if test "${enable_no_deps+set}" = set; then
                           else
                             wx_cv_use_no_deps='wxUSE_NO_DEPS=no'
                           fi
                           else
                             wx_cv_use_no_deps='wxUSE_NO_DEPS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_deps"
                           wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_no_deps"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_NO_DEPS=$wxUSE_NO_DEPS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NO_DEPS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NO_DEPS = yes; then
@@ -5737,27 +5332,15 @@ if test "${enable_vararg_macros+set}" = set; then
                           else
                             wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no'
                           fi
                           else
                             wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_vararg_macros"
                           wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_vararg_macros"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_VARARG_MACROS=$wxUSE_VARARG_MACROS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_VARARG_MACROS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_VARARG_MACROS = yes; then
@@ -5780,27 +5363,15 @@ echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C
 if test "${enable_universal_binary+set}" = set; then
   enableval=$enable_universal_binary;
                           wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'"
 if test "${enable_universal_binary+set}" = set; then
   enableval=$enable_universal_binary;
                           wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'"
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                            cache=yes
-                          else
-                            cache=no
-                          fi
-
                           wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
 
 fi
 
 
           eval "$wx_cv_use_universal_binary"
                           wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
 
 fi
 
 
           eval "$wx_cv_use_universal_binary"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_UNIVERSAL_BINARY=$wxUSE_UNIVERSAL_BINARY" >> ${wx_arg_cache_file}.tmp
-          fi
 
           { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5
 echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
 
           { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5
 echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
@@ -5827,27 +5398,15 @@ if test "${enable_compat26+set}" = set; then
                           else
                             wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no'
                           fi
                           else
                             wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_compat26"
                           wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_compat26"
-          if test "x$cache" = xyes; then
-            echo "WXWIN_COMPATIBILITY_2_6=$WXWIN_COMPATIBILITY_2_6" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $WXWIN_COMPATIBILITY_2_6 = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $WXWIN_COMPATIBILITY_2_6 = yes; then
@@ -5883,27 +5442,15 @@ if test "${enable_compat28+set}" = set; then
                           else
                             wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
                           fi
                           else
                             wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_compat28"
                           wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_compat28"
-          if test "x$cache" = xyes; then
-            echo "WXWIN_COMPATIBILITY_2_8=$WXWIN_COMPATIBILITY_2_8" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $WXWIN_COMPATIBILITY_2_8 = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $WXWIN_COMPATIBILITY_2_8 = yes; then
@@ -5940,27 +5487,15 @@ if test "${enable_rpath+set}" = set; then
                           else
                             wx_cv_use_rpath='wxUSE_RPATH=no'
                           fi
                           else
                             wx_cv_use_rpath='wxUSE_RPATH=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_rpath"
                           wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_rpath"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_RPATH=$wxUSE_RPATH" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_RPATH = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_RPATH = yes; then
@@ -5997,27 +5532,15 @@ if test "${enable_objc_uniquifying+set}" = set; then
                           else
                             wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no'
                           fi
                           else
                             wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_objc_uniquifying"
                           wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_objc_uniquifying"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_OBJC_UNIQUIFYING=$wxUSE_OBJC_UNIQUIFYING" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_OBJC_UNIQUIFYING = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_OBJC_UNIQUIFYING = yes; then
@@ -6054,27 +5577,15 @@ if test "${enable_visibility+set}" = set; then
                           else
                             wx_cv_use_visibility='wxUSE_VISIBILITY=no'
                           fi
                           else
                             wx_cv_use_visibility='wxUSE_VISIBILITY=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_visibility"
                           wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_visibility"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_VISIBILITY=$wxUSE_VISIBILITY" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_VISIBILITY = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_VISIBILITY = yes; then
@@ -6112,27 +5623,15 @@ if test "${enable_intl+set}" = set; then
                           else
                             wx_cv_use_intl='wxUSE_INTL=no'
                           fi
                           else
                             wx_cv_use_intl='wxUSE_INTL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_intl"
                           wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_intl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_INTL=$wxUSE_INTL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_INTL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_INTL = yes; then
@@ -6148,6 +5647,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xlocale" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-xlocale... $ECHO_C" >&6; }
+          # Check whether --enable-xlocale was given.
+if test "${enable_xlocale+set}" = set; then
+  enableval=$enable_xlocale;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_xlocale='wxUSE_XLOCALE=yes'
+                          else
+                            wx_cv_use_xlocale='wxUSE_XLOCALE=no'
+                          fi
+
+else
+
+                          wx_cv_use_xlocale='wxUSE_XLOCALE=${'DEFAULT_wxUSE_XLOCALE":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_xlocale"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_XLOCALE = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_XLOCALE
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -6168,27 +5711,15 @@ if test "${enable_config+set}" = set; then
                           else
                             wx_cv_use_config='wxUSE_CONFIG=no'
                           fi
                           else
                             wx_cv_use_config='wxUSE_CONFIG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_config"
                           wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_config"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CONFIG=$wxUSE_CONFIG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CONFIG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CONFIG = yes; then
@@ -6225,27 +5756,15 @@ if test "${enable_protocols+set}" = set; then
                           else
                             wx_cv_use_protocols='wxUSE_PROTOCOL=no'
                           fi
                           else
                             wx_cv_use_protocols='wxUSE_PROTOCOL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocols"
                           wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocols"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL = yes; then
@@ -6281,27 +5800,15 @@ if test "${enable_ftp+set}" = set; then
                           else
                             wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
                           else
                             wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ftp"
                           wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ftp"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_FTP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_FTP = yes; then
@@ -6337,27 +5844,15 @@ if test "${enable_http+set}" = set; then
                           else
                             wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
                           else
                             wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_http"
                           wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_http"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_HTTP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_HTTP = yes; then
@@ -6393,27 +5888,15 @@ if test "${enable_fileproto+set}" = set; then
                           else
                             wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
                           fi
                           else
                             wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fileproto"
                           wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fileproto"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_FILE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_FILE = yes; then
@@ -6449,27 +5932,15 @@ if test "${enable_sockets+set}" = set; then
                           else
                             wx_cv_use_sockets='wxUSE_SOCKETS=no'
                           fi
                           else
                             wx_cv_use_sockets='wxUSE_SOCKETS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sockets"
                           wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sockets"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SOCKETS=$wxUSE_SOCKETS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SOCKETS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SOCKETS = yes; then
@@ -6485,6 +5956,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipv6" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ipv6... $ECHO_C" >&6; }
+          # Check whether --enable-ipv6 was given.
+if test "${enable_ipv6+set}" = set; then
+  enableval=$enable_ipv6;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ipv6='wxUSE_IPV6=yes'
+                          else
+                            wx_cv_use_ipv6='wxUSE_IPV6=no'
+                          fi
+
+else
+
+                          wx_cv_use_ipv6='wxUSE_IPV6=${'DEFAULT_wxUSE_IPV6":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ipv6"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_IPV6 = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_IPV6
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -6505,27 +6020,15 @@ if test "${enable_ole+set}" = set; then
                           else
                             wx_cv_use_ole='wxUSE_OLE=no'
                           fi
                           else
                             wx_cv_use_ole='wxUSE_OLE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ole"
                           wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ole"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_OLE=$wxUSE_OLE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_OLE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_OLE = yes; then
@@ -6561,27 +6064,15 @@ if test "${enable_dataobj+set}" = set; then
                           else
                             wx_cv_use_dataobj='wxUSE_DATAOBJ=no'
                           fi
                           else
                             wx_cv_use_dataobj='wxUSE_DATAOBJ=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dataobj"
                           wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dataobj"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DATAOBJ=$wxUSE_DATAOBJ" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DATAOBJ = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DATAOBJ = yes; then
@@ -6618,27 +6109,15 @@ if test "${enable_ipc+set}" = set; then
                           else
                             wx_cv_use_ipc='wxUSE_IPC=no'
                           fi
                           else
                             wx_cv_use_ipc='wxUSE_IPC=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ipc"
                           wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ipc"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_IPC=$wxUSE_IPC" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_IPC = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_IPC = yes; then
@@ -6675,27 +6154,15 @@ if test "${enable_baseevtloop+set}" = set; then
                           else
                             wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no'
                           fi
                           else
                             wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_baseevtloop"
                           wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_baseevtloop"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CONSOLE_EVENTLOOP=$wxUSE_CONSOLE_EVENTLOOP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CONSOLE_EVENTLOOP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CONSOLE_EVENTLOOP = yes; then
@@ -6731,27 +6198,15 @@ if test "${enable_epollloop+set}" = set; then
                           else
                             wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no'
                           fi
                           else
                             wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_epollloop"
                           wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_epollloop"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_EPOLL_DISPATCHER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_EPOLL_DISPATCHER = yes; then
@@ -6787,27 +6242,15 @@ if test "${enable_selectloop+set}" = set; then
                           else
                             wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no'
                           fi
                           else
                             wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_selectloop"
                           wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_selectloop"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SELECT_DISPATCHER=$wxUSE_SELECT_DISPATCHER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SELECT_DISPATCHER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SELECT_DISPATCHER = yes; then
@@ -6844,27 +6287,15 @@ if test "${enable_apple_ieee+set}" = set; then
                           else
                             wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
                           fi
                           else
                             wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_apple_ieee"
                           wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_apple_ieee"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_APPLE_IEEE=$wxUSE_APPLE_IEEE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_APPLE_IEEE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_APPLE_IEEE = yes; then
@@ -6900,27 +6331,15 @@ if test "${enable_arcstream+set}" = set; then
                           else
                             wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'
                           fi
                           else
                             wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_arcstream"
                           wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_arcstream"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ARCHIVE_STREAMS=$wxUSE_ARCHIVE_STREAMS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ARCHIVE_STREAMS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ARCHIVE_STREAMS = yes; then
@@ -6956,27 +6375,15 @@ if test "${enable_base64+set}" = set; then
                           else
                             wx_cv_use_base64='wxUSE_BASE64=no'
                           fi
                           else
                             wx_cv_use_base64='wxUSE_BASE64=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_base64"
                           wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_base64"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_BASE64=$wxUSE_BASE64" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_BASE64 = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_BASE64 = yes; then
@@ -7012,27 +6419,15 @@ if test "${enable_backtrace+set}" = set; then
                           else
                             wx_cv_use_backtrace='wxUSE_STACKWALKER=no'
                           fi
                           else
                             wx_cv_use_backtrace='wxUSE_STACKWALKER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_backtrace"
                           wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_backtrace"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STACKWALKER=$wxUSE_STACKWALKER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STACKWALKER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STACKWALKER = yes; then
@@ -7068,27 +6463,15 @@ if test "${enable_catch_segvs+set}" = set; then
                           else
                             wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
                           fi
                           else
                             wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_catch_segvs"
                           wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_catch_segvs"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ON_FATAL_EXCEPTION=$wxUSE_ON_FATAL_EXCEPTION" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ON_FATAL_EXCEPTION = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ON_FATAL_EXCEPTION = yes; then
@@ -7124,27 +6507,15 @@ if test "${enable_cmdline+set}" = set; then
                           else
                             wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
                           fi
                           else
                             wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_cmdline"
                           wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_cmdline"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CMDLINE_PARSER=$wxUSE_CMDLINE_PARSER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CMDLINE_PARSER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CMDLINE_PARSER = yes; then
@@ -7180,27 +6551,15 @@ if test "${enable_datetime+set}" = set; then
                           else
                             wx_cv_use_datetime='wxUSE_DATETIME=no'
                           fi
                           else
                             wx_cv_use_datetime='wxUSE_DATETIME=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_datetime"
                           wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_datetime"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DATETIME=$wxUSE_DATETIME" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DATETIME = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DATETIME = yes; then
@@ -7236,27 +6595,15 @@ if test "${enable_debugreport+set}" = set; then
                           else
                             wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no'
                           fi
                           else
                             wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debugreport"
                           wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_debugreport"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DEBUGREPORT=$wxUSE_DEBUGREPORT" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUGREPORT = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DEBUGREPORT = yes; then
@@ -7292,27 +6639,15 @@ if test "${enable_dialupman+set}" = set; then
                           else
                             wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
                           fi
                           else
                             wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dialupman"
                           wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dialupman"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DIALUP_MANAGER=$wxUSE_DIALUP_MANAGER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DIALUP_MANAGER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DIALUP_MANAGER = yes; then
@@ -7348,27 +6683,15 @@ if test "${enable_dynlib+set}" = set; then
                           else
                             wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
                           fi
                           else
                             wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dynlib"
                           wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dynlib"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DYNLIB_CLASS=$wxUSE_DYNLIB_CLASS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DYNLIB_CLASS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DYNLIB_CLASS = yes; then
@@ -7404,27 +6727,15 @@ if test "${enable_dynamicloader+set}" = set; then
                           else
                             wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
                           fi
                           else
                             wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dynamicloader"
                           wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dynamicloader"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DYNAMIC_LOADER=$wxUSE_DYNAMIC_LOADER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DYNAMIC_LOADER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DYNAMIC_LOADER = yes; then
@@ -7460,27 +6771,15 @@ if test "${enable_exceptions+set}" = set; then
                           else
                             wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
                           fi
                           else
                             wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_exceptions"
                           wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_exceptions"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_EXCEPTIONS=$wxUSE_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_EXCEPTIONS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_EXCEPTIONS = yes; then
@@ -7516,27 +6815,15 @@ if test "${enable_ffile+set}" = set; then
                           else
                             wx_cv_use_ffile='wxUSE_FFILE=no'
                           fi
                           else
                             wx_cv_use_ffile='wxUSE_FFILE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ffile"
                           wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ffile"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FFILE=$wxUSE_FFILE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FFILE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FFILE = yes; then
@@ -7572,27 +6859,15 @@ if test "${enable_file+set}" = set; then
                           else
                             wx_cv_use_file='wxUSE_FILE=no'
                           fi
                           else
                             wx_cv_use_file='wxUSE_FILE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_file"
                           wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_file"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FILE=$wxUSE_FILE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FILE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FILE = yes; then
@@ -7628,27 +6903,15 @@ if test "${enable_filesystem+set}" = set; then
                           else
                             wx_cv_use_filesystem='wxUSE_FILESYSTEM=no'
                           fi
                           else
                             wx_cv_use_filesystem='wxUSE_FILESYSTEM=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filesystem"
                           wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filesystem"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FILESYSTEM=$wxUSE_FILESYSTEM" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FILESYSTEM = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FILESYSTEM = yes; then
@@ -7684,27 +6947,15 @@ if test "${enable_fontenum+set}" = set; then
                           else
                             wx_cv_use_fontenum='wxUSE_FONTENUM=no'
                           fi
                           else
                             wx_cv_use_fontenum='wxUSE_FONTENUM=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontenum"
                           wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontenum"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FONTENUM=$wxUSE_FONTENUM" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FONTENUM = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FONTENUM = yes; then
@@ -7740,27 +6991,15 @@ if test "${enable_fontmap+set}" = set; then
                           else
                             wx_cv_use_fontmap='wxUSE_FONTMAP=no'
                           fi
                           else
                             wx_cv_use_fontmap='wxUSE_FONTMAP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontmap"
                           wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontmap"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FONTMAP=$wxUSE_FONTMAP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FONTMAP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FONTMAP = yes; then
@@ -7796,27 +7035,15 @@ if test "${enable_fs_archive+set}" = set; then
                           else
                             wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no'
                           fi
                           else
                             wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_archive"
                           wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_archive"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FS_ARCHIVE=$wxUSE_FS_ARCHIVE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FS_ARCHIVE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FS_ARCHIVE = yes; then
@@ -7852,27 +7079,15 @@ if test "${enable_fs_inet+set}" = set; then
                           else
                             wx_cv_use_fs_inet='wxUSE_FS_INET=no'
                           fi
                           else
                             wx_cv_use_fs_inet='wxUSE_FS_INET=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_inet"
                           wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_inet"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FS_INET=$wxUSE_FS_INET" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FS_INET = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FS_INET = yes; then
@@ -7908,27 +7123,15 @@ if test "${enable_fs_zip+set}" = set; then
                           else
                             wx_cv_use_fs_zip='wxUSE_FS_ZIP=no'
                           fi
                           else
                             wx_cv_use_fs_zip='wxUSE_FS_ZIP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_zip"
                           wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fs_zip"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FS_ZIP=$wxUSE_FS_ZIP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FS_ZIP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FS_ZIP = yes; then
@@ -7964,27 +7167,15 @@ if test "${enable_geometry+set}" = set; then
                           else
                             wx_cv_use_geometry='wxUSE_GEOMETRY=no'
                           fi
                           else
                             wx_cv_use_geometry='wxUSE_GEOMETRY=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_geometry"
                           wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_geometry"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_GEOMETRY=$wxUSE_GEOMETRY" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GEOMETRY = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GEOMETRY = yes; then
@@ -8020,27 +7211,15 @@ if test "${enable_log+set}" = set; then
                           else
                             wx_cv_use_log='wxUSE_LOG=no'
                           fi
                           else
                             wx_cv_use_log='wxUSE_LOG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_log"
                           wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_log"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LOG=$wxUSE_LOG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LOG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LOG = yes; then
@@ -8076,27 +7255,15 @@ if test "${enable_longlong+set}" = set; then
                           else
                             wx_cv_use_longlong='wxUSE_LONGLONG=no'
                           fi
                           else
                             wx_cv_use_longlong='wxUSE_LONGLONG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_longlong"
                           wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_longlong"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LONGLONG=$wxUSE_LONGLONG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LONGLONG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LONGLONG = yes; then
@@ -8132,27 +7299,15 @@ if test "${enable_mimetype+set}" = set; then
                           else
                             wx_cv_use_mimetype='wxUSE_MIMETYPE=no'
                           fi
                           else
                             wx_cv_use_mimetype='wxUSE_MIMETYPE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mimetype"
                           wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mimetype"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MIMETYPE=$wxUSE_MIMETYPE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MIMETYPE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MIMETYPE = yes; then
@@ -8168,6 +7323,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; }
+          # Check whether --enable-printfposparam was given.
+if test "${enable_printfposparam+set}" = set; then
+  enableval=$enable_printfposparam;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
+                          else
+                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
+                          fi
+
+else
+
+                          wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_printfposparam"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PRINTF_POS_PARAMS = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_PRINTF_POS_PARAMS
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -8188,27 +7387,15 @@ if test "${enable_snglinst+set}" = set; then
                           else
                             wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
                           fi
                           else
                             wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_snglinst"
                           wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_snglinst"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SNGLINST_CHECKER=$wxUSE_SNGLINST_CHECKER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SNGLINST_CHECKER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SNGLINST_CHECKER = yes; then
@@ -8224,6 +7411,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; }
+          # Check whether --enable-sound was given.
+if test "${enable_sound+set}" = set; then
+  enableval=$enable_sound;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_sound='wxUSE_SOUND=yes'
+                          else
+                            wx_cv_use_sound='wxUSE_SOUND=no'
+                          fi
+
+else
+
+                          wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_sound"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SOUND = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_SOUND
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -8244,27 +7475,15 @@ if test "${enable_stdpaths+set}" = set; then
                           else
                             wx_cv_use_stdpaths='wxUSE_STDPATHS=no'
                           fi
                           else
                             wx_cv_use_stdpaths='wxUSE_STDPATHS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stdpaths"
                           wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stdpaths"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STDPATHS=$wxUSE_STDPATHS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STDPATHS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STDPATHS = yes; then
@@ -8300,27 +7519,15 @@ if test "${enable_stopwatch+set}" = set; then
                           else
                             wx_cv_use_stopwatch='wxUSE_STOPWATCH=no'
                           fi
                           else
                             wx_cv_use_stopwatch='wxUSE_STOPWATCH=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stopwatch"
                           wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stopwatch"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STOPWATCH=$wxUSE_STOPWATCH" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STOPWATCH = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STOPWATCH = yes; then
@@ -8356,27 +7563,15 @@ if test "${enable_streams+set}" = set; then
                           else
                             wx_cv_use_streams='wxUSE_STREAMS=no'
                           fi
                           else
                             wx_cv_use_streams='wxUSE_STREAMS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_streams"
                           wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_streams"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STREAMS=$wxUSE_STREAMS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STREAMS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STREAMS = yes; then
@@ -8412,27 +7607,15 @@ if test "${enable_system_options+set}" = set; then
                           else
                             wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
                           fi
                           else
                             wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_system_options"
                           wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_system_options"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SYSTEM_OPTIONS=$wxUSE_SYSTEM_OPTIONS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SYSTEM_OPTIONS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SYSTEM_OPTIONS = yes; then
@@ -8468,27 +7651,15 @@ if test "${enable_tarstream+set}" = set; then
                           else
                             wx_cv_use_tarstream='wxUSE_TARSTREAM=no'
                           fi
                           else
                             wx_cv_use_tarstream='wxUSE_TARSTREAM=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tarstream"
                           wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tarstream"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TARSTREAM=$wxUSE_TARSTREAM" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TARSTREAM = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TARSTREAM = yes; then
@@ -8524,27 +7695,15 @@ if test "${enable_textbuf+set}" = set; then
                           else
                             wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
                           fi
                           else
                             wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textbuf"
                           wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textbuf"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TEXTBUFFER=$wxUSE_TEXTBUFFER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TEXTBUFFER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TEXTBUFFER = yes; then
@@ -8580,27 +7739,15 @@ if test "${enable_textfile+set}" = set; then
                           else
                             wx_cv_use_textfile='wxUSE_TEXTFILE=no'
                           fi
                           else
                             wx_cv_use_textfile='wxUSE_TEXTFILE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textfile"
                           wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textfile"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TEXTFILE=$wxUSE_TEXTFILE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TEXTFILE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TEXTFILE = yes; then
@@ -8636,27 +7783,15 @@ if test "${enable_timer+set}" = set; then
                           else
                             wx_cv_use_timer='wxUSE_TIMER=no'
                           fi
                           else
                             wx_cv_use_timer='wxUSE_TIMER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_timer"
                           wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_timer"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TIMER=$wxUSE_TIMER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TIMER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TIMER = yes; then
@@ -8682,214 +7817,34 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; }
-          # Check whether --enable-sound was given.
-if test "${enable_sound+set}" = set; then
-  enableval=$enable_sound;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_sound='wxUSE_SOUND=yes'
-                          else
-                            wx_cv_use_sound='wxUSE_SOUND=no'
-                          fi
-                          cache=yes
-
-else
-
-                          LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_sound"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SOUND=$wxUSE_SOUND" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SOUND = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_SOUND
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; }
-          # Check whether --enable-mediactrl was given.
-if test "${enable_mediactrl+set}" = set; then
-  enableval=$enable_mediactrl;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
-                          else
-                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
-                          fi
-                          cache=yes
-
-else
-
-                          LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_mediactrl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MEDIACTRL=$wxUSE_MEDIACTRL" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MEDIACTRL = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_MEDIACTRL
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; }
-          # Check whether --enable-gstreamer8 was given.
-if test "${enable_gstreamer8+set}" = set; then
-  enableval=$enable_gstreamer8;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
-                          else
-                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
-                          fi
-                          cache=yes
-
-else
-
-                          LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_gstreamer8"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_GSTREAMER8=$wxUSE_GSTREAMER8" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GSTREAMER8 = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_GSTREAMER8
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; }
-          # Check whether --enable-printfposparam was given.
-if test "${enable_printfposparam+set}" = set; then
-  enableval=$enable_printfposparam;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; }
+          # Check whether --enable-variant was given.
+if test "${enable_variant+set}" = set; then
+  enableval=$enable_variant;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
+                            wx_cv_use_variant='wxUSE_VARIANT=yes'
                           else
                           else
-                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
+                            wx_cv_use_variant='wxUSE_VARIANT=no'
                           fi
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
+                          wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_printfposparam"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PRINTF_POS_PARAMS=$wxUSE_PRINTF_POS_PARAMS" >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_variant"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PRINTF_POS_PARAMS = yes; then
+            if test $wxUSE_VARIANT = yes; then
               result=no
             else
               result=yes
             fi
           else
               result=no
             else
               result=yes
             fi
           else
-            result=$wxUSE_PRINTF_POS_PARAMS
+            result=$wxUSE_VARIANT
           fi
 
           { echo "$as_me:$LINENO: result: $result" >&5
           fi
 
           { echo "$as_me:$LINENO: result: $result" >&5
@@ -8916,27 +7871,15 @@ if test "${enable_zipstream+set}" = set; then
                           else
                             wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
                           fi
                           else
                             wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_zipstream"
                           wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_zipstream"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ZIPSTREAM=$wxUSE_ZIPSTREAM" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ZIPSTREAM = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ZIPSTREAM = yes; then
@@ -8973,27 +7916,15 @@ if test "${enable_url+set}" = set; then
                           else
                             wx_cv_use_url='wxUSE_URL=no'
                           fi
                           else
                             wx_cv_use_url='wxUSE_URL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_url"
                           wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_url"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_URL=$wxUSE_URL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_URL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_URL = yes; then
@@ -9009,62 +7940,6 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; }
-          # Check whether --enable-variant was given.
-if test "${enable_variant+set}" = set; then
-  enableval=$enable_variant;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_variant='wxUSE_VARIANT=yes'
-                          else
-                            wx_cv_use_variant='wxUSE_VARIANT=no'
-                          fi
-                          cache=yes
-
-else
-
-                          LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_variant"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_VARIANT=$wxUSE_VARIANT" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_VARIANT = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_VARIANT
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -9085,27 +7960,15 @@ if test "${enable_protocol+set}" = set; then
                           else
                             wx_cv_use_protocol='wxUSE_PROTOCOL=no'
                           fi
                           else
                             wx_cv_use_protocol='wxUSE_PROTOCOL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocol"
                           wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocol"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL = yes; then
@@ -9141,27 +8004,15 @@ if test "${enable_protocol_http+set}" = set; then
                           else
                             wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
                           else
                             wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocol_http"
                           wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocol_http"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_HTTP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_HTTP = yes; then
@@ -9197,27 +8048,15 @@ if test "${enable_protocol_ftp+set}" = set; then
                           else
                             wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
                           else
                             wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocol_ftp"
                           wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocol_ftp"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_FTP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_FTP = yes; then
@@ -9253,27 +8092,15 @@ if test "${enable_protocol_file+set}" = set; then
                           else
                             wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
                           fi
                           else
                             wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocol_file"
                           wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_protocol_file"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_FILE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROTOCOL_FILE = yes; then
@@ -9310,27 +8137,15 @@ if test "${enable_threads+set}" = set; then
                           else
                             wx_cv_use_threads='wxUSE_THREADS=no'
                           fi
                           else
                             wx_cv_use_threads='wxUSE_THREADS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_threads"
                           wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_threads"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_THREADS=$wxUSE_THREADS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_THREADS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_THREADS = yes; then
@@ -9367,27 +8182,15 @@ if test "${enable_iniconf+set}" = set; then
                           else
                             wx_cv_use_iniconf='wxUSE_INICONF=no'
                           fi
                           else
                             wx_cv_use_iniconf='wxUSE_INICONF=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_iniconf"
                           wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_iniconf"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_INICONF = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_INICONF = yes; then
@@ -9423,27 +8226,15 @@ if test "${enable_regkey+set}" = set; then
                           else
                             wx_cv_use_regkey='wxUSE_REGKEY=no'
                           fi
                           else
                             wx_cv_use_regkey='wxUSE_REGKEY=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_regkey"
                           wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_regkey"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_REGKEY = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_REGKEY = yes; then
@@ -9483,27 +8274,15 @@ if test "${enable_docview+set}" = set; then
                           else
                             wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
                           fi
                           else
                             wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_docview"
                           wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_docview"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DOC_VIEW_ARCHITECTURE=$wxUSE_DOC_VIEW_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then
@@ -9539,27 +8318,15 @@ if test "${enable_help+set}" = set; then
                           else
                             wx_cv_use_help='wxUSE_HELP=no'
                           fi
                           else
                             wx_cv_use_help='wxUSE_HELP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_help"
                           wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_help"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_HELP=$wxUSE_HELP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_HELP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_HELP = yes; then
@@ -9595,27 +8362,15 @@ if test "${enable_mshtmlhelp+set}" = set; then
                           else
                             wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
                           fi
                           else
                             wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mshtmlhelp"
                           wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mshtmlhelp"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MS_HTML_HELP=$wxUSE_MS_HTML_HELP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MS_HTML_HELP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MS_HTML_HELP = yes; then
@@ -9651,27 +8406,15 @@ if test "${enable_html+set}" = set; then
                           else
                             wx_cv_use_html='wxUSE_HTML=no'
                           fi
                           else
                             wx_cv_use_html='wxUSE_HTML=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_html"
                           wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_html"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_HTML=$wxUSE_HTML" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_HTML = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_HTML = yes; then
@@ -9707,27 +8450,15 @@ if test "${enable_htmlhelp+set}" = set; then
                           else
                             wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
                           fi
                           else
                             wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_htmlhelp"
                           wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_htmlhelp"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_WXHTML_HELP=$wxUSE_WXHTML_HELP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_WXHTML_HELP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_WXHTML_HELP = yes; then
@@ -9763,27 +8494,15 @@ if test "${enable_xrc+set}" = set; then
                           else
                             wx_cv_use_xrc='wxUSE_XRC=no'
                           fi
                           else
                             wx_cv_use_xrc='wxUSE_XRC=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_xrc"
                           wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_xrc"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_XRC=$wxUSE_XRC" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_XRC = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_XRC = yes; then
@@ -9819,27 +8538,15 @@ if test "${enable_aui+set}" = set; then
                           else
                             wx_cv_use_aui='wxUSE_AUI=no'
                           fi
                           else
                             wx_cv_use_aui='wxUSE_AUI=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_aui"
                           wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_aui"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_AUI=$wxUSE_AUI" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_AUI = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_AUI = yes; then
@@ -9865,46 +8572,34 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stc" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; }
-          # Check whether --enable-stc was given.
-if test "${enable_stc+set}" = set; then
-  enableval=$enable_stc;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-propgrid" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-propgrid... $ECHO_C" >&6; }
+          # Check whether --enable-propgrid was given.
+if test "${enable_propgrid+set}" = set; then
+  enableval=$enable_propgrid;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_stc='wxUSE_STC=yes'
+                            wx_cv_use_propgrid='wxUSE_PROPGRID=yes'
                           else
                           else
-                            wx_cv_use_stc='wxUSE_STC=no'
+                            wx_cv_use_propgrid='wxUSE_PROPGRID=no'
                           fi
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
+                          wx_cv_use_propgrid='wxUSE_PROPGRID=${'DEFAULT_wxUSE_PROPGRID":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_stc"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STC=$wxUSE_STC" >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_propgrid"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STC = yes; then
+            if test $wxUSE_PROPGRID = yes; then
               result=no
             else
               result=yes
             fi
           else
               result=no
             else
               result=yes
             fi
           else
-            result=$wxUSE_STC
+            result=$wxUSE_PROPGRID
           fi
 
           { echo "$as_me:$LINENO: result: $result" >&5
           fi
 
           { echo "$as_me:$LINENO: result: $result" >&5
@@ -9921,158 +8616,34 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6; }
-          # Check whether --enable-constraints was given.
-if test "${enable_constraints+set}" = set; then
-  enableval=$enable_constraints;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
-                          else
-                            wx_cv_use_constraints='wxUSE_CONSTRAINTS=no'
-                          fi
-                          cache=yes
-
-else
-
-                          LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_constraints"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CONSTRAINTS=$wxUSE_CONSTRAINTS" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CONSTRAINTS = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_CONSTRAINTS
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; }
-          # Check whether --enable-printarch was given.
-if test "${enable_printarch+set}" = set; then
-  enableval=$enable_printarch;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
-                          else
-                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
-                          fi
-                          cache=yes
-
-else
-
-                          LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_printarch"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PRINTING_ARCHITECTURE=$wxUSE_PRINTING_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PRINTING_ARCHITECTURE = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_PRINTING_ARCHITECTURE
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; }
-          # Check whether --enable-mdi was given.
-if test "${enable_mdi+set}" = set; then
-  enableval=$enable_mdi;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stc" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; }
+          # Check whether --enable-stc was given.
+if test "${enable_stc+set}" = set; then
+  enableval=$enable_stc;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_mdi='wxUSE_MDI=yes'
+                            wx_cv_use_stc='wxUSE_STC=yes'
                           else
                           else
-                            wx_cv_use_mdi='wxUSE_MDI=no'
+                            wx_cv_use_stc='wxUSE_STC=no'
                           fi
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
+                          wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_mdi"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MDI=$wxUSE_MDI" >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_stc"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MDI = yes; then
+            if test $wxUSE_STC = yes; then
               result=no
             else
               result=yes
             fi
           else
               result=no
             else
               result=yes
             fi
           else
-            result=$wxUSE_MDI
+            result=$wxUSE_STC
           fi
 
           { echo "$as_me:$LINENO: result: $result" >&5
           fi
 
           { echo "$as_me:$LINENO: result: $result" >&5
@@ -10089,46 +8660,34 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
               fi
           fi
 
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; }
-          # Check whether --enable-mdidoc was given.
-if test "${enable_mdidoc+set}" = set; then
-  enableval=$enable_mdidoc;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6; }
+          # Check whether --enable-constraints was given.
+if test "${enable_constraints+set}" = set; then
+  enableval=$enable_constraints;
                           if test "$enableval" = yes; then
                           if test "$enableval" = yes; then
-                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
+                            wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
                           else
                           else
-                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
+                            wx_cv_use_constraints='wxUSE_CONSTRAINTS=no'
                           fi
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
-                          wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
+                          wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
 
 fi
 
 
 
 fi
 
 
-          eval "$wx_cv_use_mdidoc"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MDI_ARCHITECTURE=$wxUSE_MDI_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp
-          fi
+          eval "$wx_cv_use_constraints"
 
           if test x"$enablestring" = xdisable; then
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MDI_ARCHITECTURE = yes; then
+            if test $wxUSE_CONSTRAINTS = yes; then
               result=no
             else
               result=yes
             fi
           else
               result=no
             else
               result=yes
             fi
           else
-            result=$wxUSE_MDI_ARCHITECTURE
+            result=$wxUSE_CONSTRAINTS
           fi
 
           { echo "$as_me:$LINENO: result: $result" >&5
           fi
 
           { echo "$as_me:$LINENO: result: $result" >&5
@@ -10155,27 +8714,15 @@ if test "${enable_loggui+set}" = set; then
                           else
                             wx_cv_use_loggui='wxUSE_LOGGUI=no'
                           fi
                           else
                             wx_cv_use_loggui='wxUSE_LOGGUI=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_loggui"
                           wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_loggui"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LOGGUI=$wxUSE_LOGGUI" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LOGGUI = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LOGGUI = yes; then
@@ -10211,27 +8758,15 @@ if test "${enable_logwin+set}" = set; then
                           else
                             wx_cv_use_logwin='wxUSE_LOGWINDOW=no'
                           fi
                           else
                             wx_cv_use_logwin='wxUSE_LOGWINDOW=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_logwin"
                           wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_logwin"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LOGWINDOW=$wxUSE_LOGWINDOW" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LOGWINDOW = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LOGWINDOW = yes; then
@@ -10267,27 +8802,15 @@ if test "${enable_logdialog+set}" = set; then
                           else
                             wx_cv_use_logdialog='wxUSE_LOGDIALOG=no'
                           fi
                           else
                             wx_cv_use_logdialog='wxUSE_LOGDIALOG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_logdialog"
                           wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_logdialog"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LOGDIALOG=$wxUSE_LOGDIALOG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LOGDIALOG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LOGDIALOG = yes; then
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; }
+          # Check whether --enable-mdi was given.
+if test "${enable_mdi+set}" = set; then
+  enableval=$enable_mdi;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_mdi='wxUSE_MDI=yes'
+                          else
+                            wx_cv_use_mdi='wxUSE_MDI=no'
+                          fi
+
+else
+
+                          wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_mdi"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MDI = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_MDI
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; }
+          # Check whether --enable-mdidoc was given.
+if test "${enable_mdidoc+set}" = set; then
+  enableval=$enable_mdidoc;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
+                          else
+                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
+                          fi
+
+else
+
+                          wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_mdidoc"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MDI_ARCHITECTURE = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_MDI_ARCHITECTURE
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; }
+          # Check whether --enable-mediactrl was given.
+if test "${enable_mediactrl+set}" = set; then
+  enableval=$enable_mediactrl;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
+                          else
+                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
+                          fi
+
+else
+
+                          wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_mediactrl"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MEDIACTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_MEDIACTRL
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; }
+          # Check whether --enable-gstreamer8 was given.
+if test "${enable_gstreamer8+set}" = set; then
+  enableval=$enable_gstreamer8;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
+                          else
+                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
+                          fi
+
+else
+
+                          wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_gstreamer8"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_GSTREAMER8 = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_GSTREAMER8
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -10323,27 +9022,15 @@ if test "${enable_webkit+set}" = set; then
                           else
                             wx_cv_use_webkit='wxUSE_WEBKIT=no'
                           fi
                           else
                             wx_cv_use_webkit='wxUSE_WEBKIT=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_webkit"
                           wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_webkit"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_WEBKIT=$wxUSE_WEBKIT" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_WEBKIT = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_WEBKIT = yes; then
@@ -10379,27 +9066,15 @@ if test "${enable_richtext+set}" = set; then
                           else
                             wx_cv_use_richtext='wxUSE_RICHTEXT=no'
                           fi
                           else
                             wx_cv_use_richtext='wxUSE_RICHTEXT=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_richtext"
                           wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_richtext"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_RICHTEXT=$wxUSE_RICHTEXT" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_RICHTEXT = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_RICHTEXT = yes; then
@@ -10435,27 +9110,15 @@ if test "${enable_graphics_ctx+set}" = set; then
                           else
                             wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
                           fi
                           else
                             wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_graphics_ctx"
                           wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_graphics_ctx"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_GRAPHICS_CONTEXT=$wxUSE_GRAPHICS_CONTEXT" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GRAPHICS_CONTEXT = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GRAPHICS_CONTEXT = yes; then
@@ -10491,27 +9154,15 @@ if test "${enable_postscript+set}" = set; then
                           else
                             wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                           fi
                           else
                             wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_postscript"
                           wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_postscript"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_POSTSCRIPT=$wxUSE_POSTSCRIPT" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_POSTSCRIPT = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_POSTSCRIPT = yes; then
@@ -10527,6 +9178,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; }
+          # Check whether --enable-printarch was given.
+if test "${enable_printarch+set}" = set; then
+  enableval=$enable_printarch;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+                          else
+                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+                          fi
+
+else
+
+                          wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_printarch"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PRINTING_ARCHITECTURE = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_PRINTING_ARCHITECTURE
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -10547,27 +9242,15 @@ if test "${enable_svg+set}" = set; then
                           else
                             wx_cv_use_svg='wxUSE_SVG=no'
                           fi
                           else
                             wx_cv_use_svg='wxUSE_SVG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_svg"
                           wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_svg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SVG=$wxUSE_SVG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SVG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SVG = yes; then
@@ -10605,27 +9288,15 @@ if test "${enable_clipboard+set}" = set; then
                           else
                             wx_cv_use_clipboard='wxUSE_CLIPBOARD=no'
                           fi
                           else
                             wx_cv_use_clipboard='wxUSE_CLIPBOARD=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_clipboard"
                           wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_clipboard"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CLIPBOARD=$wxUSE_CLIPBOARD" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CLIPBOARD = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CLIPBOARD = yes; then
@@ -10661,27 +9332,15 @@ if test "${enable_dnd+set}" = set; then
                           else
                             wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
                           fi
                           else
                             wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dnd"
                           wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dnd"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DRAG_AND_DROP=$wxUSE_DRAG_AND_DROP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DRAG_AND_DROP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DRAG_AND_DROP = yes; then
@@ -10717,27 +9376,15 @@ if test "${enable_metafile+set}" = set; then
                           else
                             wx_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
                           else
                             wx_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_metafile"
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_metafile"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_METAFILE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_METAFILE = yes; then
@@ -10776,27 +9423,15 @@ if test "${enable_controls+set}" = set; then
                           else
                             wx_cv_use_controls='wxUSE_CONTROLS=no'
                           fi
                           else
                             wx_cv_use_controls='wxUSE_CONTROLS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_controls"
                           wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_controls"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CONTROLS=$wxUSE_CONTROLS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CONTROLS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CONTROLS = yes; then
@@ -10837,7 +9472,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
   DEFAULT_wxUSE_HYPERLINKCTRL=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
   DEFAULT_wxUSE_HYPERLINKCTRL=yes
-  DEFAULT_wxUSE_DATAVIEWCTRL=no
+  DEFAULT_wxUSE_DATAVIEWCTRL=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOOK=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOOK=yes
   DEFAULT_wxUSE_LISTBOX=yes
@@ -10943,27 +9578,15 @@ if test "${enable_accel+set}" = set; then
                           else
                             wx_cv_use_accel='wxUSE_ACCEL=no'
                           fi
                           else
                             wx_cv_use_accel='wxUSE_ACCEL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_accel"
                           wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_accel"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ACCEL=$wxUSE_ACCEL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ACCEL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ACCEL = yes; then
@@ -10999,27 +9622,15 @@ if test "${enable_animatectrl+set}" = set; then
                           else
                             wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no'
                           fi
                           else
                             wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_animatectrl"
                           wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_animatectrl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ANIMATIONCTRL=$wxUSE_ANIMATIONCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ANIMATIONCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ANIMATIONCTRL = yes; then
@@ -11055,27 +9666,15 @@ if test "${enable_button+set}" = set; then
                           else
                             wx_cv_use_button='wxUSE_BUTTON=no'
                           fi
                           else
                             wx_cv_use_button='wxUSE_BUTTON=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_button"
                           wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_button"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_BUTTON=$wxUSE_BUTTON" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_BUTTON = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_BUTTON = yes; then
@@ -11111,27 +9710,15 @@ if test "${enable_bmpbutton+set}" = set; then
                           else
                             wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
                           fi
                           else
                             wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_bmpbutton"
                           wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_bmpbutton"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_BMPBUTTON=$wxUSE_BMPBUTTON" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_BMPBUTTON = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_BMPBUTTON = yes; then
@@ -11167,27 +9754,15 @@ if test "${enable_bmpcombobox+set}" = set; then
                           else
                             wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
                           fi
                           else
                             wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_bmpcombobox"
                           wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_bmpcombobox"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_BITMAPCOMBOBOX=$wxUSE_BITMAPCOMBOBOX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_BITMAPCOMBOBOX = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_BITMAPCOMBOBOX = yes; then
@@ -11223,27 +9798,15 @@ if test "${enable_calendar+set}" = set; then
                           else
                             wx_cv_use_calendar='wxUSE_CALCTRL=no'
                           fi
                           else
                             wx_cv_use_calendar='wxUSE_CALCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_calendar"
                           wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_calendar"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CALCTRL=$wxUSE_CALCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CALCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CALCTRL = yes; then
@@ -11279,27 +9842,15 @@ if test "${enable_caret+set}" = set; then
                           else
                             wx_cv_use_caret='wxUSE_CARET=no'
                           fi
                           else
                             wx_cv_use_caret='wxUSE_CARET=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_caret"
                           wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_caret"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CARET=$wxUSE_CARET" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CARET = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CARET = yes; then
@@ -11335,27 +9886,15 @@ if test "${enable_checkbox+set}" = set; then
                           else
                             wx_cv_use_checkbox='wxUSE_CHECKBOX=no'
                           fi
                           else
                             wx_cv_use_checkbox='wxUSE_CHECKBOX=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_checkbox"
                           wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_checkbox"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CHECKBOX=$wxUSE_CHECKBOX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CHECKBOX = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CHECKBOX = yes; then
@@ -11391,27 +9930,15 @@ if test "${enable_checklst+set}" = set; then
                           else
                             wx_cv_use_checklst='wxUSE_CHECKLST=no'
                           fi
                           else
                             wx_cv_use_checklst='wxUSE_CHECKLST=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_checklst"
                           wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_checklst"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CHECKLST=$wxUSE_CHECKLST" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CHECKLST = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CHECKLST = yes; then
@@ -11447,27 +9974,15 @@ if test "${enable_choice+set}" = set; then
                           else
                             wx_cv_use_choice='wxUSE_CHOICE=no'
                           fi
                           else
                             wx_cv_use_choice='wxUSE_CHOICE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choice"
                           wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choice"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CHOICE=$wxUSE_CHOICE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CHOICE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CHOICE = yes; then
@@ -11503,27 +10018,15 @@ if test "${enable_choicebook+set}" = set; then
                           else
                             wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
                           fi
                           else
                             wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choicebook"
                           wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choicebook"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CHOICEBOOK=$wxUSE_CHOICEBOOK" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CHOICEBOOK = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CHOICEBOOK = yes; then
@@ -11559,27 +10062,15 @@ if test "${enable_collpane+set}" = set; then
                           else
                             wx_cv_use_collpane='wxUSE_COLLPANE=no'
                           fi
                           else
                             wx_cv_use_collpane='wxUSE_COLLPANE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_collpane"
                           wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_collpane"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_COLLPANE=$wxUSE_COLLPANE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COLLPANE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COLLPANE = yes; then
@@ -11615,27 +10106,15 @@ if test "${enable_colourpicker+set}" = set; then
                           else
                             wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no'
                           fi
                           else
                             wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_colourpicker"
                           wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_colourpicker"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_COLOURPICKERCTRL=$wxUSE_COLOURPICKERCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COLOURPICKERCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COLOURPICKERCTRL = yes; then
@@ -11671,27 +10150,15 @@ if test "${enable_combobox+set}" = set; then
                           else
                             wx_cv_use_combobox='wxUSE_COMBOBOX=no'
                           fi
                           else
                             wx_cv_use_combobox='wxUSE_COMBOBOX=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_combobox"
                           wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_combobox"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_COMBOBOX=$wxUSE_COMBOBOX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COMBOBOX = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COMBOBOX = yes; then
@@ -11727,27 +10194,15 @@ if test "${enable_comboctrl+set}" = set; then
                           else
                             wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no'
                           fi
                           else
                             wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_comboctrl"
                           wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_comboctrl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_COMBOCTRL=$wxUSE_COMBOCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COMBOCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COMBOCTRL = yes; then
@@ -11783,27 +10238,15 @@ if test "${enable_datepick+set}" = set; then
                           else
                             wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no'
                           fi
                           else
                             wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_datepick"
                           wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_datepick"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DATEPICKCTRL=$wxUSE_DATEPICKCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DATEPICKCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DATEPICKCTRL = yes; then
@@ -11839,27 +10282,15 @@ if test "${enable_dirpicker+set}" = set; then
                           else
                             wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
                           fi
                           else
                             wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dirpicker"
                           wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dirpicker"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DIRPICKERCTRL=$wxUSE_DIRPICKERCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DIRPICKERCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DIRPICKERCTRL = yes; then
@@ -11895,27 +10326,15 @@ if test "${enable_display+set}" = set; then
                           else
                             wx_cv_use_display='wxUSE_DISPLAY=no'
                           fi
                           else
                             wx_cv_use_display='wxUSE_DISPLAY=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_display"
                           wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_display"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DISPLAY=$wxUSE_DISPLAY" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DISPLAY = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DISPLAY = yes; then
@@ -11951,27 +10370,15 @@ if test "${enable_detect_sm+set}" = set; then
                           else
                             wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
                           fi
                           else
                             wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_detect_sm"
                           wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_detect_sm"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DETECT_SM=$wxUSE_DETECT_SM" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DETECT_SM = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DETECT_SM = yes; then
@@ -12007,27 +10414,15 @@ if test "${enable_editablebox+set}" = set; then
                           else
                             wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
                           fi
                           else
                             wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_editablebox"
                           wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_editablebox"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_EDITABLELISTBOX=$wxUSE_EDITABLELISTBOX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_EDITABLELISTBOX = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_EDITABLELISTBOX = yes; then
@@ -12063,27 +10458,15 @@ if test "${enable_filepicker+set}" = set; then
                           else
                             wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
                           fi
                           else
                             wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filepicker"
                           wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filepicker"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FILEPICKERCTRL=$wxUSE_FILEPICKERCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FILEPICKERCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FILEPICKERCTRL = yes; then
@@ -12119,27 +10502,15 @@ if test "${enable_filectrl+set}" = set; then
                           else
                             wx_cv_use_filectrl='wxUSE_FILECTRL=no'
                           fi
                           else
                             wx_cv_use_filectrl='wxUSE_FILECTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FILECTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filectrl"
                           wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filectrl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FILECTRL=$wxUSE_FILECTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FILECTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FILECTRL = yes; then
@@ -12175,27 +10546,15 @@ if test "${enable_fontpicker+set}" = set; then
                           else
                             wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no'
                           fi
                           else
                             wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontpicker"
                           wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontpicker"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FONTPICKERCTRL=$wxUSE_FONTPICKERCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FONTPICKERCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FONTPICKERCTRL = yes; then
@@ -12231,27 +10590,15 @@ if test "${enable_gauge+set}" = set; then
                           else
                             wx_cv_use_gauge='wxUSE_GAUGE=no'
                           fi
                           else
                             wx_cv_use_gauge='wxUSE_GAUGE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gauge"
                           wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gauge"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_GAUGE=$wxUSE_GAUGE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GAUGE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GAUGE = yes; then
@@ -12287,27 +10634,15 @@ if test "${enable_grid+set}" = set; then
                           else
                             wx_cv_use_grid='wxUSE_GRID=no'
                           fi
                           else
                             wx_cv_use_grid='wxUSE_GRID=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_grid"
                           wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_grid"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_GRID=$wxUSE_GRID" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GRID = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GRID = yes; then
@@ -12343,27 +10678,15 @@ if test "${enable_dataviewctrl+set}" = set; then
                           else
                             wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
                           fi
                           else
                             wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dataviewctrl"
                           wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dataviewctrl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DATAVIEWCTRL=$wxUSE_DATAVIEWCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DATAVIEWCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DATAVIEWCTRL = yes; then
@@ -12399,27 +10722,15 @@ if test "${enable_hyperlink+set}" = set; then
                           else
                             wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no'
                           fi
                           else
                             wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_hyperlink"
                           wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_hyperlink"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_HYPERLINKCTRL=$wxUSE_HYPERLINKCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_HYPERLINKCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_HYPERLINKCTRL = yes; then
@@ -12455,27 +10766,15 @@ if test "${enable_imaglist+set}" = set; then
                           else
                             wx_cv_use_imaglist='wxUSE_IMAGLIST=no'
                           fi
                           else
                             wx_cv_use_imaglist='wxUSE_IMAGLIST=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_imaglist"
                           wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_imaglist"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_IMAGLIST=$wxUSE_IMAGLIST" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_IMAGLIST = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_IMAGLIST = yes; then
@@ -12511,27 +10810,15 @@ if test "${enable_listbook+set}" = set; then
                           else
                             wx_cv_use_listbook='wxUSE_LISTBOOK=no'
                           fi
                           else
                             wx_cv_use_listbook='wxUSE_LISTBOOK=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listbook"
                           wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listbook"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LISTBOOK=$wxUSE_LISTBOOK" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LISTBOOK = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LISTBOOK = yes; then
@@ -12567,27 +10854,15 @@ if test "${enable_listbox+set}" = set; then
                           else
                             wx_cv_use_listbox='wxUSE_LISTBOX=no'
                           fi
                           else
                             wx_cv_use_listbox='wxUSE_LISTBOX=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listbox"
                           wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listbox"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LISTBOX=$wxUSE_LISTBOX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LISTBOX = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LISTBOX = yes; then
@@ -12623,27 +10898,15 @@ if test "${enable_listctrl+set}" = set; then
                           else
                             wx_cv_use_listctrl='wxUSE_LISTCTRL=no'
                           fi
                           else
                             wx_cv_use_listctrl='wxUSE_LISTCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listctrl"
                           wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_listctrl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_LISTCTRL=$wxUSE_LISTCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LISTCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_LISTCTRL = yes; then
@@ -12679,27 +10942,15 @@ if test "${enable_notebook+set}" = set; then
                           else
                             wx_cv_use_notebook='wxUSE_NOTEBOOK=no'
                           fi
                           else
                             wx_cv_use_notebook='wxUSE_NOTEBOOK=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_notebook"
                           wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_notebook"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_NOTEBOOK=$wxUSE_NOTEBOOK" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NOTEBOOK = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NOTEBOOK = yes; then
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notifmsg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-notifmsg... $ECHO_C" >&6; }
+          # Check whether --enable-notifmsg was given.
+if test "${enable_notifmsg+set}" = set; then
+  enableval=$enable_notifmsg;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=yes'
+                          else
+                            wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=no'
+                          fi
+
+else
+
+                          wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=${'DEFAULT_wxUSE_NOTIFICATION_MESSAGE":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_notifmsg"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_NOTIFICATION_MESSAGE = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_NOTIFICATION_MESSAGE
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -12735,27 +11030,15 @@ if test "${enable_odcombobox+set}" = set; then
                           else
                             wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no'
                           fi
                           else
                             wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_odcombobox"
                           wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_odcombobox"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ODCOMBOBOX=$wxUSE_ODCOMBOBOX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ODCOMBOBOX = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ODCOMBOBOX = yes; then
@@ -12791,27 +11074,15 @@ if test "${enable_radiobox+set}" = set; then
                           else
                             wx_cv_use_radiobox='wxUSE_RADIOBOX=no'
                           fi
                           else
                             wx_cv_use_radiobox='wxUSE_RADIOBOX=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_radiobox"
                           wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_radiobox"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_RADIOBOX=$wxUSE_RADIOBOX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_RADIOBOX = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_RADIOBOX = yes; then
@@ -12847,27 +11118,15 @@ if test "${enable_radiobtn+set}" = set; then
                           else
                             wx_cv_use_radiobtn='wxUSE_RADIOBTN=no'
                           fi
                           else
                             wx_cv_use_radiobtn='wxUSE_RADIOBTN=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_radiobtn"
                           wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_radiobtn"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_RADIOBTN=$wxUSE_RADIOBTN" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_RADIOBTN = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_RADIOBTN = yes; then
@@ -12903,27 +11162,15 @@ if test "${enable_sash+set}" = set; then
                           else
                             wx_cv_use_sash='wxUSE_SASH=no'
                           fi
                           else
                             wx_cv_use_sash='wxUSE_SASH=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sash"
                           wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_sash"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SASH=$wxUSE_SASH" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SASH = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SASH = yes; then
@@ -12959,27 +11206,15 @@ if test "${enable_scrollbar+set}" = set; then
                           else
                             wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
                           fi
                           else
                             wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_scrollbar"
                           wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_scrollbar"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SCROLLBAR=$wxUSE_SCROLLBAR" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SCROLLBAR = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SCROLLBAR = yes; then
@@ -13015,27 +11250,15 @@ if test "${enable_searchctrl+set}" = set; then
                           else
                             wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
                           fi
                           else
                             wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_searchctrl"
                           wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_searchctrl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SEARCHCTRL=$wxUSE_SEARCHCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SEARCHCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SEARCHCTRL = yes; then
@@ -13071,27 +11294,15 @@ if test "${enable_slider+set}" = set; then
                           else
                             wx_cv_use_slider='wxUSE_SLIDER=no'
                           fi
                           else
                             wx_cv_use_slider='wxUSE_SLIDER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_slider"
                           wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_slider"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SLIDER=$wxUSE_SLIDER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SLIDER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SLIDER = yes; then
@@ -13127,27 +11338,15 @@ if test "${enable_spinbtn+set}" = set; then
                           else
                             wx_cv_use_spinbtn='wxUSE_SPINBTN=no'
                           fi
                           else
                             wx_cv_use_spinbtn='wxUSE_SPINBTN=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_spinbtn"
                           wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_spinbtn"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SPINBTN=$wxUSE_SPINBTN" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SPINBTN = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SPINBTN = yes; then
@@ -13183,27 +11382,15 @@ if test "${enable_spinctrl+set}" = set; then
                           else
                             wx_cv_use_spinctrl='wxUSE_SPINCTRL=no'
                           fi
                           else
                             wx_cv_use_spinctrl='wxUSE_SPINCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_spinctrl"
                           wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_spinctrl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SPINCTRL=$wxUSE_SPINCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SPINCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SPINCTRL = yes; then
@@ -13239,27 +11426,15 @@ if test "${enable_splitter+set}" = set; then
                           else
                             wx_cv_use_splitter='wxUSE_SPLITTER=no'
                           fi
                           else
                             wx_cv_use_splitter='wxUSE_SPLITTER=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splitter"
                           wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splitter"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SPLITTER=$wxUSE_SPLITTER" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SPLITTER = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SPLITTER = yes; then
@@ -13295,27 +11470,15 @@ if test "${enable_statbmp+set}" = set; then
                           else
                             wx_cv_use_statbmp='wxUSE_STATBMP=no'
                           fi
                           else
                             wx_cv_use_statbmp='wxUSE_STATBMP=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statbmp"
                           wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statbmp"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STATBMP=$wxUSE_STATBMP" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STATBMP = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STATBMP = yes; then
@@ -13351,27 +11514,15 @@ if test "${enable_statbox+set}" = set; then
                           else
                             wx_cv_use_statbox='wxUSE_STATBOX=no'
                           fi
                           else
                             wx_cv_use_statbox='wxUSE_STATBOX=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statbox"
                           wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statbox"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STATBOX=$wxUSE_STATBOX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STATBOX = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STATBOX = yes; then
@@ -13407,27 +11558,15 @@ if test "${enable_statline+set}" = set; then
                           else
                             wx_cv_use_statline='wxUSE_STATLINE=no'
                           fi
                           else
                             wx_cv_use_statline='wxUSE_STATLINE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statline"
                           wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statline"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STATLINE=$wxUSE_STATLINE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STATLINE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STATLINE = yes; then
@@ -13463,27 +11602,15 @@ if test "${enable_stattext+set}" = set; then
                           else
                             wx_cv_use_stattext='wxUSE_STATTEXT=no'
                           fi
                           else
                             wx_cv_use_stattext='wxUSE_STATTEXT=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stattext"
                           wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_stattext"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STATTEXT=$wxUSE_STATTEXT" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STATTEXT = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STATTEXT = yes; then
@@ -13519,27 +11646,15 @@ if test "${enable_statusbar+set}" = set; then
                           else
                             wx_cv_use_statusbar='wxUSE_STATUSBAR=no'
                           fi
                           else
                             wx_cv_use_statusbar='wxUSE_STATUSBAR=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statusbar"
                           wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_statusbar"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STATUSBAR=$wxUSE_STATUSBAR" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STATUSBAR = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STATUSBAR = yes; then
@@ -13575,27 +11690,15 @@ if test "${enable_tabdialog+set}" = set; then
                           else
                             wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
                           fi
                           else
                             wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tabdialog"
                           wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tabdialog"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TAB_DIALOG=$wxUSE_TAB_DIALOG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TAB_DIALOG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TAB_DIALOG = yes; then
@@ -13631,27 +11734,15 @@ if test "${enable_taskbaricon+set}" = set; then
                           else
                             wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no'
                           fi
                           else
                             wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_taskbaricon"
                           wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_taskbaricon"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TASKBARICON=$wxUSE_TASKBARICON" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TASKBARICON = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TASKBARICON = yes; then
@@ -13687,27 +11778,15 @@ if test "${enable_textctrl+set}" = set; then
                           else
                             wx_cv_use_textctrl='wxUSE_TEXTCTRL=no'
                           fi
                           else
                             wx_cv_use_textctrl='wxUSE_TEXTCTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textctrl"
                           wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textctrl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TEXTCTRL=$wxUSE_TEXTCTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TEXTCTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TEXTCTRL = yes; then
@@ -13743,27 +11822,15 @@ if test "${enable_togglebtn+set}" = set; then
                           else
                             wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                           fi
                           else
                             wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_togglebtn"
                           wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_togglebtn"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TOGGLEBTN=$wxUSE_TOGGLEBTN" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TOGGLEBTN = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TOGGLEBTN = yes; then
@@ -13799,27 +11866,15 @@ if test "${enable_toolbar+set}" = set; then
                           else
                             wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
                           fi
                           else
                             wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_toolbar"
                           wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_toolbar"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TOOLBAR=$wxUSE_TOOLBAR" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TOOLBAR = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TOOLBAR = yes; then
@@ -13855,27 +11910,15 @@ if test "${enable_tbarnative+set}" = set; then
                           else
                             wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                           fi
                           else
                             wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tbarnative"
                           wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tbarnative"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TOOLBAR_NATIVE=$wxUSE_TOOLBAR_NATIVE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TOOLBAR_NATIVE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TOOLBAR_NATIVE = yes; then
@@ -13911,27 +11954,15 @@ if test "${enable_treebook+set}" = set; then
                           else
                             wx_cv_use_treebook='wxUSE_TREEBOOK=no'
                           fi
                           else
                             wx_cv_use_treebook='wxUSE_TREEBOOK=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_treebook"
                           wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_treebook"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TREEBOOK=$wxUSE_TREEBOOK" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TREEBOOK = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TREEBOOK = yes; then
@@ -13967,27 +11998,15 @@ if test "${enable_toolbook+set}" = set; then
                           else
                             wx_cv_use_toolbook='wxUSE_TOOLBOOK=no'
                           fi
                           else
                             wx_cv_use_toolbook='wxUSE_TOOLBOOK=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_toolbook"
                           wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_toolbook"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TOOLBOOK=$wxUSE_TOOLBOOK" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TOOLBOOK = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TOOLBOOK = yes; then
@@ -14023,27 +12042,15 @@ if test "${enable_treectrl+set}" = set; then
                           else
                             wx_cv_use_treectrl='wxUSE_TREECTRL=no'
                           fi
                           else
                             wx_cv_use_treectrl='wxUSE_TREECTRL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_treectrl"
                           wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_treectrl"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TREECTRL=$wxUSE_TREECTRL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TREECTRL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TREECTRL = yes; then
@@ -14079,27 +12086,15 @@ if test "${enable_tipwindow+set}" = set; then
                           else
                             wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
                           fi
                           else
                             wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tipwindow"
                           wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tipwindow"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TIPWINDOW=$wxUSE_TIPWINDOW" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TIPWINDOW = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TIPWINDOW = yes; then
@@ -14135,27 +12130,15 @@ if test "${enable_popupwin+set}" = set; then
                           else
                             wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
                           fi
                           else
                             wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_popupwin"
                           wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_popupwin"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_POPUPWIN=$wxUSE_POPUPWIN" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_POPUPWIN = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_POPUPWIN = yes; then
@@ -14193,27 +12176,15 @@ if test "${enable_commondlg+set}" = set; then
                           else
                             wx_cv_use_commondlg='wxUSE_COMMONDLGS=no'
                           fi
                           else
                             wx_cv_use_commondlg='wxUSE_COMMONDLGS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_commondlg"
                           wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_commondlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_COMMONDLGS=$wxUSE_COMMONDLGS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COMMONDLGS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COMMONDLGS = yes; then
@@ -14249,27 +12220,15 @@ if test "${enable_aboutdlg+set}" = set; then
                           else
                             wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no'
                           fi
                           else
                             wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_aboutdlg"
                           wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_aboutdlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ABOUTDLG=$wxUSE_ABOUTDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ABOUTDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ABOUTDLG = yes; then
@@ -14305,27 +12264,15 @@ if test "${enable_choicedlg+set}" = set; then
                           else
                             wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
                           fi
                           else
                             wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choicedlg"
                           wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_choicedlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_CHOICEDLG=$wxUSE_CHOICEDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CHOICEDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_CHOICEDLG = yes; then
@@ -14361,27 +12308,15 @@ if test "${enable_coldlg+set}" = set; then
                           else
                             wx_cv_use_coldlg='wxUSE_COLOURDLG=no'
                           fi
                           else
                             wx_cv_use_coldlg='wxUSE_COLOURDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_coldlg"
                           wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_coldlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_COLOURDLG=$wxUSE_COLOURDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COLOURDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_COLOURDLG = yes; then
@@ -14417,27 +12352,15 @@ if test "${enable_filedlg+set}" = set; then
                           else
                             wx_cv_use_filedlg='wxUSE_FILEDLG=no'
                           fi
                           else
                             wx_cv_use_filedlg='wxUSE_FILEDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filedlg"
                           wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_filedlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FILEDLG=$wxUSE_FILEDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FILEDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FILEDLG = yes; then
@@ -14473,27 +12396,15 @@ if test "${enable_finddlg+set}" = set; then
                           else
                             wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
                           fi
                           else
                             wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_finddlg"
                           wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_finddlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FINDREPLDLG=$wxUSE_FINDREPLDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FINDREPLDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FINDREPLDLG = yes; then
@@ -14529,27 +12440,15 @@ if test "${enable_fontdlg+set}" = set; then
                           else
                             wx_cv_use_fontdlg='wxUSE_FONTDLG=no'
                           fi
                           else
                             wx_cv_use_fontdlg='wxUSE_FONTDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontdlg"
                           wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_fontdlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_FONTDLG=$wxUSE_FONTDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FONTDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_FONTDLG = yes; then
@@ -14585,27 +12484,15 @@ if test "${enable_dirdlg+set}" = set; then
                           else
                             wx_cv_use_dirdlg='wxUSE_DIRDLG=no'
                           fi
                           else
                             wx_cv_use_dirdlg='wxUSE_DIRDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dirdlg"
                           wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dirdlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DIRDLG=$wxUSE_DIRDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DIRDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DIRDLG = yes; then
@@ -14641,27 +12528,15 @@ if test "${enable_msgdlg+set}" = set; then
                           else
                             wx_cv_use_msgdlg='wxUSE_MSGDLG=no'
                           fi
                           else
                             wx_cv_use_msgdlg='wxUSE_MSGDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_msgdlg"
                           wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_msgdlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MSGDLG=$wxUSE_MSGDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MSGDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MSGDLG = yes; then
@@ -14697,27 +12572,15 @@ if test "${enable_numberdlg+set}" = set; then
                           else
                             wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
                           fi
                           else
                             wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_numberdlg"
                           wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_numberdlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_NUMBERDLG=$wxUSE_NUMBERDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NUMBERDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_NUMBERDLG = yes; then
@@ -14753,27 +12616,15 @@ if test "${enable_splash+set}" = set; then
                           else
                             wx_cv_use_splash='wxUSE_SPLASH=no'
                           fi
                           else
                             wx_cv_use_splash='wxUSE_SPLASH=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splash"
                           wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splash"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SPLASH=$wxUSE_SPLASH" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SPLASH = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SPLASH = yes; then
@@ -14809,27 +12660,15 @@ if test "${enable_textdlg+set}" = set; then
                           else
                             wx_cv_use_textdlg='wxUSE_TEXTDLG=no'
                           fi
                           else
                             wx_cv_use_textdlg='wxUSE_TEXTDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textdlg"
                           wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_textdlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TEXTDLG=$wxUSE_TEXTDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TEXTDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TEXTDLG = yes; then
@@ -14865,27 +12704,15 @@ if test "${enable_tipdlg+set}" = set; then
                           else
                             wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
                           fi
                           else
                             wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tipdlg"
                           wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tipdlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_STARTUP_TIPS=$wxUSE_STARTUP_TIPS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STARTUP_TIPS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_STARTUP_TIPS = yes; then
@@ -14921,27 +12748,15 @@ if test "${enable_progressdlg+set}" = set; then
                           else
                             wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
                           fi
                           else
                             wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_progressdlg"
                           wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_progressdlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PROGRESSDLG=$wxUSE_PROGRESSDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROGRESSDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PROGRESSDLG = yes; then
@@ -14977,27 +12792,15 @@ if test "${enable_wizarddlg+set}" = set; then
                           else
                             wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
                           fi
                           else
                             wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_wizarddlg"
                           wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_wizarddlg"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_WIZARDDLG=$wxUSE_WIZARDDLG" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_WIZARDDLG = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_WIZARDDLG = yes; then
@@ -15035,27 +12838,15 @@ if test "${enable_menus+set}" = set; then
                           else
                             wx_cv_use_menus='wxUSE_MENUS=no'
                           fi
                           else
                             wx_cv_use_menus='wxUSE_MENUS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_menus"
                           wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_menus"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MENUS=$wxUSE_MENUS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MENUS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MENUS = yes; then
@@ -15091,27 +12882,15 @@ if test "${enable_miniframe+set}" = set; then
                           else
                             wx_cv_use_miniframe='wxUSE_MINIFRAME=no'
                           fi
                           else
                             wx_cv_use_miniframe='wxUSE_MINIFRAME=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_miniframe"
                           wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_miniframe"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MINIFRAME=$wxUSE_MINIFRAME" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MINIFRAME = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MINIFRAME = yes; then
@@ -15147,27 +12926,15 @@ if test "${enable_tooltips+set}" = set; then
                           else
                             wx_cv_use_tooltips='wxUSE_TOOLTIPS=no'
                           fi
                           else
                             wx_cv_use_tooltips='wxUSE_TOOLTIPS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tooltips"
                           wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tooltips"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TOOLTIPS=$wxUSE_TOOLTIPS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TOOLTIPS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TOOLTIPS = yes; then
@@ -15203,27 +12970,15 @@ if test "${enable_splines+set}" = set; then
                           else
                             wx_cv_use_splines='wxUSE_SPLINES=no'
                           fi
                           else
                             wx_cv_use_splines='wxUSE_SPLINES=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splines"
                           wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_splines"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_SPLINES=$wxUSE_SPLINES" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SPLINES = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SPLINES = yes; then
@@ -15259,27 +13014,15 @@ if test "${enable_mousewheel+set}" = set; then
                           else
                             wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no'
                           fi
                           else
                             wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mousewheel"
                           wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_mousewheel"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_MOUSEWHEEL=$wxUSE_MOUSEWHEEL" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MOUSEWHEEL = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_MOUSEWHEEL = yes; then
@@ -15315,27 +13058,15 @@ if test "${enable_validators+set}" = set; then
                           else
                             wx_cv_use_validators='wxUSE_VALIDATORS=no'
                           fi
                           else
                             wx_cv_use_validators='wxUSE_VALIDATORS=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_validators"
                           wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_validators"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_VALIDATORS=$wxUSE_VALIDATORS" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_VALIDATORS = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_VALIDATORS = yes; then
@@ -15371,27 +13102,15 @@ if test "${enable_busyinfo+set}" = set; then
                           else
                             wx_cv_use_busyinfo='wxUSE_BUSYINFO=no'
                           fi
                           else
                             wx_cv_use_busyinfo='wxUSE_BUSYINFO=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_busyinfo"
                           wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_busyinfo"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_BUSYINFO=$wxUSE_BUSYINFO" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_BUSYINFO = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_BUSYINFO = yes; then
@@ -15427,27 +13146,15 @@ if test "${enable_joystick+set}" = set; then
                           else
                             wx_cv_use_joystick='wxUSE_JOYSTICK=no'
                           fi
                           else
                             wx_cv_use_joystick='wxUSE_JOYSTICK=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_joystick"
                           wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_joystick"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_JOYSTICK=$wxUSE_JOYSTICK" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_JOYSTICK = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_JOYSTICK = yes; then
@@ -15483,27 +13190,15 @@ if test "${enable_metafile+set}" = set; then
                           else
                             wx_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
                           else
                             wx_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_metafile"
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_metafile"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_METAFILE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_METAFILE = yes; then
@@ -15539,27 +13234,15 @@ if test "${enable_dragimage+set}" = set; then
                           else
                             wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
                           fi
                           else
                             wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dragimage"
                           wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dragimage"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DRAGIMAGE=$wxUSE_DRAGIMAGE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DRAGIMAGE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DRAGIMAGE = yes; then
@@ -15595,27 +13278,15 @@ if test "${enable_accessibility+set}" = set; then
                           else
                             wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
                           fi
                           else
                             wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_accessibility"
                           wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_accessibility"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ACCESSIBILITY=$wxUSE_ACCESSIBILITY" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ACCESSIBILITY = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ACCESSIBILITY = yes; then
@@ -15653,27 +13324,15 @@ if test "${enable_palette+set}" = set; then
                           else
                             wx_cv_use_palette='wxUSE_PALETTE=no'
                           fi
                           else
                             wx_cv_use_palette='wxUSE_PALETTE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_palette"
                           wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_palette"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PALETTE=$wxUSE_PALETTE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PALETTE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PALETTE = yes; then
@@ -15709,27 +13368,15 @@ if test "${enable_image+set}" = set; then
                           else
                             wx_cv_use_image='wxUSE_IMAGE=no'
                           fi
                           else
                             wx_cv_use_image='wxUSE_IMAGE=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_image"
                           wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_image"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_IMAGE=$wxUSE_IMAGE" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_IMAGE = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_IMAGE = yes; then
@@ -15765,27 +13412,15 @@ if test "${enable_gif+set}" = set; then
                           else
                             wx_cv_use_gif='wxUSE_GIF=no'
                           fi
                           else
                             wx_cv_use_gif='wxUSE_GIF=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gif"
                           wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_gif"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_GIF=$wxUSE_GIF" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GIF = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_GIF = yes; then
@@ -15821,27 +13456,15 @@ if test "${enable_pcx+set}" = set; then
                           else
                             wx_cv_use_pcx='wxUSE_PCX=no'
                           fi
                           else
                             wx_cv_use_pcx='wxUSE_PCX=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_pcx"
                           wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_pcx"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PCX=$wxUSE_PCX" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PCX = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PCX = yes; then
@@ -15877,27 +13500,15 @@ if test "${enable_tga+set}" = set; then
                           else
                             wx_cv_use_tga='wxUSE_TGA=no'
                           fi
                           else
                             wx_cv_use_tga='wxUSE_TGA=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tga"
                           wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_tga"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_TGA=$wxUSE_TGA" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TGA = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_TGA = yes; then
@@ -15933,27 +13544,15 @@ if test "${enable_iff+set}" = set; then
                           else
                             wx_cv_use_iff='wxUSE_IFF=no'
                           fi
                           else
                             wx_cv_use_iff='wxUSE_IFF=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_iff"
                           wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_iff"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_IFF=$wxUSE_IFF" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_IFF = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_IFF = yes; then
@@ -15989,27 +13588,15 @@ if test "${enable_pnm+set}" = set; then
                           else
                             wx_cv_use_pnm='wxUSE_PNM=no'
                           fi
                           else
                             wx_cv_use_pnm='wxUSE_PNM=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_pnm"
                           wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_pnm"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_PNM=$wxUSE_PNM" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PNM = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_PNM = yes; then
@@ -16045,27 +13632,15 @@ if test "${enable_xpm+set}" = set; then
                           else
                             wx_cv_use_xpm='wxUSE_XPM=no'
                           fi
                           else
                             wx_cv_use_xpm='wxUSE_XPM=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_xpm"
                           wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_xpm"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_XPM=$wxUSE_XPM" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_XPM = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_XPM = yes; then
@@ -16101,27 +13676,15 @@ if test "${enable_ico_cur+set}" = set; then
                           else
                             wx_cv_use_ico_cur='wxUSE_ICO_CUR=no'
                           fi
                           else
                             wx_cv_use_ico_cur='wxUSE_ICO_CUR=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ico_cur"
                           wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ico_cur"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ICO_CUR=$wxUSE_ICO_CUR" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ICO_CUR = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_ICO_CUR = yes; then
@@ -16159,27 +13722,15 @@ if test "${enable_dccache+set}" = set; then
                           else
                             wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
                           fi
                           else
                             wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dccache"
                           wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_dccache"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DC_CACHEING=$wxUSE_DC_CACHEING" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DC_CACHEING = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DC_CACHEING = yes; then
@@ -16215,27 +13766,15 @@ if test "${enable_ps_in_msw+set}" = set; then
                           else
                             wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no'
                           fi
                           else
                             wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ps_in_msw"
                           wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ps_in_msw"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then
@@ -16271,27 +13810,15 @@ if test "${enable_ownerdrawn+set}" = set; then
                           else
                             wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no'
                           fi
                           else
                             wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ownerdrawn"
                           wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_ownerdrawn"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_OWNER_DRAWN=$wxUSE_OWNER_DRAWN" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_OWNER_DRAWN = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_OWNER_DRAWN = yes; then
@@ -16327,27 +13854,15 @@ if test "${enable_uxtheme+set}" = set; then
                           else
                             wx_cv_use_uxtheme='wxUSE_UXTHEME=no'
                           fi
                           else
                             wx_cv_use_uxtheme='wxUSE_UXTHEME=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_uxtheme"
                           wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_uxtheme"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_UXTHEME=$wxUSE_UXTHEME" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_UXTHEME = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_UXTHEME = yes; then
@@ -16383,27 +13898,15 @@ if test "${enable_wxdib+set}" = set; then
                           else
                             wx_cv_use_wxdib='wxUSE_DIB=no'
                           fi
                           else
                             wx_cv_use_wxdib='wxUSE_DIB=no'
                           fi
-                          cache=yes
 
 else
 
 
 else
 
-                          LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                              eval "DEFAULT_$LINE"
-                              cache=yes
-                          else
-                              cache=no
-                          fi
-
                           wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_wxdib"
                           wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}"
 
 fi
 
 
           eval "$wx_cv_use_wxdib"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_DIB=$wxUSE_DIB" >> ${wx_arg_cache_file}.tmp
-          fi
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DIB = yes; then
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_DIB = yes; then
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 
+if test "$wxUSE_MSW" != 1; then
+    DEFAULT_wxUSE_AUTOID_MANAGEMENT=no
 fi
 
 
 fi
 
 
-          echo "saving argument cache $wx_arg_cache_file"
-          mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
 
 
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-autoidman" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-autoidman... $ECHO_C" >&6; }
+          # Check whether --enable-autoidman was given.
+if test "${enable_autoidman+set}" = set; then
+  enableval=$enable_autoidman;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=yes'
+                          else
+                            wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=no'
+                          fi
 
 
+else
 
 
-{ echo "$as_me:$LINENO: checking for toolkit" >&5
-echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; }
+                          wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=${'DEFAULT_wxUSE_AUTOID_MANAGEMENT":-$defaultval}"
 
 
-# In Wine, we need to default to MSW, not GTK or MOTIF
-if test "$wxUSE_WINE" = "yes"; then
-    DEFAULT_DEFAULT_wxUSE_GTK=0
-    DEFAULT_DEFAULT_wxUSE_MOTIF=0
-    DEFAULT_DEFAULT_wxUSE_MSW=1
-    wxUSE_SHARED=no
-    CC=${CC:-winegcc}
-    CXX=${CXX:-wineg++}
 fi
 
 
 fi
 
 
-if test "$wxUSE_GUI" = "yes"; then
-
-    if test "$USE_BEOS" = 1; then
-        { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5
-echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    if test "$TOOLKIT_GIVEN" = 1; then
-            for toolkit in `echo $ALL_TOOLKITS`; do
-        var=wxUSE_$toolkit
-        eval "value=\$${var}"
-        if test "x$value" = "xno"; then
-          eval "$var=0"
-        elif test "x$value" != "x"; then
-          eval "$var=1"
-        fi
-
-        if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
-          eval "wx${toolkit}_VERSION=$value"
-        fi
-      done
-    else
-            for toolkit in `echo $ALL_TOOLKITS`; do
-        if test "$has_toolkit_in_cache" != 1; then
-          var=DEFAULT_DEFAULT_wxUSE_$toolkit
-        else
-          var=DEFAULT_wxUSE_$toolkit
+          eval "$wx_cv_use_autoidman"
 
 
-          eval "version=\$DEFAULT_wx${toolkit}_VERSION"
-          if test "x$version" != "x"; then
-            eval "wx${toolkit}_VERSION=$version"
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_AUTOID_MANAGEMENT = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_AUTOID_MANAGEMENT
           fi
           fi
-        fi
-        eval "wxUSE_$toolkit=\$${var}"
-      done
-    fi
-
-            NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
-                  + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \
-                  + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
 
 
-        case "${host}" in
-      *-pc-os2_emx | *-pc-os2-emx )
-        NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
-    esac
-
-    case "$NUM_TOOLKITS" in
-      1)
-      ;;
-      0)
-        { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5
-echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;}
-   { (exit 1); exit 1; }; }
-      ;;
-      *)
-        { { echo "$as_me:$LINENO: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&5
-echo "$as_me: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&2;}
-   { (exit 1); exit 1; }; }
-    esac
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
 
 
-    # to be removed when --disable-gtk2 isn't needed
-    if test "x$wxUSE_GTK2" = "xyes"; then
-        wxGTK_VERSION=2
-    elif test "x$wxUSE_GTK2" = "xno"; then
-        wxGTK_VERSION=1
-    fi
 
 
-        for toolkit in `echo $ALL_TOOLKITS`; do
-      var=wxUSE_$toolkit
-      eval "value=\$${var}"
-      if test "x$value" != x; then
-        cache_var=CACHE_$toolkit
-        eval "cache=\$${cache_var}"
-        if test "$cache" = 1; then
-          echo "$var=$value" >> ${wx_arg_cache_file}
-          eval "version=\$wx${toolkit}_VERSION"
-          if test "x$version" != "x"; then
-            echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file}
-          fi
-        fi
-        if test "$value" = 1; then
-          toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`
-          { echo "$as_me:$LINENO: result: $toolkit_echo" >&5
-echo "${ECHO_T}$toolkit_echo" >&6; }
-        fi
-      fi
-    done
-else
-    if test "x$host_alias" != "x"; then
-        { echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5
-echo "${ECHO_T}base ($host_alias hosted) only" >&6; }
-    else
-        { echo "$as_me:$LINENO: result: base only" >&5
-echo "${ECHO_T}base only" >&6; }
-    fi
 fi
 
 
 fi
 
 
@@ -20376,6 +17810,8 @@ echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_
                 OSX_UNIV_OPTS="-arch ppc -arch i386"
         CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
         CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
                 OSX_UNIV_OPTS="-arch ppc -arch i386"
         CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
         CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
+        OBJCXXFLAGS="$OSX_UNIV_OPTS $OBJCXXFLAGS"
+        OBJCFLAGS="$OSX_UNIV_OPTS $OBJCFLAGS"
         LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
                                                                                                                 retest_macosx_linking=yes
 
         LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
                                                                                                                 retest_macosx_linking=yes
 
@@ -20441,6 +17877,11 @@ echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.pl
     else
         wxUSE_MACOSX_VERSION_MIN=
     fi
     else
         wxUSE_MACOSX_VERSION_MIN=
     fi
+elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
+    if test "$wxUSE_MAC" = 1; then
+        # otherwise configure stops on leopard for universal_binary
+        wxUSE_MACOSX_VERSION_MIN=10.4
+    fi
 fi
 
 if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
 fi
 
 if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
@@ -24639,7 +22080,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
 _ACEOF
 
 
-        if test "$ac_cv_sizeof_long_long" != "0"; then
+        if test "$ac_cv_sizeof_long_long" != 0; then
                         CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS"
         fi
     ;;
                         CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS"
         fi
     ;;
@@ -25575,7 +23016,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
 _ACEOF
 
 
-if test "$ac_cv_sizeof_wchar_t" != "0"; then
+if test "$ac_cv_sizeof_wchar_t" != 0; then
     wxUSE_WCHAR_T=yes
 else
     wxUSE_WCHAR_T=no
     wxUSE_WCHAR_T=yes
 else
     wxUSE_WCHAR_T=no
@@ -27047,7 +24488,7 @@ echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6; }
                 { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5
 echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;}
    { (exit 1); exit 1; }; }
                 { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5
 echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;}
    { (exit 1); exit 1; }; }
-            elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
+            elif test "$wxUSE_STD_STRING" = "yes"; then
                 { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5
 echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;}
    { (exit 1); exit 1; }; }
                 { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5
 echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;}
    { (exit 1); exit 1; }; }
@@ -27192,7 +24633,7 @@ fi
 
 
     if test "$wxUSE_STD_IOSTREAM" != "yes"; then
 
 
     if test "$wxUSE_STD_IOSTREAM" != "yes"; then
-        if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then
+        if test "$wxUSE_STD_IOSTREAM" = "yes"; then
             { { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5
 echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;}
    { (exit 1); exit 1; }; }
             { { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5
 echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;}
    { (exit 1); exit 1; }; }
@@ -27249,93 +24690,333 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  wx_cv_lib_stl=yes
+  wx_cv_lib_stl=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_lib_stl=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5
+echo "${ECHO_T}$wx_cv_lib_stl" >&6; }
+
+    if test "$wx_cv_lib_stl" != yes; then
+         { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5
+echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missing" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+
+        { echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5
+echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6; }
+if test "${wx_cv_func_stdstring_compare+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string>
+int
+main ()
+{
+std::string foo, bar;
+            foo.compare(bar);
+            foo.compare(1, 1, bar);
+            foo.compare(1, 1, bar, 1, 1);
+            foo.compare("");
+            foo.compare(1, 1, "");
+            foo.compare(1, 1, "", 2);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  wx_cv_func_stdstring_compare=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_func_stdstring_compare=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5
+echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; }
+
+    if test "$wx_cv_func_stdstring_compare" = yes; then
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_STRING_COMPARE 1
+_ACEOF
+
+    fi
+
+    if test "$wx_cv_class_gnuhashmapset" = yes; then
+         cat >>confdefs.h <<\_ACEOF
+#define HAVE_EXT_HASH_MAP 1
+_ACEOF
+
+         cat >>confdefs.h <<\_ACEOF
+#define HAVE_GNU_CXX_HASH_MAP 1
+_ACEOF
+
+    fi
+
+    { echo "$as_me:$LINENO: checking for unordered_map" >&5
+echo $ECHO_N "checking for unordered_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_unordered_map+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+
+#include <unordered_map>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_unordered_map=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_header_unordered_map=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_unordered_map" >&5
+echo "${ECHO_T}$ac_cv_header_unordered_map" >&6; }
+if test $ac_cv_header_unordered_map = yes; then
+  { echo "$as_me:$LINENO: checking for unordered_map and unordered_set in std" >&5
+echo $ECHO_N "checking for unordered_map and unordered_set in std... $ECHO_C" >&6; }
+if test "${wx_cv_class_stdunorderedmapset+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <unordered_map>
+                #include <unordered_set>
+int
+main ()
+{
+std::unordered_map<double*, char*> test1;
+                 std::unordered_set<char*> test2;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  wx_cv_class_stdunorderedmapset=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_class_stdunorderedmapset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_stdunorderedmapset" >&5
+echo "${ECHO_T}$wx_cv_class_stdunorderedmapset" >&6; }
+fi
+
+
+
+    if test "$wx_cv_class_stdunorderedmapset" = yes; then
+         cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_UNORDERED_MAP 1
+_ACEOF
+
+         cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_UNORDERED_SET 1
+_ACEOF
+
+    else
+        { echo "$as_me:$LINENO: checking for tr1/unordered_map" >&5
+echo $ECHO_N "checking for tr1/unordered_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_tr1_unordered_map+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+
+#include <tr1/unordered_map>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_tr1_unordered_map=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_header_tr1_unordered_map=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_tr1_unordered_map" >&5
+echo "${ECHO_T}$ac_cv_header_tr1_unordered_map" >&6; }
+if test $ac_cv_header_tr1_unordered_map = yes; then
+  { echo "$as_me:$LINENO: checking for unordered_map and unordered_set in std::tr1" >&5
+echo $ECHO_N "checking for unordered_map and unordered_set in std::tr1... $ECHO_C" >&6; }
+if test "${wx_cv_class_tr1unorderedmapset+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <tr1/unordered_map>
+                    #include <tr1/unordered_set>
+int
+main ()
+{
+std::tr1::unordered_map<double*, char*> test1;
+                     std::tr1::unordered_set<char*> test2;
+            #if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<2)
+            #error can't use unordered_{map,set} with gcc-4.[01]: http://gcc.gnu.org/PR24389
+            #endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  wx_cv_class_tr1unorderedmapset=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       wx_cv_lib_stl=no
-
+       wx_cv_class_tr1unorderedmapset=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5
-echo "${ECHO_T}$wx_cv_lib_stl" >&6; }
-
-    if test "$wx_cv_lib_stl" != yes; then
-         { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5
-echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missing" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-        { echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5
-echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6; }
-if test "${wx_cv_func_stdstring_compare+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string>
-int
-main ()
-{
-std::string foo, bar;
-            foo.compare(bar);
-            foo.compare(1, 1, bar);
-            foo.compare(1, 1, bar, 1, 1);
-            foo.compare("");
-            foo.compare(1, 1, "");
-            foo.compare(1, 1, "", 2);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  wx_cv_func_stdstring_compare=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_func_stdstring_compare=no
 
 
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_tr1unorderedmapset" >&5
+echo "${ECHO_T}$wx_cv_class_tr1unorderedmapset" >&6; }
 fi
 
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5
-echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; }
 
 
-    if test "$wx_cv_func_stdstring_compare" = yes; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_STRING_COMPARE 1
+        if test "$wx_cv_class_tr1unorderedmapset" = yes; then
+            cat >>confdefs.h <<\_ACEOF
+#define HAVE_TR1_UNORDERED_MAP 1
 _ACEOF
 
 _ACEOF
 
-    fi
+            cat >>confdefs.h <<\_ACEOF
+#define HAVE_TR1_UNORDERED_SET 1
+_ACEOF
 
 
-        { echo "$as_me:$LINENO: checking for hash_map" >&5
+        else
+                        { echo "$as_me:$LINENO: checking for hash_map" >&5
 echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; }
 if test "${ac_cv_header_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; }
 if test "${ac_cv_header_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27381,8 +25062,8 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
 echo "${ECHO_T}$ac_cv_header_hash_map" >&6; }
 if test $ac_cv_header_hash_map = yes; then
 { echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
 echo "${ECHO_T}$ac_cv_header_hash_map" >&6; }
 if test $ac_cv_header_hash_map = yes; then
-  { echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5
-echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: checking for std::hash_map and hash_set" >&5
+echo $ECHO_N "checking for std::hash_map and hash_set... $ECHO_C" >&6; }
 if test "${wx_cv_class_stdhashmapset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 if test "${wx_cv_class_stdhashmapset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -27393,12 +25074,12 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <hash_map>
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <hash_map>
-                #include <hash_set>
+                        #include <hash_set>
 int
 main ()
 {
 std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
 int
 main ()
 {
 std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
-                 std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
+                         std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
   ;
   return 0;
 }
   ;
   return 0;
 }
 
 
 
 
 
 
-    if test "$wx_cv_class_stdhashmapset" = yes; then
-        cat >>confdefs.h <<\_ACEOF
+            if test "$wx_cv_class_stdhashmapset" = yes; then
+                cat >>confdefs.h <<\_ACEOF
 #define HAVE_HASH_MAP 1
 _ACEOF
 
 #define HAVE_HASH_MAP 1
 _ACEOF
 
-        cat >>confdefs.h <<\_ACEOF
+                cat >>confdefs.h <<\_ACEOF
 #define HAVE_STD_HASH_MAP 1
 _ACEOF
 
 #define HAVE_STD_HASH_MAP 1
 _ACEOF
 
-    fi
+            fi
 
 
-    { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
+            { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
 echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
 if test "${ac_cv_header_ext_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
 if test "${ac_cv_header_ext_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27507,12 +25188,12 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ext/hash_map>
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ext/hash_map>
-                #include <ext/hash_set>
+                        #include <ext/hash_set>
 int
 main ()
 {
 __gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
 int
 main ()
 {
 __gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
-                 __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
+                         __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
   ;
   return 0;
 }
   ;
   return 0;
 }
 
 
 
 
 
 
-    if test "$wx_cv_class_gnuhashmapset" = yes; then
-         cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXT_HASH_MAP 1
-_ACEOF
-
-         cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNU_CXX_HASH_MAP 1
-_ACEOF
-
+        fi
     fi
 fi
 
 
 
   if test -n "$GCC"; then
     fi
 fi
 
 
 
   if test -n "$GCC"; then
-    { echo "$as_me:$LINENO: checking for __sync_fetch_* builtins" >&5
-echo $ECHO_N "checking for __sync_fetch_* builtins... $ECHO_C" >&6; }
+    { echo "$as_me:$LINENO: checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins" >&5
+echo $ECHO_N "checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins... $ECHO_C" >&6; }
     if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -27584,22 +25257,25 @@ int
 main ()
 {
 
 main ()
 {
 
-          int value=0;
-          __sync_fetch_and_add(&value, 1);
+          unsigned int value=0;
+          /* wxAtomicInc doesn't use return value here */
+          __sync_fetch_and_add(&value, 2);
           __sync_sub_and_fetch(&value, 1);
           __sync_sub_and_fetch(&value, 1);
+          /* but wxAtomicDec does, so mimic that: */
+          unsigned int r2 = __sync_sub_and_fetch(&value, 1);
 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -27608,7 +25284,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   (exit $ac_status); } && {
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
   (exit $ac_status); } && {
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
   wx_cv_cc_gcc_atomic_builtins=yes
 else
   echo "$as_me: failed program was:" >&5
   wx_cv_cc_gcc_atomic_builtins=yes
 else
   echo "$as_me: failed program was:" >&5
@@ -27617,7 +25294,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
        wx_cv_cc_gcc_atomic_builtins=no
 fi
 
        wx_cv_cc_gcc_atomic_builtins=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 
 fi
 
 
 fi
 
@@ -27642,6 +25320,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 SEARCH_INCLUDE="\
     /usr/local/include        \
 
 SEARCH_INCLUDE="\
     /usr/local/include        \
+    /usr/local/X11/include    \
+    /usr/local/include/X11    \
+    /usr/local/X11R6/include  \
+    /usr/local/include/X11R6  \
                               \
     /usr/Motif-2.1/include    \
     /usr/Motif-1.2/include    \
                               \
     /usr/Motif-2.1/include    \
     /usr/Motif-1.2/include    \
@@ -27654,29 +25336,25 @@ SEARCH_INCLUDE="\
                               \
     /usr/X11R6/include        \
     /usr/X11R6.4/include      \
                               \
     /usr/X11R6/include        \
     /usr/X11R6.4/include      \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
                               \
     /usr/include/X11R6        \
                               \
     /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
                               \
     /usr/X11/include          \
     /usr/include/X11          \
                               \
     /usr/X11/include          \
     /usr/include/X11          \
-    /usr/local/X11/include    \
-    /usr/local/include/X11    \
                               \
     /usr/XFree86/include/X11  \
     /usr/pkg/include          \
                               \
                               \
     /usr/XFree86/include/X11  \
     /usr/pkg/include          \
                               \
+    /usr/local/X1R5/include  \
+    /usr/local/include/X11R5  \
+    /usr/X11R5/include        \
+    /usr/include/X11R5        \
+                              \
+    /usr/local/X11R4/include  \
+    /usr/local/include/X11R4  \
+    /usr/X11R4/include        \
+    /usr/include/X11R4        \
+                              \
     /usr/openwin/share/include"
 
 { echo "$as_me:$LINENO: checking for libraries directory" >&5
     /usr/openwin/share/include"
 
 { echo "$as_me:$LINENO: checking for libraries directory" >&5
@@ -28555,8 +26233,8 @@ _ACEOF
 
 
     if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
 
 
     if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
-        { echo "$as_me:$LINENO: WARNING: Defaulting to the the builtin regex library for Unicode build." >&5
-echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode build." >&2;}
+        { echo "$as_me:$LINENO: WARNING: Defaulting to the builtin regex library for Unicode build." >&5
+echo "$as_me: WARNING: Defaulting to the builtin regex library for Unicode build." >&2;}
         wxUSE_REGEX=builtin
     fi
 
         wxUSE_REGEX=builtin
     fi
 
@@ -29976,10 +27654,13 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead"
         else
                         wxUSE_LIBTIFF=sys
         fi
         else
                         wxUSE_LIBTIFF=sys
         fi
-        if test "$wxUSE_LIBTIFF" = "builtin" ; then
-            subdirs="$subdirs src/tiff"
-
+    fi
+    if test "$wxUSE_LIBTIFF" = "builtin" ; then
+        if test "$wxUSE_LIBJPEG" = "no"; then
+                                                                                    ac_configure_args="$ac_configure_args --disable-jpeg"
         fi
         fi
+        subdirs="$subdirs src/tiff"
+
     fi
 fi
 
     fi
 fi
 
 
 
 
 
 
 
+            case "${host}" in
+       x86_64-*-mingw32* )
+                        LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+        ;;
+        * )
             LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
             LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-
+        ;;
+    esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
     fi
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
     fi
@@ -30548,7 +28235,7 @@ if test "$wxUSE_GUI" = "yes"; then
 
     WXGTK12=
     WXGTK127=
 
     WXGTK12=
     WXGTK127=
-    WXGTK20=
+    WXGTK2=
     WXGPE=
 
     if test "$wxUSE_COCOA" = 1 ; then
     WXGPE=
 
     if test "$wxUSE_COCOA" = 1 ; then
@@ -30681,7 +28368,7 @@ fi
     no_gtk=yes
   fi
 
     no_gtk=yes
   fi
 
-  min_gtk_version=2.0.0
+  min_gtk_version=2.4.0
   { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
 echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
 
   { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
 echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
 
@@ -31599,7 +29286,7 @@ echo "${ECHO_T}$wx_cv_lib_gtk" >&6; }
         fi
 
         case "$wx_cv_lib_gtk" in
         fi
 
         case "$wx_cv_lib_gtk" in
-            2.0)    WXGTK20=1
+            2.0)    WXGTK2=1
                     TOOLKIT_VERSION=2
                     ;;
             1.2.7)  WXGTK127=1
                     TOOLKIT_VERSION=2
                     ;;
             1.2.7)  WXGTK127=1
@@ -31627,86 +29314,12 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                     ;;
         esac
 
                     ;;
         esac
 
-        if test "$WXGTK20" = 1; then
+        if test "$WXGTK2" = 1; then
             save_CFLAGS="$CFLAGS"
             save_LIBS="$LIBS"
             CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
             LIBS="$LIBS $wx_cv_libs_gtk"
 
             save_CFLAGS="$CFLAGS"
             save_LIBS="$LIBS"
             CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
             LIBS="$LIBS $wx_cv_libs_gtk"
 
-                                                            { echo "$as_me:$LINENO: checking whether gtk_icon_size_lookup is declared" >&5
-echo $ECHO_N "checking whether gtk_icon_size_lookup is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_gtk_icon_size_lookup+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <gtk/gtk.h>
-
-int
-main ()
-{
-#ifndef gtk_icon_size_lookup
-  (void) gtk_icon_size_lookup;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_gtk_icon_size_lookup=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_have_decl_gtk_icon_size_lookup=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_icon_size_lookup" >&5
-echo "${ECHO_T}$ac_cv_have_decl_gtk_icon_size_lookup" >&6; }
-if test $ac_cv_have_decl_gtk_icon_size_lookup = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 1
-_ACEOF
-
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 0
-_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
-#define NEED_GTK_ICON_SIZE_LOOKUP 1
-_ACEOF
-
-fi
-
-
-
-
                         { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5
 echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; }
             cat >conftest.$ac_ext <<_ACEOF
                         { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5
 echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; }
             cat >conftest.$ac_ext <<_ACEOF
@@ -31748,106 +29361,34 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
 
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
 
-                            cat >>confdefs.h <<\_ACEOF
-#define __WXGTK210__ 1
-_ACEOF
-
-                            cat >>confdefs.h <<\_ACEOF
-#define __WXGTK26__ 1
-_ACEOF
-
-                            cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
-_ACEOF
-
-                            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-                            ac_wxgtk210=1
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-                            ac_wxgtk210=0
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-            if test "$ac_wxgtk210" = 0; then
-                                { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5
-echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6; }
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                                #include <gtk/gtk.h>
-
-int
-main ()
-{
-
-                                #if !GTK_CHECK_VERSION(2,6,0)
-                                Not GTK+ 2.6
-                                #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-                                cat >>confdefs.h <<\_ACEOF
-#define __WXGTK26__ 1
+                            cat >>confdefs.h <<\_ACEOF
+#define __WXGTK210__ 1
 _ACEOF
 
 _ACEOF
 
-                                cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
+                            cat >>confdefs.h <<\_ACEOF
+#define __WXGTK26__ 1
 _ACEOF
 
 _ACEOF
 
-                                { echo "$as_me:$LINENO: result: yes" >&5
+                            { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 echo "${ECHO_T}yes" >&6; }
-                                ac_wxgtk26=1
+                            ac_wxgtk210=1
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
-                                { echo "$as_me:$LINENO: result: no" >&5
+                            { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 echo "${ECHO_T}no" >&6; }
-                                ac_wxgtk26=0
+                            ac_wxgtk210=0
 
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-            fi
 
 
-            if test "$ac_wxgtk26" = 0; then
-                                { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.4" >&5
-echo $ECHO_N "checking if GTK+ is version >= 2.4... $ECHO_C" >&6; }
+            if test "$ac_wxgtk210" = 0; then
+                                { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5
+echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6; }
                 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
                 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -31861,8 +29402,8 @@ int
 main ()
 {
 
 main ()
 {
 
-                                #if !GTK_CHECK_VERSION(2,4,0)
-                                Not GTK+ 2.4
+                                #if !GTK_CHECK_VERSION(2,6,0)
+                                Not GTK+ 2.6
                                 #endif
 
   ;
                                 #endif
 
   ;
@@ -31888,11 +29429,12 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest.$ac_objext; then
 
                                 cat >>confdefs.h <<\_ACEOF
        } && test -s conftest.$ac_objext; then
 
                                 cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
+#define __WXGTK26__ 1
 _ACEOF
 
                                 { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 _ACEOF
 
                                 { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
+                                ac_wxgtk26=1
 
 else
   echo "$as_me: failed program was:" >&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -31901,6 +29443,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
                                 { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 
                                 { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
+                                ac_wxgtk26=0
 
 fi
 
 
 fi
 
@@ -34490,9 +32033,9 @@ echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6; }
         libsm_ice_link=""
         libs_found=0
         for libp in "" " -lXp"; do
         libsm_ice_link=""
         libs_found=0
         for libp in "" " -lXp"; do
-            if test "$libs_found" = "0"; then
+            if test "$libs_found" = 0; then
                 for libsm_ice in "" " -lSM -lICE"; do
                 for libsm_ice in "" " -lSM -lICE"; do
-                    if test "$libs_found" = "0"; then
+                    if test "$libs_found" = 0; then
                         save_LIBS="$LIBS"
                         LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                         save_CFLAGS=$CFLAGS
                         save_LIBS="$LIBS"
                         LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                         save_CFLAGS=$CFLAGS
@@ -34564,7 +32107,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
             fi
         done
 
             fi
         done
 
-        if test "$libs_found" = "0"; then
+        if test "$libs_found" = 0; then
             { echo "$as_me:$LINENO: result: can't find the right libraries" >&5
 echo "${ECHO_T}can't find the right libraries" >&6; }
             { { echo "$as_me:$LINENO: error: can't link a simple motif program" >&5
             { echo "$as_me:$LINENO: result: can't find the right libraries" >&5
 echo "${ECHO_T}can't find the right libraries" >&6; }
             { { echo "$as_me:$LINENO: error: can't link a simple motif program" >&5
@@ -35033,7 +32576,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
         fi
     fi
 
         fi
     fi
 
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_OSX_CARBON" = 1; then
         { echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5
 echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6; }
         if test "$GCC" = yes; then
         { echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5
 echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6; }
         if test "$GCC" = yes; then
@@ -35055,11 +32598,16 @@ echo "${ECHO_T}none" >&6; }
                         CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
         fi
 
                         CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
         fi
 
-        TOOLKIT=MAC
-                GUIDIST=MACX_DIST
+        TOOLKIT=OSX_CARBON
+                GUIDIST=OSX_CARBON_DIST
                         WXBASEPORT="_carbon"
     fi
 
                         WXBASEPORT="_carbon"
     fi
 
+    if test "$wxUSE_OSX_COCOA" = 1; then
+        TOOLKIT=OSX_COCOA
+        GUIDIST=OSX_COCOA_DIST
+    fi
+
     if test "$wxUSE_COCOA" = 1; then
         TOOLKIT=COCOA
         GUIDIST=COCOA_DIST
     if test "$wxUSE_COCOA" = 1; then
         TOOLKIT=COCOA
         GUIDIST=COCOA_DIST
@@ -35138,7 +32686,7 @@ _ACEOF
         if test "$TOOLKIT" = "PM" ; then
         TOOLKIT_DIR="os2"
     else
         if test "$TOOLKIT" = "PM" ; then
         TOOLKIT_DIR="os2"
     else
-        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
+        TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'`
     fi
 
     if test "$wxUSE_UNIVERSAL" = "yes"; then
     fi
 
     if test "$wxUSE_UNIVERSAL" = "yes"; then
@@ -35164,9 +32712,9 @@ fi
 
 
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then
 
 
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then
-    if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then
+    if test "$USE_UNIX" = 1 -a "$wxUSE_DARWIN" != 1 ; then
         wxUSE_UNICODE_UTF8=yes
         wxUSE_UNICODE_UTF8=yes
-    elif test "$USE_OS2" = "1" ; then
+    elif test "$USE_OS2" = 1 ; then
                                 wxUSE_UNICODE_UTF8=yes
     else
         wxUSE_UNICODE_UTF8=no
                                 wxUSE_UNICODE_UTF8=yes
     else
         wxUSE_UNICODE_UTF8=no
 
 USE_OPENGL=0
 if test "$wxUSE_OPENGL" = "yes"; then
 
 USE_OPENGL=0
 if test "$wxUSE_OPENGL" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = "1"; then
+    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
         { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
 echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
         wxUSE_OPENGL="no"
         { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
 echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
         wxUSE_OPENGL="no"
-    elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+    elif test "$wxUSE_OSX_CARBON" = 1 -o test "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
@@ -36393,7 +33941,7 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then
     DEBUG_INFO=1
 fi
 
     DEBUG_INFO=1
 fi
 
-WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
 
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
 
 
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
 
@@ -36790,44 +34338,6 @@ _ACEOF
 
 fi
 
 
 fi
 
-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
-  ac_cv_type_uid_t=yes
-else
-  ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
-
-fi
-
 
 { echo "$as_me:$LINENO: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
 
 { echo "$as_me:$LINENO: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
@@ -37690,7 +35200,8 @@ fi
 
 
 
 
 
 
-for ac_func in snprintf vsnprintf
+
+for ac_func in snprintf vsnprintf vsscanf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
 done
 
 
 done
 
 
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 if test "$ac_cv_func_vsnprintf" = "yes"; then
         { echo "$as_me:$LINENO: checking for vsnprintf declaration" >&5
 echo $ECHO_N "checking for vsnprintf declaration... $ECHO_C" >&6; }
 if test "$ac_cv_func_vsnprintf" = "yes"; then
         { echo "$as_me:$LINENO: checking for vsnprintf declaration" >&5
 echo $ECHO_N "checking for vsnprintf declaration... $ECHO_C" >&6; }
@@ -37833,7 +35350,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   wx_cv_func_vsnprintf_decl=yes
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   wx_cv_func_vsnprintf_decl=yes
@@ -37907,7 +35424,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   wx_cv_func_broken_vsnprintf_decl=no
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   wx_cv_func_broken_vsnprintf_decl=no
@@ -37983,7 +35500,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   wx_cv_func_snprintf_decl=yes
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   wx_cv_func_snprintf_decl=yes
@@ -38094,6 +35611,88 @@ _ACEOF
     fi
 fi
 
     fi
 fi
 
+if test "$ac_cv_func_vsscanf" = "yes"; then
+    { echo "$as_me:$LINENO: checking for vsscanf declaration" >&5
+echo $ECHO_N "checking for vsscanf declaration... $ECHO_C" >&6; }
+if test "${wx_cv_func_vsscanf_decl+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+            cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                    #ifdef __MSL__
+                    #if __MSL__ >= 0x6000
+                    namespace std {}
+                    using namespace std;
+                    #endif
+                    #endif
+
+int
+main ()
+{
+
+                    char *buf;
+                    va_list args;
+                    vsscanf(buf, "%s", args);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  wx_cv_func_vsscanf_decl=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_func_vsscanf_decl=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_func_vsscanf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_vsscanf_decl" >&6; }
+
+    if test "$wx_cv_func_vsscanf_decl" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE_VSSCANF_DECL 1
+_ACEOF
+
+    fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 if test "$wxUSE_UNICODE" = yes; then
 
             wchar_headers="#include <stdio.h>
 if test "$wxUSE_UNICODE" = yes; then
 
             wchar_headers="#include <stdio.h>
@@ -38165,7 +35764,7 @@ done
     esac
 
 
     esac
 
 
-  for wx_func in putws fputws wprintf vswprintf
+  for wx_func in putws fputws wprintf vswprintf vswscanf
   do
     { echo "$as_me:$LINENO: checking for $wx_func" >&5
 echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
   do
     { echo "$as_me:$LINENO: checking for $wx_func" >&5
 echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
@@ -38477,7 +36076,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test "$TOOLKIT" != "MSW"; then
 
 
 if test "$TOOLKIT" != "MSW"; then
 
-
+if test "$wxUSE_LIBICONV" != "no" ; then
 
 
 
 
 
 
@@ -38689,7 +36288,8 @@ _ACEOF
   fi
 
 
   fi
 
 
-LIBS="$LIBICONV $LIBS"
+    LIBS="$LIBICONV $LIBS"
+fi
 
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
 
 
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
 
@@ -39033,7 +36633,7 @@ _ACEOF
     fi
 fi
 
     fi
 fi
 
-if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then
+if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != 1 -a "$USE_UNIX" != 1; then
     { echo "$as_me:$LINENO: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5
 echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;}
     wxUSE_STACKWALKER=no
     { echo "$as_me:$LINENO: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5
 echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;}
     wxUSE_STACKWALKER=no
@@ -42613,12 +40213,77 @@ _ACEOF
                     { echo "$as_me:$LINENO: WARNING: wxMutex won't be recursive on this platform" >&5
 echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
         fi
                     { echo "$as_me:$LINENO: WARNING: wxMutex won't be recursive on this platform" >&5
 echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
         fi
+      fi
+
+            { echo "$as_me:$LINENO: checking for __thread keyword" >&5
+echo $ECHO_N "checking for __thread keyword... $ECHO_C" >&6; }
+if test "${wx_cv_cc___thread+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+          cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+
+                  static __thread int n = 0;
+                  static __thread int *p = 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  wx_cv_cc___thread=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_cc___thread=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_cc___thread" >&5
+echo "${ECHO_T}$wx_cv_cc___thread" >&6; }
+
+      if test "$wx_cv_cc___thread" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE___THREAD_KEYWORD 1
+_ACEOF
+
       fi
     fi
 
 else
     if test "$wxUSE_THREADS" = "yes" ; then
       case "${host}" in
       fi
     fi
 
 else
     if test "$wxUSE_THREADS" = "yes" ; then
       case "${host}" in
+        x86_64-*-mingw32* )
+        ;;
         *-*-mingw32* )
                         { echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5
 echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6; }
         *-*-mingw32* )
                         { echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5
 echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6; }
@@ -43578,9 +41243,9 @@ echo "${ECHO_T}no" >&6; }
   fi
 fi
 
   fi
 fi
 
-if test "$WXGTK20" = 1 ; then
+if test "$WXGTK2" = 1 ; then
   cat >>confdefs.h <<_ACEOF
   cat >>confdefs.h <<_ACEOF
-#define __WXGTK20__ $WXGTK20
+#define __WXGTK20__ $WXGTK2
 _ACEOF
 
   WXGTK12=1
 _ACEOF
 
   WXGTK12=1
@@ -43610,7 +41275,6 @@ fi
 DEBUG_CFLAGS=
 if test "$wxUSE_DEBUG_INFO" = "yes" ; then
     DEBUG_CFLAGS="-g"
 DEBUG_CFLAGS=
 if test "$wxUSE_DEBUG_INFO" = "yes" ; then
     DEBUG_CFLAGS="-g"
-    wxUSE_OPTIMISE=no
 fi
 
 if test "$wxUSE_DEBUG_GDB" = "yes" ; then
 fi
 
 if test "$wxUSE_DEBUG_GDB" = "yes" ; then
@@ -43740,9 +41404,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
     HAVE_DL_FUNCS=0
     HAVE_SHL_FUNCS=0
     if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
     HAVE_DL_FUNCS=0
     HAVE_SHL_FUNCS=0
     if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
-        if test "$USE_DARWIN" = 1; then
-                        HAVE_DL_FUNCS=1
-        elif test "$USE_DOS" = 1; then
+        if test "$USE_DOS" = 1; then
             HAVE_DL_FUNCS=0
         else
 
             HAVE_DL_FUNCS=0
         else
 
@@ -44095,7 +41757,7 @@ fi
 done
 
 
 done
 
 
-                if test "$HAVE_DL_FUNCS" = 1; then
+                        if test "$HAVE_DL_FUNCS" = 1; then
 
 for ac_func in dlerror
 do
 
 for ac_func in dlerror
 do
@@ -44192,7 +41854,7 @@ _ACEOF
 
 else
 
 
 else
 
-                    { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
+                        { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
 echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6; }
 if test "${ac_cv_lib_dl_dlerror+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
 done
 
 fi
 done
 
+            fi
         fi
         fi
+
+                if test "$USE_DARWIN" = 1; then
+                        HAVE_DL_FUNCS=1
         fi
 
         if test "$HAVE_DL_FUNCS" = 0; then
         fi
 
         if test "$HAVE_DL_FUNCS" = 0; then
@@ -44352,7 +42018,7 @@ _ACEOF
 
 fi
 
 
 fi
 
-if test "$USE_UNIX" = "1" ; then
+if test "$USE_UNIX" = 1 ; then
         if test "$wxUSE_MGL" != 1; then
                                 { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
 echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6; }
         if test "$wxUSE_MGL" != 1; then
                                 { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
 echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6; }
@@ -44480,7 +42146,7 @@ fi
 
 WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then
 
 WITH_PLUGIN_SDL=0
 if test "$wxUSE_SOUND" = "yes"; then
-  if test "$USE_UNIX" = "1" ; then
+  if test "$USE_UNIX" = 1 ; then
     if test "$wxUSE_LIBSDL" != "no"; then
 
 # Check whether --with-sdl-prefix was given.
     if test "$wxUSE_LIBSDL" != "no"; then
 
 # Check whether --with-sdl-prefix was given.
@@ -44817,7 +42483,7 @@ _ACEOF
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
 fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
 fi
 
-if test "$WXGTK20" = 1; then
+if test "$WXGTK2" = 1; then
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -45438,7 +43104,7 @@ _ACEOF
 fi
 
 if test "$wxUSE_DEBUGREPORT" = "yes"; then
 fi
 
 if test "$wxUSE_DEBUGREPORT" = "yes"; then
-    if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then
+    if test "$USE_UNIX" != 1 -a "$USE_WIN32" != 1; then
         { echo "$as_me:$LINENO: WARNING: Creating debug reports not currently supported on this system, disabled" >&5
 echo "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;}
         wxUSE_DEBUGREPORT=no
         { echo "$as_me:$LINENO: WARNING: Creating debug reports not currently supported on this system, disabled" >&5
 echo "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;}
         wxUSE_DEBUGREPORT=no
@@ -45538,6 +43204,77 @@ _ACEOF
   fi
 fi
 
   fi
 fi
 
+if test "$wxUSE_XLOCALE" == "yes" ; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_XLOCALE 1
+_ACEOF
+
+    { echo "$as_me:$LINENO: checking for locale_t" >&5
+echo $ECHO_N "checking for locale_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_locale_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <xlocale.h>
+                    #include <locale.h>
+
+typedef locale_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_locale_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_type_locale_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_locale_t" >&5
+echo "${ECHO_T}$ac_cv_type_locale_t" >&6; }
+if test $ac_cv_type_locale_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LOCALE_T 1
+_ACEOF
+
+
+fi
+
+fi
+
 if test "$wxUSE_LOG" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_LOG 1
 if test "$wxUSE_LOG" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_LOG 1
@@ -46501,7 +44238,7 @@ fi
 
 
 if test "$wxUSE_SOCKETS" = "yes"; then
 
 
 if test "$wxUSE_SOCKETS" = "yes"; then
-    if test "$wxUSE_MGL" = "1"; then
+    if test "$wxUSE_MGL" = 1; then
         { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5
 echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
         wxUSE_SOCKETS="no"
         { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5
 echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
         wxUSE_SOCKETS="no"
@@ -47043,6 +44780,78 @@ _ACEOF
 fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
 fi
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
+    if test "$wxUSE_IPV6" = "yes"; then
+        { echo "$as_me:$LINENO: checking whether we have sockaddr_in6" >&5
+echo $ECHO_N "checking whether we have sockaddr_in6... $ECHO_C" >&6; }
+if test "${wx_cv_type_sockaddr_in6+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+                cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+                        #include <sys/types.h>
+                        #include <sys/socket.h>
+                        #include <netinet/in.h>
+
+int
+main ()
+{
+
+                        struct sockaddr_in6 sa6;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  wx_cv_type_sockaddr_in6=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_type_sockaddr_in6=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_type_sockaddr_in6" >&5
+echo "${ECHO_T}$wx_cv_type_sockaddr_in6" >&6; }
+
+        if test "$wx_cv_type_sockaddr_in6"="yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define wxUSE_IPV6 1
+_ACEOF
+
+        else
+            { echo "$as_me:$LINENO: WARNING: IPv6 support not available... disabled" >&5
+echo "$as_me: WARNING: IPv6 support not available... disabled" >&2;}
+        fi
+    fi
+
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_SOCKETS 1
 _ACEOF
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_SOCKETS 1
 _ACEOF
@@ -47125,7 +44934,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
         if test "$TOOLKIT" = "MSW"; then
         wxUSE_JOYSTICK=yes
 
         if test "$TOOLKIT" = "MSW"; then
         wxUSE_JOYSTICK=yes
 
-        elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
+        elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
         if test "$USE_DARWIN" = 1; then
                         { echo "$as_me:$LINENO: checking headers have declarations needed for joystick support" >&5
 echo $ECHO_N "checking headers have declarations needed for joystick support... $ECHO_C" >&6; }
         if test "$USE_DARWIN" = 1; then
                         { echo "$as_me:$LINENO: checking headers have declarations needed for joystick support" >&5
 echo $ECHO_N "checking headers have declarations needed for joystick support... $ECHO_C" >&6; }
@@ -47190,7 +44999,7 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; }
         fi
 
         else
         fi
 
         else
-                if test "$wxUSE_MGL" != "1"; then
+                if test "$wxUSE_MGL" != 1; then
 
 for ac_header in linux/joystick.h
 do
 
 for ac_header in linux/joystick.h
 do
@@ -48006,6 +45815,13 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
+if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_NOTIFICATION_MESSAGE 1
+_ACEOF
+
+fi
+
 if test "$wxUSE_ODCOMBOBOX" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_ODCOMBOBOX 1
 if test "$wxUSE_ODCOMBOBOX" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_ODCOMBOBOX 1
@@ -48148,6 +45964,15 @@ _ACEOF
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
 
     USES_CONTROLS=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+
+            cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RICHEDIT 1
+_ACEOF
+
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RICHEDIT2 1
+_ACEOF
+
 fi
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
 fi
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
@@ -48234,7 +46059,7 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
+    if test "$wxUSE_COCOA" = 1 ; then
         { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
 echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
     else
         { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
 echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
     else
@@ -48323,9 +46148,6 @@ _ACEOF
 
     USE_HTML=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
 
     USE_HTML=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
-    if test "$wxUSE_MAC" = 1; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
-    fi
 fi
 if test "$wxUSE_WEBKIT" = "yes"; then
     if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
 fi
 if test "$wxUSE_WEBKIT" = "yes"; then
     if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
@@ -48404,6 +46226,9 @@ _ACEOF
     else
         wxUSE_WEBKIT=no
     fi
     else
         wxUSE_WEBKIT=no
     fi
+    if test "$wxUSE_WEBKIT" = "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
+    fi
 fi
 
 USE_XRC=0
 fi
 
 USE_XRC=0
@@ -48432,6 +46257,16 @@ _ACEOF
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui"
 fi
 
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui"
 fi
 
+USE_PROPGRID=0
+if test "$wxUSE_PROPGRID" = "yes"; then
+   cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROPGRID 1
+_ACEOF
+
+   USE_PROPGRID=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
+fi
+
 USE_STC=0
 if test "$wxUSE_STC" = "yes"; then
    cat >>confdefs.h <<\_ACEOF
 USE_STC=0
 if test "$wxUSE_STC" = "yes"; then
    cat >>confdefs.h <<\_ACEOF
@@ -48696,6 +46531,16 @@ _ACEOF
 fi
 
 
 fi
 
 
+if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then
+    if test "$wxUSE_OWNER_DRAWN" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_OWNER_DRAWN 1
+_ACEOF
+
+    fi
+fi
+
+
 if test "$wxUSE_MSW" = 1 ; then
 
     if test "$wxUSE_DC_CACHEING" = "yes"; then
 if test "$wxUSE_MSW" = 1 ; then
 
     if test "$wxUSE_DC_CACHEING" = "yes"; then
@@ -48712,13 +46557,6 @@ _ACEOF
 
     fi
 
 
     fi
 
-    if test "$wxUSE_OWNER_DRAWN" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_OWNER_DRAWN 1
-_ACEOF
-
-    fi
-
     if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
     if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
         cat >>confdefs.h <<\_ACEOF
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
@@ -48735,6 +46573,12 @@ _ACEOF
 
 fi
 
 
 fi
 
+if test "$wxUSE_AUTOID_MANAGEMENT" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_AUTOID_MANAGEMENT 1
+_ACEOF
+
+fi
 
 if test "$USE_WIN32" = 1 ; then
     if test "$wxUSE_INICONF" = "yes"; then
 
 if test "$USE_WIN32" = 1 ; then
     if test "$wxUSE_INICONF" = "yes"; then
@@ -48753,8 +46597,12 @@ _ACEOF
 fi
 
 
 fi
 
 
+if test "$wxUSE_MAC" = 1; then
+       wxUSE_GRAPHICS_CONTEXT="yes"
+fi
+
 if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
 if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
-   if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+   if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
       cat >>confdefs.h <<\_ACEOF
 #define wxUSE_GRAPHICS_CONTEXT 1
 _ACEOF
       cat >>confdefs.h <<\_ACEOF
 #define wxUSE_GRAPHICS_CONTEXT 1
 _ACEOF
@@ -49026,7 +46874,7 @@ fi
 
         if test "$wxUSE_GSTREAMER" = "yes"; then
             CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
 
         if test "$wxUSE_GSTREAMER" = "yes"; then
             CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
-            LIBS="$GST_LIBS $LIBS"
+            EXTRALIBS_MEDIA="$GST_LIBS"
 
             cat >>confdefs.h <<\_ACEOF
 #define wxUSE_GSTREAMER 1
 
             cat >>confdefs.h <<\_ACEOF
 #define wxUSE_GSTREAMER 1
@@ -49108,6 +46956,9 @@ if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_AUI" = "yes" ; then
         BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
     fi
     if test "$wxUSE_AUI" = "yes" ; then
         BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
     fi
+    if test "$wxUSE_PROPGRID" = "yes" ; then
+        BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
+    fi
     if test "$wxUSE_STC" = "yes" ; then
         BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
     fi
     if test "$wxUSE_STC" = "yes" ; then
         BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
     fi
@@ -49128,14 +46979,10 @@ if test "$wxUSE_MAC" = 1 ; then
     if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
         if test "$USE_DARWIN" = 1; then
             LDFLAGS="$LDFLAGS -framework QuickTime"
     if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
         if test "$USE_DARWIN" = 1; then
             LDFLAGS="$LDFLAGS -framework QuickTime"
-        else
-            LDFLAGS="$LDFLAGS -lQuickTimeLib"
         fi
     fi
     if test "$USE_DARWIN" = 1; then
         fi
     fi
     if test "$USE_DARWIN" = 1; then
-        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System"
-    else
-        LDFLAGS="$LDFLAGS -lCarbonLib"
+        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System"
     fi
 fi
 if test "$wxUSE_COCOA" = 1 ; then
     fi
 fi
 if test "$wxUSE_COCOA" = 1 ; then
@@ -49172,6 +47019,12 @@ if test "$wxUSE_GUI" = "yes"; then
     fi
 else
     SAMPLES_SUBDIRS="console"
     fi
 else
     SAMPLES_SUBDIRS="console"
+    if test "$wxUSE_SOCKETS" = "yes" ; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
+    fi
+    if test "$wxUSE_IPC" = "yes" ; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc"
+    fi
 fi
 
 
 fi
 
 
@@ -49200,6 +47053,8 @@ CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \
 C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
 CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
 CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS `
 C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
 CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
 CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS `
+OBJCFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $OBJCFLAGS `
+OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS `
 
 WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS`
 
 
 WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS`
 
@@ -49215,6 +47070,7 @@ LIBS=`echo $LIBS`
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
+EXTRALIBS_MEDIA="$GST_LIBS"
 EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 if test "$wxUSE_GUI" = "yes"; then
     EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
 EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 if test "$wxUSE_GUI" = "yes"; then
     EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
@@ -49263,7 +47119,7 @@ _ACEOF
             ;;
 
         *)
             ;;
 
         *)
-            for t in `echo $wxUNIV_THEMES | tr , ' ' | tr a-z A-Z`; do
+            for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[a-z]' '[A-Z]'`; do
                 cat >>confdefs.h <<_ACEOF
 #define wxUSE_THEME_$t 1
 _ACEOF
                 cat >>confdefs.h <<_ACEOF
 #define wxUSE_THEME_$t 1
 _ACEOF
 
 
 
 
 
 
-TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
+
+
+if test "$TOOLKIT" = "MAC"; then
+    TOOLKIT_LOWERCASE=osx
+else
+    TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
+fi
 
 
 
 
 
 
@@ -49342,7 +47204,7 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
 case "$TOOLKIT" in
     GTK)
         TOOLKIT_DESC="GTK+"
 case "$TOOLKIT" in
     GTK)
         TOOLKIT_DESC="GTK+"
-        if test "$WXGTK20" = 1; then
+        if test "$WXGTK2" = 1; then
             TOOLKIT_DESC="$TOOLKIT_DESC 2"
             if test "$wxUSE_GTKPRINT" = "yes" ; then
                 TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";
             TOOLKIT_DESC="$TOOLKIT_DESC 2"
             if test "$wxUSE_GTKPRINT" = "yes" ; then
                 TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";
@@ -49426,6 +47288,9 @@ fi
 
 
 
 
 
 
+
+
+
     if test "x$BAKEFILE_HOST" = "x"; then
                if test "x${host}" = "x" ; then
                        { { echo "$as_me:$LINENO: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&5
     if test "x$BAKEFILE_HOST" = "x"; then
                if test "x${host}" = "x" ; then
                        { { echo "$as_me:$LINENO: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&5
@@ -49960,14 +47825,20 @@ else
 fi
 
 
 fi
 
 
-    case ${BAKEFILE_HOST} in
-        *-hp-hpux* )
-                                    INSTALL_DIR="mkdir -p"
-            ;;
-        * )
-                                    INSTALL_DIR='$(INSTALL) -d'
-            ;;
-    esac
+            { echo "$as_me:$LINENO: checking for command to install directories" >&5
+echo $ECHO_N "checking for command to install directories... $ECHO_C" >&6; }
+    INSTALL_TEST_DIR=acbftest$$
+    $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
+    if test $? = 0 -a -d $INSTALL_TEST_DIR; then
+        rmdir $INSTALL_TEST_DIR
+                        INSTALL_DIR='$(INSTALL) -d'
+        { echo "$as_me:$LINENO: result: $INSTALL -d" >&5
+echo "${ECHO_T}$INSTALL -d" >&6; }
+    else
+        INSTALL_DIR="mkdir -p"
+        { echo "$as_me:$LINENO: result: mkdir -p" >&5
+echo "${ECHO_T}mkdir -p" >&6; }
+    fi
 
 
     LDFLAGS_GUI=
 
 
     LDFLAGS_GUI=
@@ -50061,7 +47932,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
                 PLATFORM_BEOS=1
             ;;
             * )
                 PLATFORM_BEOS=1
             ;;
             * )
-                                            ;;
+                                           ;;
         esac
     fi
 
         esac
     fi
 
@@ -50240,6 +48111,10 @@ objects=""
 linking_flag="-dynamiclib"
 ldargs="-r -keep_private_externs -nostdlib"
 
 linking_flag="-dynamiclib"
 ldargs="-r -keep_private_externs -nostdlib"
 
+if test "x${D}CXX" = "x"; then
+    CXX="c++"
+fi
+
 while test ${D}# -gt 0; do
     case ${D}1 in
 
 while test ${D}# -gt 0; do
     case ${D}1 in
 
@@ -50253,6 +48128,12 @@ while test ${D}# -gt 0; do
         shift
         ;;
 
         shift
         ;;
 
+       -arch|-isysroot)
+        # collect these options and values
+        ldargs="${D}{ldargs} ${D}1 ${D}2"
+        shift
+        ;;
+
        -s|-Wl,*)
         # collect these load args
         ldargs="${D}{ldargs} ${D}1"
        -s|-Wl,*)
         # collect these load args
         ldargs="${D}{ldargs} ${D}1"
@@ -50292,9 +48173,9 @@ status=0
 # Link one module containing all the others
 #
 if test ${D}{verbose} = 1; then
 # Link one module containing all the others
 #
 if test ${D}{verbose} = 1; then
-    echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
+    echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
 fi
 fi
-c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
+${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
 status=${D}?
 
 #
 status=${D}?
 
 #
@@ -50303,9 +48184,9 @@ status=${D}?
 #
 if test ${D}{status} = 0; then
     if test ${D}{verbose} = 1; then
 #
 if test ${D}{status} = 0; then
     if test ${D}{verbose} = 1; then
-        echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
+        echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
     fi
     fi
-    c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}
+    ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}
     status=${D}?
 fi
 
     status=${D}?
 fi
 
@@ -50320,7 +48201,7 @@ EOF
         chmod +x shared-ld-sh
 
         SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
         chmod +x shared-ld-sh
 
         SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
-        SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
+        SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"
 
 
                                 { echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
 
 
                                 { echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
@@ -51003,7 +48884,8 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
-      *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
+      *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-k*bsd*-gnu | *-*-mirbsd* )
         if test "x$SUNCXX" = "xyes"; then
             SONAME_FLAG="-h "
         else
         if test "x$SUNCXX" = "xyes"; then
             SONAME_FLAG="-h "
         else
@@ -51108,7 +48990,7 @@ D='$'
 cat <<EOF >bk-deps
 #!/bin/sh
 
 cat <<EOF >bk-deps
 #!/bin/sh
 
-# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# This script is part of Bakefile (http://www.bakefile.org) autoconf
 # script. It is used to track C/C++ files dependencies in portable way.
 #
 # Permission is given to use this file in any way.
 # script. It is used to track C/C++ files dependencies in portable way.
 #
 # Permission is given to use this file in any way.
@@ -51122,10 +49004,8 @@ mkdir -p ${D}DEPSDIR
 if test ${D}DEPSMODE = gcc ; then
     ${D}* ${D}{DEPSFLAG}
     status=${D}?
 if test ${D}DEPSMODE = gcc ; then
     ${D}* ${D}{DEPSFLAG}
     status=${D}?
-    if test ${D}{status} != 0 ; then
-        exit ${D}{status}
-    fi
-    # move created file to the location we want it in:
+
+    # determine location of created files:
     while test ${D}# -gt 0; do
         case "${D}1" in
             -o )
     while test ${D}# -gt 0; do
         case "${D}1" in
             -o )
@@ -51142,6 +49022,14 @@ if test ${D}DEPSMODE = gcc ; then
     done
     depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
     depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
     done
     depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
     depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
+
+    # if the compiler failed, we're done:
+    if test ${D}{status} != 0 ; then
+        rm -f ${D}depfile
+        exit ${D}{status}
+    fi
+
+    # move created file to the location we want it in:
     if test -f ${D}depfile ; then
         sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
         rm -f ${D}depfile
     if test -f ${D}depfile ; then
         sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
         rm -f ${D}depfile
 
 
 
 
 
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.2"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.3"
 
 
 
 
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3"
 
 
 
 
 
 
@@ -51548,7 +49436,7 @@ D='$'
 cat <<EOF >bk-make-pch
 #!/bin/sh
 
 cat <<EOF >bk-make-pch
 #!/bin/sh
 
-# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# This script is part of Bakefile (http://www.bakefile.org) autoconf
 # script. It is used to generated precompiled headers.
 #
 # Permission is given to use this file in any way.
 # script. It is used to generated precompiled headers.
 #
 # Permission is given to use this file in any way.
@@ -51735,6 +49623,11 @@ EOF
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
     fi
 
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
     fi
 
+    COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
+    fi
+
     COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
     COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
@@ -51780,6 +49673,11 @@ EOF
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
     fi
 
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
     fi
 
+    COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
+    fi
+
     COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
     COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
@@ -51820,6 +49718,11 @@ EOF
         COND_MONOLITHIC_0_USE_MEDIA_1=""
     fi
 
         COND_MONOLITHIC_0_USE_MEDIA_1=""
     fi
 
+    COND_MONOLITHIC_0_USE_PROPGRID_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
+        COND_MONOLITHIC_0_USE_PROPGRID_1=""
+    fi
+
     COND_MONOLITHIC_0_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_USE_QA_1=""
     COND_MONOLITHIC_0_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_USE_QA_1=""
@@ -51880,39 +49783,29 @@ EOF
         COND_PLATFORM_MACOSX_1=""
     fi
 
         COND_PLATFORM_MACOSX_1=""
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_=""
+    COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_MSDOS" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
     fi
 
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1=""
     fi
 
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
     fi
 
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1=""
     fi
 
     fi
 
-    COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1=""
-    fi
-
-    COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
-    fi
-
-    COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
+    COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
     fi
 
     COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
     fi
 
     COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
@@ -51920,6 +49813,11 @@ EOF
         COND_PLATFORM_MACOSX_1_USE_GUI_1=""
     fi
 
         COND_PLATFORM_MACOSX_1_USE_GUI_1=""
     fi
 
+    COND_PLATFORM_MACOSX_1_USE_OPENGL_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+        COND_PLATFORM_MACOSX_1_USE_OPENGL_1=""
+    fi
+
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
@@ -51930,6 +49828,21 @@ EOF
         COND_PLATFORM_MACOS_1=""
     fi
 
         COND_PLATFORM_MACOS_1=""
     fi
 
+    COND_PLATFORM_MAC_0="#"
+    if test "x$PLATFORM_MAC" = "x0" ; then
+        COND_PLATFORM_MAC_0=""
+    fi
+
+    COND_PLATFORM_MAC_1="#"
+    if test "x$PLATFORM_MAC" = "x1" ; then
+        COND_PLATFORM_MAC_1=""
+    fi
+
+    COND_PLATFORM_MSDOS_0="#"
+    if test "x$PLATFORM_MSDOS" = "x0" ; then
+        COND_PLATFORM_MSDOS_0=""
+    fi
+
     COND_PLATFORM_MSDOS_1="#"
     if test "x$PLATFORM_MSDOS" = "x1" ; then
         COND_PLATFORM_MSDOS_1=""
     COND_PLATFORM_MSDOS_1="#"
     if test "x$PLATFORM_MSDOS" = "x1" ; then
         COND_PLATFORM_MSDOS_1=""
@@ -51985,6 +49898,21 @@ EOF
         COND_SHARED_0=""
     fi
 
         COND_SHARED_0=""
     fi
 
+    COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="#"
+    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
+        COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0=""
+    fi
+
+    COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="#"
+    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
+        COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
+    fi
+
+    COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
+    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
+        COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
+    fi
+
     COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
         COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
     COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
         COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
@@ -52090,6 +50018,11 @@ EOF
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
     fi
 
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
     fi
 
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
+    fi
+
     COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
         COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
     COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
         COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
@@ -52110,16 +50043,6 @@ EOF
         COND_TOOLKIT_MAC=""
     fi
 
         COND_TOOLKIT_MAC=""
     fi
 
-    COND_TOOLKIT_MAC_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_MAC_USE_GUI_1=""
-    fi
-
-    COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
-    fi
-
     COND_TOOLKIT_MGL="#"
     if test "x$TOOLKIT" = "xMGL" ; then
         COND_TOOLKIT_MGL=""
     COND_TOOLKIT_MGL="#"
     if test "x$TOOLKIT" = "xMGL" ; then
         COND_TOOLKIT_MGL=""
@@ -52165,6 +50088,41 @@ EOF
         COND_TOOLKIT_MSW_WXUNIV_0=""
     fi
 
         COND_TOOLKIT_MSW_WXUNIV_0=""
     fi
 
+    COND_TOOLKIT_OSX_CARBON="#"
+    if test "x$TOOLKIT" = "xOSX_CARBON" ; then
+        COND_TOOLKIT_OSX_CARBON=""
+    fi
+
+    COND_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
+    fi
+
+    COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
+    fi
+
+    COND_TOOLKIT_OSX_COCOA="#"
+    if test "x$TOOLKIT" = "xOSX_COCOA" ; then
+        COND_TOOLKIT_OSX_COCOA=""
+    fi
+
+    COND_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
+    fi
+
+    COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
+    fi
+
+    COND_TOOLKIT_OSX_IPHONE="#"
+    if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
+        COND_TOOLKIT_OSX_IPHONE=""
+    fi
+
     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
         COND_TOOLKIT_PM=""
     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
         COND_TOOLKIT_PM=""
@@ -52265,6 +50223,11 @@ EOF
         COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
         COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
+    COND_USE_OPENGL_1="#"
+    if test "x$USE_OPENGL" = "x1" ; then
+        COND_USE_OPENGL_1=""
+    fi
+
     COND_USE_PCH_1="#"
     if test "x$USE_PCH" = "x1" ; then
         COND_USE_PCH_1=""
     COND_USE_PCH_1="#"
     if test "x$USE_PCH" = "x1" ; then
         COND_USE_PCH_1=""
@@ -52463,7 +50426,7 @@ fi
 
     MACSETFILE="\$(SETFILE)"
 
 
     MACSETFILE="\$(SETFILE)"
 
-            if test "$wxUSE_MAC" = 1; then
+            if test "$wxUSE_OSX_CARBON" = 1; then
         POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
         RESCOMP="$REZ"
         WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
         POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
         RESCOMP="$REZ"
         WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
@@ -52500,7 +50463,11 @@ echo "$as_me: WARNING: *** --enable-precomp-headers is not recommended" >&2;}
 echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&2;}
     fi
 
 echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&2;}
     fi
 
-    CPPFLAGS="-DWX_PRECOMP $CPPFLAGS"
+    # Our WX_PRECOMP flag does not make sense for any language except C++ because
+    # the headers that benefit from precompilation are mostly C++ headers.
+    CXXFLAGS="-DWX_PRECOMP $CXXFLAGS"
+    # When Bakefile can do multi-language PCH (e.g. C++ and Objective-C++) enable this:
+    #OBJCXXFLAGS="-DWX_PRECOMP $CXXFLAGS"
 fi
 
 
 fi
 
 
@@ -52665,6 +50632,9 @@ ac_config_files="$ac_config_files lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.
 ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in"
 
 
 ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in"
 
 
+ac_config_files="$ac_config_files utils/ifacecheck/rungccxml.sh"
+
+
 if test "$wx_cv_version_script" = "yes"; then
     ac_config_files="$ac_config_files version-script"
 
 if test "$wx_cv_version_script" = "yes"; then
     ac_config_files="$ac_config_files version-script"
 
@@ -52679,7 +50649,8 @@ ac_config_commands="$ac_config_commands wx-config"
 if test "$wxWITH_SUBDIRS" != "no"; then
 if test "$wxUSE_GUI" = "yes"; then
     SUBDIRS="samples demos utils"
 if test "$wxWITH_SUBDIRS" != "no"; then
 if test "$wxUSE_GUI" = "yes"; then
     SUBDIRS="samples demos utils"
-else         SUBDIRS="samples utils"
+else
+            SUBDIRS="samples utils"
 fi
 
 
 fi
 
 
@@ -52812,34 +50783,40 @@ echo "${ECHO_T}no" >&6; }
 
 
 
 
 
 
-for subdir in `echo $SUBDIRS`; do
+for subdir in $SUBDIRS; do
     if test -d ${srcdir}/${subdir} ; then
         if test "$wxUSE_GUI" = "yes"; then
             if test ${subdir} = "samples"; then
                                                 makefiles="samples/Makefile.in $makefiles"
     if test -d ${srcdir}/${subdir} ; then
         if test "$wxUSE_GUI" = "yes"; then
             if test ${subdir} = "samples"; then
                                                 makefiles="samples/Makefile.in $makefiles"
-                for sample in `echo $SAMPLES_SUBDIRS`; do
+                for sample in $SAMPLES_SUBDIRS; do
                     if test -d $srcdir/samples/$sample; then
                         makefiles="samples/$sample/Makefile.in $makefiles"
                     fi
                 done
             else
                     if test -d $srcdir/samples/$sample; then
                         makefiles="samples/$sample/Makefile.in $makefiles"
                     fi
                 done
             else
-                                                                disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`;
+                                                                disabled_var=DISABLED_`echo $subdir | tr '[a-z]' '[A-Z]'`
                 eval "disabled=\$$disabled_var"
                 disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
                 makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
             fi
                 eval "disabled=\$$disabled_var"
                 disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
                 makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
             fi
-        else                                     if test ${subdir} = "samples"; then
-                makefiles="samples/Makefile.in samples/console/Makefile.in"
+        else
+                                    if test ${subdir} = "samples"; then
+                                                makefiles="samples/Makefile.in $makefiles"
+                for sample in `echo $SAMPLES_SUBDIRS`; do
+                    if test -d $srcdir/samples/$sample; then
+                        makefiles="samples/$sample/Makefile.in $makefiles"
+                    fi
+                done
             elif test ${subdir} = "utils"; then
                 makefiles=""
             elif test ${subdir} = "utils"; then
                 makefiles=""
-                for util in HelpGen tex2rtf ; do
+                for util in ifacecheck ; do
                     if test -d $srcdir/utils/$util ; then
                     if test -d $srcdir/utils/$util ; then
-                        makefiles="utils/$util/Makefile.in \
-                                   utils/$util/src/Makefile.in \
+                        makefiles="utils/$util/src/Makefile.in \
                                    $makefiles"
                     fi
                 done
                                    $makefiles"
                     fi
                 done
-            else                 makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+            else
+                                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
             fi
         fi
 
             fi
         fi
 
@@ -53427,6 +51404,7 @@ do
     "rcdefs.h") CONFIG_COMMANDS="$CONFIG_COMMANDS rcdefs.h" ;;
     "lib/wx/config/${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in" ;;
     "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" ;;
     "rcdefs.h") CONFIG_COMMANDS="$CONFIG_COMMANDS rcdefs.h" ;;
     "lib/wx/config/${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in" ;;
     "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" ;;
+    "utils/ifacecheck/rungccxml.sh") CONFIG_FILES="$CONFIG_FILES utils/ifacecheck/rungccxml.sh" ;;
     "version-script") CONFIG_FILES="$CONFIG_FILES version-script" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "wx-config") CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;;
     "version-script") CONFIG_FILES="$CONFIG_FILES version-script" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "wx-config") CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;;
@@ -53655,9 +51633,11 @@ CXXWARNINGS!$CXXWARNINGS$ac_delim
 EXTRALIBS!$EXTRALIBS$ac_delim
 EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim
 EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim
 EXTRALIBS!$EXTRALIBS$ac_delim
 EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim
 EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim
+EXTRALIBS_MEDIA!$EXTRALIBS_MEDIA$ac_delim
 EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim
 EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim
 EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim
 EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim
 EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim
 EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim
+EXTRALIBS_STC!$EXTRALIBS_STC$ac_delim
 WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim
 EXTRALIBS_GTKPRINT!$EXTRALIBS_GTKPRINT$ac_delim
 EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
 WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim
 EXTRALIBS_GTKPRINT!$EXTRALIBS_GTKPRINT$ac_delim
 EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
@@ -53726,8 +51706,6 @@ GCC_PCH!$GCC_PCH$ac_delim
 ICC_PCH!$ICC_PCH$ac_delim
 BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
 COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
 ICC_PCH!$ICC_PCH$ac_delim
 BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
 COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
-COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -53769,6 +51747,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
+COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
 COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
 COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
 COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
 COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
 COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
 COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
@@ -53789,6 +51769,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1$ac_de
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
+COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
@@ -53798,6 +51779,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1$ac_de
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
+COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
@@ -53806,6 +51788,7 @@ COND_MONOLITHIC_0_USE_GUI_1!$COND_MONOLITHIC_0_USE_GUI_1$ac_delim
 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim
 COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
 COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim
 COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
 COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
+COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim
 COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
 COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
 COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
 COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
@@ -53818,16 +51801,18 @@ COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1!$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1$a
 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1$ac_delim
 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim
 COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim
 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1$ac_delim
 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim
 COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_!$COND_PLATFORM_MACOSX_1_TOOLKIT_$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_GTK!$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF!$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim
+COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
 COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
 COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
+COND_PLATFORM_MACOSX_1_USE_OPENGL_1!$COND_PLATFORM_MACOSX_1_USE_OPENGL_1$ac_delim
 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
 COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim
 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
 COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim
+COND_PLATFORM_MAC_0!$COND_PLATFORM_MAC_0$ac_delim
+COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim
+COND_PLATFORM_MSDOS_0!$COND_PLATFORM_MSDOS_0$ac_delim
 COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
 COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
 COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
 COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
 COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
 COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
@@ -53839,6 +51824,9 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim
 COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
 COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
 COND_SHARED_0!$COND_SHARED_0$ac_delim
 COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
 COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
 COND_SHARED_0!$COND_SHARED_0$ac_delim
+COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
+COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
+COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
@@ -53856,16 +51844,6 @@ COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_
 COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
 COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
 COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
 COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
 COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
 COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
-COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
-COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
-COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -53907,6 +51885,15 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
+COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
 COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
 COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
 COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
 COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
 COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
 COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
@@ -53916,6 +51903,13 @@ COND_TOOLKIT_MSW!$COND_TOOLKIT_MSW$ac_delim
 COND_TOOLKIT_MSW_USE_GUI_1!$COND_TOOLKIT_MSW_USE_GUI_1$ac_delim
 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_delim
 COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim
 COND_TOOLKIT_MSW_USE_GUI_1!$COND_TOOLKIT_MSW_USE_GUI_1$ac_delim
 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_delim
 COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim
+COND_TOOLKIT_OSX_CARBON!$COND_TOOLKIT_OSX_CARBON$ac_delim
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim
 COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
 COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0$ac_delim
 COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
 COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0$ac_delim
@@ -53936,6 +51930,7 @@ COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim
 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
 COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
 COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
 COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
 COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
+COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
 COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
 COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
 COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
 COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
 COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
 COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
@@ -53987,6 +51982,47 @@ WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
 GUIDIST!$GUIDIST$ac_delim
 DISTDIR!$DISTDIR$ac_delim
 SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
 GUIDIST!$GUIDIST$ac_delim
 DISTDIR!$DISTDIR$ac_delim
 SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
+_ACEOF
+
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+    break
+  elif $ac_last_try; then
+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+  ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  cat >conf$$subs.sed <<_ACEOF
 LDFLAGS_GL!$LDFLAGS_GL$ac_delim
 OPENGL_LIBS!$OPENGL_LIBS$ac_delim
 DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
 LDFLAGS_GL!$LDFLAGS_GL$ac_delim
 OPENGL_LIBS!$OPENGL_LIBS$ac_delim
 DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
@@ -54006,7 +52042,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -54024,8 +52060,8 @@ if test -n "$ac_eof"; then
 fi
 
 cat >>$CONFIG_STATUS <<_ACEOF
 fi
 
 cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
 _ACEOF
 sed '
 s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
 _ACEOF
 sed '
 s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -54038,6 +52074,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
 ' >>$CONFIG_STATUS <conf$$subs.sed
 rm -f conf$$subs.sed
 cat >>$CONFIG_STATUS <<_ACEOF
 ' >>$CONFIG_STATUS <conf$$subs.sed
 rm -f conf$$subs.sed
 cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
 CEOF$ac_eof
 _ACEOF
 
 CEOF$ac_eof
 _ACEOF
 
@@ -54285,7 +52323,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed 's/|#_!!_#|//g' >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
@@ -54413,6 +52451,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
          ;;
     "lib/wx/config/${TOOLCHAIN_FULLNAME}":F)  chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME}  ;;
     "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}":F)  chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}  ;;
          ;;
     "lib/wx/config/${TOOLCHAIN_FULLNAME}":F)  chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME}  ;;
     "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}":F)  chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}  ;;
+    "utils/ifacecheck/rungccxml.sh":F)  chmod +x utils/ifacecheck/rungccxml.sh  ;;
     "wx-config":C)  rm -f wx-config
                      ${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config
                     ;;
     "wx-config":C)  rm -f wx-config
                      ${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config
                     ;;