added --enable-uxtheme option

[wxWidgets.git] / configure
diff --git a/configure b/configure

index af162f6ddb88cc67ccc66dfbc1ba1f15415459f3..e1bd12b4c40af7e7330e99cf38847dcddb57b12b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
  #! /bin/sh
  #! /bin/sh
-# From configure.in Id: configure.in.
+# From configure.in Id: configure.in 47597 2007-07-20 18:27:35Z PC .
  # 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.
  #
@@ -707,6 +707,8 @@ PANGOFT2_CFLAGS
  PANGOFT2_LIBS
  PANGOXFT_CFLAGS
  PANGOXFT_LIBS
  PANGOFT2_LIBS
  PANGOXFT_CFLAGS
  PANGOXFT_LIBS
+CFLAGS_VISIBILITY
+CXXFLAGS_VISIBILITY
  REZ
  DEREZ
  SETFILE
  REZ
  DEREZ
  SETFILE
@@ -724,8 +726,10 @@ CAIRO_CFLAGS
  CAIRO_LIBS
  GST_CFLAGS
  GST_LIBS
  CAIRO_LIBS
  GST_CFLAGS
  GST_LIBS
-CORE_BASE_LIBS
-CORE_GUI_LIBS
+ALL_WX_LIBS
+BUILT_WX_LIBS
+STD_BASE_LIBS
+STD_GUI_LIBS
  wxUSE_ZLIB
  wxUSE_REGEX
  wxUSE_EXPAT
  wxUSE_ZLIB
  wxUSE_REGEX
  wxUSE_EXPAT
@@ -1629,17 +1633,26 @@ if test -n "$ac_init_help"; then
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-gui            use GUI classes
+  --disable-gui           don't build GUI parts of the library
    --enable-monolithic     build wxWidgets as single library
    --enable-plugins        build parts of wxWidgets as loadable components
    --enable-monolithic     build wxWidgets as single library
    --enable-plugins        build parts of wxWidgets as loadable components
+  --enable-official_build official build of wxWidgets (win32 DLL only)
+  --enable-vendor=VENDOR  vendor name (win32 DLL only)
+  --disable-all-features  disable all optional features to build minimal library
    --enable-universal      use wxWidgets GUI controls instead of native ones
    --enable-nanox          use NanoX
    --disable-gtk2          use GTK+ 1.2 instead of 2.0
    --enable-gpe            use GNOME PDA Environment features if possible
    --enable-universal      use wxWidgets GUI controls instead of native ones
    --enable-nanox          use NanoX
    --disable-gtk2          use GTK+ 1.2 instead of 2.0
    --enable-gpe            use GNOME PDA Environment features if possible
-  --enable-shared         create shared library code
-  --enable-optimise       create optimised code
+  --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-debug          same as debug_flag and debug_info
    --enable-stl            use STL for containers
+  --enable-std_iostreams  use standard C++ stream classes
+  --enable-std_string     use standard C++ string classes
+  --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-extended_rtti  use extended RTTI (XTI)
    --enable-omf            use OMF object format
    --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)
    --enable-extended_rtti  use extended RTTI (XTI)
    --enable-omf            use OMF object format
    --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)
@@ -1657,6 +1670,8 @@ Optional Features:
    --enable-compat26       enable wxWidgets 2.6 compatibility
    --disable-compat28      disable wxWidgets 2.8 compatibility
    --disable-rpath         disable use of rpath for uninstalled builds
    --enable-compat26       enable wxWidgets 2.6 compatibility
    --disable-compat28      disable wxWidgets 2.8 compatibility
    --disable-rpath         disable use of rpath for uninstalled builds
+  --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-config         use wxConfig (and derived) classes
    --enable-protocols      use wxProtocol and derived classes
    --enable-intl           use internationalization system
    --enable-config         use wxConfig (and derived) classes
    --enable-protocols      use wxProtocol and derived classes
@@ -1667,8 +1682,12 @@ Optional Features:
    --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.)
+  --enable-baseevtloop    use event loop in console programs too
+  --enable-epoolloop      use wxEpollDispatcher class (Linux only)
+  --enable-selectloop     use wxSelectDispatcher class
    --enable-apple_ieee     use the Apple IEEE codec
    --enable-arcstream      use wxArchive streams
    --enable-apple_ieee     use the Apple IEEE codec
    --enable-arcstream      use wxArchive streams
+  --enable-base64         use base64 encoding/decoding functions
    --enable-backtrace      use wxStackWalker class for getting backtraces
    --enable-catch_segvs    catch signals in wxApp::OnFatalException (Unix only)
    --enable-cmdline        use wxCmdLineParser class
    --enable-backtrace      use wxStackWalker class for getting backtraces
    --enable-catch_segvs    catch signals in wxApp::OnFatalException (Unix only)
    --enable-cmdline        use wxCmdLineParser class
@@ -1689,11 +1708,7 @@ 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-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)
-  --enable-utf8           use UTF-8 representation for strings (Unix only)
    --enable-snglinst       use wxSingleInstanceChecker class
    --enable-snglinst       use wxSingleInstanceChecker class
-  --enable-std_iostreams  use standard C++ stream classes
-  --enable-std_string     use standard C++ string classes
    --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
@@ -1702,7 +1717,6 @@ 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-unicode        compile wxString with Unicode support
    --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-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
@@ -1734,10 +1748,11 @@ Optional Features:
    --enable-richtext       use wxRichTextCtrl
    --enable-graphics_ctx   use graphics context 2D drawing API
    --enable-postscript     use wxPostscriptDC device context (default for gtk+)
    --enable-richtext       use wxRichTextCtrl
    --enable-graphics_ctx   use graphics context 2D drawing API
    --enable-postscript     use wxPostscriptDC device context (default for gtk+)
+  --enable-svg            use wxSVGFileDC device context
    --enable-clipboard      use wxClipboard class
    --enable-dnd            use Drag'n'Drop classes
    --enable-metafile       use win32 metafiles
    --enable-clipboard      use wxClipboard class
    --enable-dnd            use Drag'n'Drop classes
    --enable-metafile       use win32 metafiles
-  --enable-controls       use all usual controls
+  --disable-controls      disable compilation of all standard controls
    --enable-accel          use accelerators
    --enable-animatectrl    use wxAnimationCtrl class
    --enable-button         use wxButton class
    --enable-accel          use accelerators
    --enable-animatectrl    use wxAnimationCtrl class
    --enable-button         use wxButton class
@@ -1757,6 +1772,7 @@ Optional Features:
    --enable-dirpicker      use wxDirPickerCtrl class
    --enable-display        use wxDisplay class
    --enable-detect_sm      use code to detect X11 session manager
    --enable-dirpicker      use wxDirPickerCtrl class
    --enable-display        use wxDisplay class
    --enable-detect_sm      use code to detect X11 session manager
+  --enable-editablebox    use wxEditableListBox class
    --enable-filepicker     use wxFilePickerCtrl class
    --enable-fontpicker     use wxFontPickerCtrl class
    --enable-gauge          use wxGauge class
    --enable-filepicker     use wxFilePickerCtrl class
    --enable-fontpicker     use wxFontPickerCtrl class
    --enable-gauge          use wxGauge class
@@ -1784,6 +1800,7 @@ Optional Features:
    --enable-stattext       use wxStaticText class
    --enable-statusbar      use wxStatusBar class
    --enable-tabdialog      use wxTabControl class
    --enable-stattext       use wxStaticText class
    --enable-statusbar      use wxStatusBar class
    --enable-tabdialog      use wxTabControl class
+  --enable-taskbaricon    use wxTaskBarIcon class
    --enable-textctrl       use wxTextCtrl class
    --enable-togglebtn      use wxToggleButton class
    --enable-toolbar        use wxToolBar class
    --enable-textctrl       use wxTextCtrl class
    --enable-togglebtn      use wxToggleButton class
    --enable-toolbar        use wxToolBar class
@@ -1819,7 +1836,6 @@ Optional Features:
    --enable-metafiles      use wxMetaFile (Win32 only)
    --enable-dragimage      use wxDragImage
    --enable-accessibility  enable accessibility support
    --enable-metafiles      use wxMetaFile (Win32 only)
    --enable-dragimage      use wxDragImage
    --enable-accessibility  enable accessibility support
-  --enable-dccache        cache temporary wxDC objects (Win32 only)
    --enable-palette        use wxPalette class
    --enable-image          use wxImage class
    --enable-gif            use gif images (GIF file format)
    --enable-palette        use wxPalette class
    --enable-image          use wxImage class
    --enable-gif            use gif images (GIF file format)
@@ -1829,8 +1845,8 @@ Optional Features:
    --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-pnm            use pnm images (PNM file format)
    --enable-xpm            use xpm images (XPM file format)
    --enable-icocur         use Windows ICO and CUR formats
-  --enable-official_build official build of wxWidgets (win32 DLL only)
-  --enable-vendor=VENDOR  vendor name (win32 DLL only)
+  --enable-dccache        cache temporary wxDC objects (Win32 only)
+  --enable-uxtheme        enable support for Windows XP themed look (Win32 only)
    --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
@@ -1846,6 +1862,8 @@ Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    --without-subdirs       don't generate makefiles for samples/demos/...
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    --without-subdirs       don't generate makefiles for samples/demos/...
+  --with-flavour=NAME     specify a name to identify this build
+  --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-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"
    --with-motif            use Motif/Lesstif
    --with-mac              use Mac OS X
@@ -1862,18 +1880,16 @@ Optional Packages:
    --with-libtiff          use libtiff (TIFF file format)
    --with-libxpm           use libxpm (XPM file format)
    --with-libmspack        use libmspack (CHM help files loading)
    --with-libtiff          use libtiff (TIFF file format)
    --with-libxpm           use libxpm (XPM file format)
    --with-libmspack        use libmspack (CHM help files loading)
-  --with-sdl              use SDL for audio on Unix
-  --with-gnomeprint       use GNOME print for printing under GNOME
+  --without-gnomeprint    don't use GNOME printing libraries
    --with-gnomevfs         use GNOME VFS for associating MIME types
    --with-hildon           use Hildon framework for Nokia 770
    --with-opengl           use OpenGL (or Mesa)
    --with-gnomevfs         use GNOME VFS for associating MIME types
    --with-hildon           use Hildon framework for Nokia 770
    --with-opengl           use OpenGL (or Mesa)
-  --with-themes=all|list  use only the specified comma-separated list of wxUniversal themes
    --with-dmalloc          use dmalloc library (http://dmalloc.com/)
    --with-dmalloc          use dmalloc library (http://dmalloc.com/)
+  --with-sdl              use SDL for audio on Unix
    --with-regex            enable support for wxRegEx class
    --with-zlib             use zlib for LZW compression
    --with-odbc             use the IODBC and wxODBC classes
    --with-expat            enable XML support using expat parser
    --with-regex            enable support for wxRegEx class
    --with-zlib             use zlib for LZW compression
    --with-odbc             use the IODBC and wxODBC classes
    --with-expat            enable XML support using expat parser
-  --with-flavour=NAME     specify a name to identify this build
    --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
    --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
    --with-x                use the X Window System
    --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
    --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
    --with-x                use the X Window System
@@ -2899,464 +2915,33 @@ esac
            touch ${wx_arg_cache_file}
  
  
            touch ${wx_arg_cache_file}
  
  
-DEBUG_CONFIGURE=0
-if test $DEBUG_CONFIGURE = 1; then
-  DEFAULT_wxUSE_UNIVERSAL=no
-  DEFAULT_wxUSE_STL=no
-  DEFAULT_wxUSE_EXTENDED_RTTI=no
+DEFAULT_wxUSE_ALL_FEATURES=yes
  
  
-  DEFAULT_wxUSE_NANOX=no
+DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
+DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
  
  
-  DEFAULT_wxUSE_THREADS=yes
+DEFAULT_wxUSE_DMALLOC=no
+DEFAULT_wxUSE_LIBGNOMEVFS=no
+DEFAULT_wxUSE_LIBHILDON=no
+DEFAULT_wxUSE_LIBMSPACK=no
+DEFAULT_wxUSE_LIBSDL=no
+DEFAULT_wxUSE_ODBC=no
+DEFAULT_wxUSE_OPENGL=no
  
  
-  DEFAULT_wxUSE_SHARED=${DEFAULT_wxUSE_SHARED:-yes}
-  DEFAULT_wxUSE_OPTIMISE=no
-  DEFAULT_wxUSE_PROFILE=no
-  DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_VARARG_MACROS=no
-  DEFAULT_wxUSE_NO_RTTI=no
-  DEFAULT_wxUSE_NO_EXCEPTIONS=no
-  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
-  DEFAULT_wxUSE_RPATH=yes
-  DEFAULT_wxUSE_PERMISSIVE=no
-  DEFAULT_wxUSE_DEBUG_FLAG=yes
-  DEFAULT_wxUSE_DEBUG_INFO=yes
-  DEFAULT_wxUSE_DEBUG_GDB=yes
-  DEFAULT_wxUSE_MEM_TRACING=no
-  DEFAULT_wxUSE_DEBUG_CONTEXT=no
-  DEFAULT_wxUSE_DMALLOC=no
-  DEFAULT_wxUSE_APPLE_IEEE=no
-
-  DEFAULT_wxUSE_EXCEPTIONS=no
-  DEFAULT_wxUSE_LOG=yes
-  DEFAULT_wxUSE_LOGWINDOW=no
-  DEFAULT_wxUSE_LOGGUI=no
-  DEFAULT_wxUSE_LOGDIALOG=no
-
-  DEFAULT_wxUSE_GUI=yes
-  DEFAULT_wxUSE_CONTROLS=no
-
-  DEFAULT_wxUSE_REGEX=no
-  DEFAULT_wxUSE_XML=no
-  DEFAULT_wxUSE_EXPAT=no
-  DEFAULT_wxUSE_ZLIB=no
-  DEFAULT_wxUSE_LIBPNG=no
-  DEFAULT_wxUSE_LIBJPEG=no
-  DEFAULT_wxUSE_LIBTIFF=no
-  DEFAULT_wxUSE_LIBXPM=no
-  DEFAULT_wxUSE_LIBMSPACK=no
-  DEFAULT_wxUSE_LIBSDL=no
-  DEFAULT_wxUSE_LIBGNOMEPRINT=no
-  DEFAULT_wxUSE_LIBGNOMEVFS=no
-  DEFAULT_wxUSE_LIBHILDON=no
-  DEFAULT_wxUSE_ODBC=no
-  DEFAULT_wxUSE_OPENGL=no
-
-  DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
-  DEFAULT_wxUSE_STACKWALKER=no
-  DEFAULT_wxUSE_DEBUGREPORT=no
-  DEFAULT_wxUSE_SNGLINST_CHECKER=no
-  DEFAULT_wxUSE_STD_IOSTREAM=no
-  DEFAULT_wxUSE_STD_STRING=no
-  DEFAULT_wxUSE_CMDLINE_PARSER=no
-  DEFAULT_wxUSE_DATETIME=no
-  DEFAULT_wxUSE_TIMER=no
-  DEFAULT_wxUSE_STOPWATCH=no
-  DEFAULT_wxUSE_FILE=no
-  DEFAULT_wxUSE_FFILE=no
-  DEFAULT_wxUSE_STDPATHS=no
-  DEFAULT_wxUSE_TEXTBUFFER=no
-  DEFAULT_wxUSE_TEXTFILE=no
-  DEFAULT_wxUSE_SOUND=no
-  DEFAULT_wxUSE_MEDIACTRL=no
-  DEFAULT_wxUSE_GSTREAMER8=no
-  DEFAULT_wxUSE_PRINTF_POS_PARAMS=no
-  DEFAULT_wxUSE_INTL=no
-  DEFAULT_wxUSE_CONFIG=no
-  DEFAULT_wxUSE_FONTMAP=no
-  DEFAULT_wxUSE_STREAMS=no
-  DEFAULT_wxUSE_SOCKETS=no
-  DEFAULT_wxUSE_OLE=no
-  DEFAULT_wxUSE_DATAOBJ=no
-  DEFAULT_wxUSE_DIALUP_MANAGER=no
-  DEFAULT_wxUSE_JOYSTICK=no
-  DEFAULT_wxUSE_DYNLIB_CLASS=no
-  DEFAULT_wxUSE_DYNAMIC_LOADER=no
-  DEFAULT_wxUSE_LONGLONG=no
-  DEFAULT_wxUSE_GEOMETRY=no
-
-  DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no
-  DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
-  DEFAULT_wxUSE_POSTSCRIPT=no
-
-  DEFAULT_wxUSE_CLIPBOARD=no
-  DEFAULT_wxUSE_TOOLTIPS=no
-  DEFAULT_wxUSE_DRAG_AND_DROP=no
-  DEFAULT_wxUSE_DRAGIMAGE=no
-  DEFAULT_wxUSE_SPLINES=no
-  DEFAULT_wxUSE_MOUSEWHEEL=no
-
-  DEFAULT_wxUSE_MDI=no
-  DEFAULT_wxUSE_MDI_ARCHITECTURE=no
-  DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
-  DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
-
-  DEFAULT_wxUSE_CONSTRAINTS=no
-  DEFAULT_wxUSE_IPC=no
-  DEFAULT_wxUSE_HELP=no
-  DEFAULT_wxUSE_MS_HTML_HELP=no
-  DEFAULT_wxUSE_WXHTML_HELP=no
-  DEFAULT_wxUSE_TREELAYOUT=no
-  DEFAULT_wxUSE_METAFILE=no
-  DEFAULT_wxUSE_MIMETYPE=no
-  DEFAULT_wxUSE_SYSTEM_OPTIONS=no
-  DEFAULT_wxUSE_PROTOCOL=no
-  DEFAULT_wxUSE_PROTOCOL_HTTP=no
-  DEFAULT_wxUSE_PROTOCOL_FTP=no
-  DEFAULT_wxUSE_PROTOCOL_FILE=no
-  DEFAULT_wxUSE_URL=no
-  DEFAULT_wxUSE_VARIANT=no
-
-  DEFAULT_wxUSE_ABOUTDLG=no
-  DEFAULT_wxUSE_COMMONDLGS=no
-  DEFAULT_wxUSE_CHOICEDLG=no
-  DEFAULT_wxUSE_COLOURDLG=no
-  DEFAULT_wxUSE_DIRDLG=no
-  DEFAULT_wxUSE_FILEDLG=no
-  DEFAULT_wxUSE_FINDREPLDLG=no
-  DEFAULT_wxUSE_FONTDLG=no
-  DEFAULT_wxUSE_MSGDLG=no
-  DEFAULT_wxUSE_NUMBERDLG=no
-  DEFAULT_wxUSE_TEXTDLG=no
-  DEFAULT_wxUSE_SPLASH=no
-  DEFAULT_wxUSE_STARTUP_TIPS=no
-  DEFAULT_wxUSE_PROGRESSDLG=no
-  DEFAULT_wxUSE_WIZARDDLG=no
-
-  DEFAULT_wxUSE_MENUS=no
-  DEFAULT_wxUSE_MINIFRAME=no
-  DEFAULT_wxUSE_HTML=no
-  DEFAULT_wxUSE_RICHTEXT=no
-  DEFAULT_wxUSE_XRC=no
-  DEFAULT_wxUSE_AUI=no
-  DEFAULT_wxUSE_STC=no
-  DEFAULT_wxUSE_WEBKIT=no
-  DEFAULT_wxUSE_FILESYSTEM=no
-  DEFAULT_wxUSE_FS_INET=no
-  DEFAULT_wxUSE_FS_ZIP=no
-  DEFAULT_wxUSE_FS_ARCHIVE=no
-  DEFAULT_wxUSE_BUSYINFO=no
-  DEFAULT_wxUSE_ARCHIVE_STREAMS=no
-  DEFAULT_wxUSE_ZIPSTREAM=no
-  DEFAULT_wxUSE_TARSTREAM=no
-  DEFAULT_wxUSE_VALIDATORS=no
+DEFAULT_wxUSE_ACCESSIBILITY=no
+DEFAULT_wxUSE_DATAVIEWCTRL=no
+DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
+DEFAULT_wxUSE_MEDIACTRL=no
+DEFAULT_wxUSE_TAB_DIALOG=no
  
  
-  DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_ANIMATIONCTRL=no
-  DEFAULT_wxUSE_BUTTON=no
-  DEFAULT_wxUSE_BMPBUTTON=no
-  DEFAULT_wxUSE_BITMAPCOMBOBOX=no
-  DEFAULT_wxUSE_CALCTRL=no
-  DEFAULT_wxUSE_CARET=no
-  DEFAULT_wxUSE_CHECKBOX=no
-  DEFAULT_wxUSE_CHECKLST=no
-  DEFAULT_wxUSE_CHOICE=no
-  DEFAULT_wxUSE_CHOICEBOOK=no
-  DEFAULT_wxUSE_COLLPANE=no
-  DEFAULT_wxUSE_COLOURPICKERCTRL=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_COMBOCTRL=no
-  DEFAULT_wxUSE_DATEPICKCTRL=no
-  DEFAULT_wxUSE_DISPLAY=no
-  DEFAULT_wxUSE_DETECT_SM=no
-  DEFAULT_wxUSE_DIRPICKERCTRL=no
-  DEFAULT_wxUSE_FILEPICKERCTRL=no
-  DEFAULT_wxUSE_FONTPICKERCTRL=no
-  DEFAULT_wxUSE_GAUGE=no
-  DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
-  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_HYPERLINKCTRL=no
-  DEFAULT_wxUSE_DATAVIEWCTRL=no
-  DEFAULT_wxUSE_IMAGLIST=no
-  DEFAULT_wxUSE_LISTBOOK=no
-  DEFAULT_wxUSE_LISTBOX=no
-  DEFAULT_wxUSE_LISTCTRL=no
-  DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_ODCOMBOBOX=no
-  DEFAULT_wxUSE_RADIOBOX=no
-  DEFAULT_wxUSE_RADIOBTN=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SEARCHCTRL=no
-  DEFAULT_wxUSE_SLIDER=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPINCTRL=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STATBMP=no
-  DEFAULT_wxUSE_STATBOX=no
-  DEFAULT_wxUSE_STATLINE=no
-  DEFAULT_wxUSE_STATTEXT=no
-  DEFAULT_wxUSE_STATUSBAR=yes
-  DEFAULT_wxUSE_TAB_DIALOG=no
-  DEFAULT_wxUSE_TEXTCTRL=no
-  DEFAULT_wxUSE_TOGGLEBTN=no
-  DEFAULT_wxUSE_TOOLBAR=no
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
-  DEFAULT_wxUSE_TREEBOOK=no
-  DEFAULT_wxUSE_TOOLBOOK=no
-  DEFAULT_wxUSE_TREECTRL=no
-  DEFAULT_wxUSE_POPUPWIN=no
-  DEFAULT_wxUSE_TIPWINDOW=no
-
-  DEFAULT_wxUSE_UNICODE=no
-  DEFAULT_wxUSE_UNICODE_MSLU=no
-  DEFAULT_wxUSE_UNICODE_UTF8=no
-  DEFAULT_wxUSE_WCSRTOMBS=no
-
-  DEFAULT_wxUSE_PALETTE=no
-  DEFAULT_wxUSE_IMAGE=no
-  DEFAULT_wxUSE_GIF=no
-  DEFAULT_wxUSE_PCX=no
-  DEFAULT_wxUSE_TGA=no
-  DEFAULT_wxUSE_PNM=no
-  DEFAULT_wxUSE_IFF=no
-  DEFAULT_wxUSE_XPM=no
-  DEFAULT_wxUSE_ICO_CUR=no
-  DEFAULT_wxUSE_ACCESSIBILITY=no
-
-  DEFAULT_wxUSE_MONOLITHIC=no
-  DEFAULT_wxUSE_PLUGINS=no
-  DEFAULT_wxUSE_OFFICIAL_BUILD=no
-else
-  DEFAULT_wxUSE_UNIVERSAL=no
-  DEFAULT_wxUSE_STL=no
-  DEFAULT_wxUSE_EXTENDED_RTTI=no
-
-  DEFAULT_wxUSE_NANOX=no
-
-  DEFAULT_wxUSE_THREADS=yes
-
-  DEFAULT_wxUSE_SHARED=${DEFAULT_wxUSE_SHARED:-yes}
-  DEFAULT_wxUSE_OPTIMISE=yes
-  DEFAULT_wxUSE_PROFILE=no
-  DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_VARARG_MACROS=yes
-  DEFAULT_wxUSE_NO_RTTI=no
-  DEFAULT_wxUSE_NO_EXCEPTIONS=no
-  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
-  DEFAULT_wxUSE_RPATH=yes
-  DEFAULT_wxUSE_PERMISSIVE=no
-  DEFAULT_wxUSE_DEBUG_FLAG=no
-  DEFAULT_wxUSE_DEBUG_INFO=no
-  DEFAULT_wxUSE_DEBUG_GDB=no
-  DEFAULT_wxUSE_MEM_TRACING=no
-  DEFAULT_wxUSE_DEBUG_CONTEXT=no
-  DEFAULT_wxUSE_DMALLOC=no
-  DEFAULT_wxUSE_APPLE_IEEE=yes
-
-  DEFAULT_wxUSE_EXCEPTIONS=yes
-  DEFAULT_wxUSE_LOG=yes
-  DEFAULT_wxUSE_LOGWINDOW=yes
-  DEFAULT_wxUSE_LOGGUI=yes
-  DEFAULT_wxUSE_LOGDIALOG=yes
-
-  DEFAULT_wxUSE_GUI=yes
-
-  DEFAULT_wxUSE_REGEX=yes
-  DEFAULT_wxUSE_XML=yes
-  DEFAULT_wxUSE_EXPAT=yes
-  DEFAULT_wxUSE_ZLIB=yes
-  DEFAULT_wxUSE_LIBPNG=yes
-  DEFAULT_wxUSE_LIBJPEG=yes
-  DEFAULT_wxUSE_LIBTIFF=yes
-  DEFAULT_wxUSE_LIBXPM=yes
-  DEFAULT_wxUSE_LIBMSPACK=yes
-  DEFAULT_wxUSE_LIBSDL=no
-  DEFAULT_wxUSE_LIBGNOMEPRINT=yes
-  DEFAULT_wxUSE_LIBGNOMEVFS=no
-  DEFAULT_wxUSE_LIBHILDON=no
-  DEFAULT_wxUSE_ODBC=no
-  DEFAULT_wxUSE_OPENGL=no
-
-  DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
-  DEFAULT_wxUSE_STACKWALKER=yes
-  DEFAULT_wxUSE_DEBUGREPORT=yes
-  DEFAULT_wxUSE_SNGLINST_CHECKER=yes
-  DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
-  DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
-  DEFAULT_wxUSE_CMDLINE_PARSER=yes
-  DEFAULT_wxUSE_DATETIME=yes
-  DEFAULT_wxUSE_TIMER=yes
-  DEFAULT_wxUSE_STOPWATCH=yes
-  DEFAULT_wxUSE_FILE=yes
-  DEFAULT_wxUSE_FFILE=yes
-  DEFAULT_wxUSE_STDPATHS=yes
-  DEFAULT_wxUSE_TEXTBUFFER=yes
-  DEFAULT_wxUSE_TEXTFILE=yes
-  DEFAULT_wxUSE_SOUND=yes
-  DEFAULT_wxUSE_MEDIACTRL=no
-  DEFAULT_wxUSE_GSTREAMER8=no
-  DEFAULT_wxUSE_PRINTF_POS_PARAMS=yes
-  DEFAULT_wxUSE_INTL=yes
-  DEFAULT_wxUSE_CONFIG=yes
-  DEFAULT_wxUSE_FONTMAP=yes
-  DEFAULT_wxUSE_STREAMS=yes
-  DEFAULT_wxUSE_SOCKETS=yes
-  DEFAULT_wxUSE_OLE=yes
-  DEFAULT_wxUSE_DATAOBJ=yes
-  DEFAULT_wxUSE_DIALUP_MANAGER=yes
-  DEFAULT_wxUSE_JOYSTICK=yes
-  DEFAULT_wxUSE_DYNLIB_CLASS=yes
-  DEFAULT_wxUSE_DYNAMIC_LOADER=yes
-  DEFAULT_wxUSE_LONGLONG=yes
-  DEFAULT_wxUSE_GEOMETRY=yes
-
-  DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes
-  DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
-  DEFAULT_wxUSE_POSTSCRIPT=yes
-
-  DEFAULT_wxUSE_CLIPBOARD=yes
-  DEFAULT_wxUSE_TOOLTIPS=yes
-  DEFAULT_wxUSE_DRAG_AND_DROP=yes
-  DEFAULT_wxUSE_DRAGIMAGE=yes
-  DEFAULT_wxUSE_SPLINES=yes
-  DEFAULT_wxUSE_MOUSEWHEEL=yes
-
-  DEFAULT_wxUSE_MDI=yes
-  DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
-  DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
-  DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
-
-  DEFAULT_wxUSE_CONSTRAINTS=yes
-  DEFAULT_wxUSE_IPC=yes
-  DEFAULT_wxUSE_HELP=yes
-  DEFAULT_wxUSE_MS_HTML_HELP=yes
-  DEFAULT_wxUSE_WXHTML_HELP=yes
-  DEFAULT_wxUSE_TREELAYOUT=yes
-  DEFAULT_wxUSE_METAFILE=yes
-  DEFAULT_wxUSE_MIMETYPE=yes
-  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
-  DEFAULT_wxUSE_PROTOCOL=yes
-  DEFAULT_wxUSE_PROTOCOL_HTTP=yes
-  DEFAULT_wxUSE_PROTOCOL_FTP=yes
-  DEFAULT_wxUSE_PROTOCOL_FILE=yes
-  DEFAULT_wxUSE_URL=yes
-  DEFAULT_wxUSE_VARIANT=yes
-
-  DEFAULT_wxUSE_ABOUTDLG=yes
-  DEFAULT_wxUSE_COMMONDLGS=yes
-  DEFAULT_wxUSE_CHOICEDLG=yes
-  DEFAULT_wxUSE_COLOURDLG=yes
-  DEFAULT_wxUSE_DIRDLG=yes
-  DEFAULT_wxUSE_FILEDLG=yes
-  DEFAULT_wxUSE_FINDREPLDLG=yes
-  DEFAULT_wxUSE_FONTDLG=yes
-  DEFAULT_wxUSE_MSGDLG=yes
-  DEFAULT_wxUSE_NUMBERDLG=yes
-  DEFAULT_wxUSE_TEXTDLG=yes
-  DEFAULT_wxUSE_SPLASH=yes
-  DEFAULT_wxUSE_STARTUP_TIPS=yes
-  DEFAULT_wxUSE_PROGRESSDLG=yes
-  DEFAULT_wxUSE_WIZARDDLG=yes
-
-  DEFAULT_wxUSE_MENUS=yes
-  DEFAULT_wxUSE_MINIFRAME=yes
-  DEFAULT_wxUSE_HTML=yes
-  DEFAULT_wxUSE_RICHTEXT=yes
-  DEFAULT_wxUSE_XRC=yes
-  DEFAULT_wxUSE_AUI=yes
-  DEFAULT_wxUSE_STC=yes
-  DEFAULT_wxUSE_WEBKIT=yes
-  DEFAULT_wxUSE_FILESYSTEM=yes
-  DEFAULT_wxUSE_FS_INET=yes
-  DEFAULT_wxUSE_FS_ZIP=yes
-  DEFAULT_wxUSE_FS_ARCHIVE=yes
-  DEFAULT_wxUSE_BUSYINFO=yes
-  DEFAULT_wxUSE_ARCHIVE_STREAMS=yes
-  DEFAULT_wxUSE_ZIPSTREAM=yes
-  DEFAULT_wxUSE_TARSTREAM=yes
-  DEFAULT_wxUSE_VALIDATORS=yes
-
-  DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_ANIMATIONCTRL=yes
-  DEFAULT_wxUSE_BUTTON=yes
-  DEFAULT_wxUSE_BMPBUTTON=yes
-  DEFAULT_wxUSE_BITMAPCOMBOBOX=yes
-  DEFAULT_wxUSE_CALCTRL=yes
-  DEFAULT_wxUSE_CARET=yes
-  DEFAULT_wxUSE_CHECKBOX=yes
-  DEFAULT_wxUSE_CHECKLST=yes
-  DEFAULT_wxUSE_CHOICE=yes
-  DEFAULT_wxUSE_CHOICEBOOK=yes
-  DEFAULT_wxUSE_COLLPANE=yes
-  DEFAULT_wxUSE_COLOURPICKERCTRL=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_COMBOCTRL=yes
-  DEFAULT_wxUSE_DATEPICKCTRL=yes
-  DEFAULT_wxUSE_DISPLAY=yes
-  DEFAULT_wxUSE_DETECT_SM=yes
-  DEFAULT_wxUSE_DIRPICKERCTRL=yes
-  DEFAULT_wxUSE_FILEPICKERCTRL=yes
-  DEFAULT_wxUSE_FONTPICKERCTRL=yes
-  DEFAULT_wxUSE_GAUGE=yes
-  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
-  DEFAULT_wxUSE_HYPERLINKCTRL=yes
-  DEFAULT_wxUSE_DATAVIEWCTRL=no
-  DEFAULT_wxUSE_IMAGLIST=yes
-  DEFAULT_wxUSE_LISTBOOK=yes
-  DEFAULT_wxUSE_LISTBOX=yes
-  DEFAULT_wxUSE_LISTCTRL=yes
-  DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_ODCOMBOBOX=yes
-  DEFAULT_wxUSE_RADIOBOX=yes
-  DEFAULT_wxUSE_RADIOBTN=yes
-  DEFAULT_wxUSE_SASH=yes
-  DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SEARCHCTRL=yes
-  DEFAULT_wxUSE_SLIDER=yes
-  DEFAULT_wxUSE_SPINBTN=yes
-  DEFAULT_wxUSE_SPINCTRL=yes
-  DEFAULT_wxUSE_SPLITTER=yes
-  DEFAULT_wxUSE_STATBMP=yes
-  DEFAULT_wxUSE_STATBOX=yes
-  DEFAULT_wxUSE_STATLINE=yes
-  DEFAULT_wxUSE_STATTEXT=yes
-  DEFAULT_wxUSE_STATUSBAR=yes
-  DEFAULT_wxUSE_TAB_DIALOG=no
-  DEFAULT_wxUSE_TEXTCTRL=yes
-  DEFAULT_wxUSE_TOGGLEBTN=yes
-  DEFAULT_wxUSE_TOOLBAR=yes
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
-  DEFAULT_wxUSE_TREEBOOK=yes
-  DEFAULT_wxUSE_TOOLBOOK=yes
-  DEFAULT_wxUSE_TREECTRL=yes
-  DEFAULT_wxUSE_POPUPWIN=yes
-  DEFAULT_wxUSE_TIPWINDOW=yes
-
-  DEFAULT_wxUSE_UNICODE=no
-  DEFAULT_wxUSE_UNICODE_MSLU=yes
-  DEFAULT_wxUSE_UNICODE_UTF8=no
-  DEFAULT_wxUSE_WCSRTOMBS=no
-
-  DEFAULT_wxUSE_PALETTE=yes
-  DEFAULT_wxUSE_IMAGE=yes
-  DEFAULT_wxUSE_GIF=yes
-  DEFAULT_wxUSE_PCX=yes
-  DEFAULT_wxUSE_TGA=yes
-  DEFAULT_wxUSE_IFF=no    DEFAULT_wxUSE_PNM=yes
-  DEFAULT_wxUSE_XPM=yes
-  DEFAULT_wxUSE_ICO_CUR=yes
-  DEFAULT_wxUSE_ACCESSIBILITY=no
-
-  DEFAULT_wxUSE_MONOLITHIC=no
-  DEFAULT_wxUSE_PLUGINS=no
-  DEFAULT_wxUSE_OFFICIAL_BUILD=no
+DEFAULT_wxUSE_UNICODE_UTF8=auto
+DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
  
  
-    DEFAULT_wxUSE_GTK2=yes
-fi
+DEFAULT_wxUSE_OFFICIAL_BUILD=no
  
  
+DEFAULT_wxUSE_GTK2=yes
  
  
+DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
  
  
  for toolkit in `echo $ALL_TOOLKITS`; do
  
  
  for toolkit in `echo $ALL_TOOLKITS`; do
@@ -3375,7 +2960,18 @@ done
  
  
  
  
  
  
-          enablestring=
+
+
+          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}-gui" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gui" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6; }
            no_cache=0
@@ -3383,40 +2979,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6; }
  if test "${enable_gui+set}" = set; then
    enableval=$enable_gui;
                            if test "$enableval" = yes; then
  if test "${enable_gui+set}" = set; then
    enableval=$enable_gui;
                            if test "$enableval" = yes; then
-                            ac_cv_use_gui='wxUSE_GUI=yes'
+                            wx_cv_use_gui='wxUSE_GUI=yes'
                            else
                            else
-                            ac_cv_use_gui='wxUSE_GUI=no'
+                            wx_cv_use_gui='wxUSE_GUI=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI
+                          wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_gui"
+          eval "$wx_cv_use_gui"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_gui >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gui >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_GUI" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_GUI = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_GUI
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-monolithic" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-monolithic" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6; }
            no_cache=0
@@ -3424,40 +3034,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6;
  if test "${enable_monolithic+set}" = set; then
    enableval=$enable_monolithic;
                            if test "$enableval" = yes; then
  if test "${enable_monolithic+set}" = set; then
    enableval=$enable_monolithic;
                            if test "$enableval" = yes; then
-                            ac_cv_use_monolithic='wxUSE_MONOLITHIC=yes'
+                            wx_cv_use_monolithic='wxUSE_MONOLITHIC=yes'
                            else
                            else
-                            ac_cv_use_monolithic='wxUSE_MONOLITHIC=no'
+                            wx_cv_use_monolithic='wxUSE_MONOLITHIC=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MONOLITHIC" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_monolithic='wxUSE_MONOLITHIC='$DEFAULT_wxUSE_MONOLITHIC
+                          wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_monolithic"
+          eval "$wx_cv_use_monolithic"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_monolithic >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_monolithic >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MONOLITHIC" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MONOLITHIC = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_MONOLITHIC
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-plugins" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-plugins" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6; }
            no_cache=0
@@ -3465,40 +3089,53 @@ echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6; }
  if test "${enable_plugins+set}" = set; then
    enableval=$enable_plugins;
                            if test "$enableval" = yes; then
  if test "${enable_plugins+set}" = set; then
    enableval=$enable_plugins;
                            if test "$enableval" = yes; then
-                            ac_cv_use_plugins='wxUSE_PLUGINS=yes'
+                            wx_cv_use_plugins='wxUSE_PLUGINS=yes'
                            else
                            else
-                            ac_cv_use_plugins='wxUSE_PLUGINS=no'
+                            wx_cv_use_plugins='wxUSE_PLUGINS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PLUGINS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_plugins='wxUSE_PLUGINS='$DEFAULT_wxUSE_PLUGINS
+                          wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_plugins"
+          eval "$wx_cv_use_plugins"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_plugins >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_plugins >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PLUGINS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PLUGINS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PLUGINS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            withstring=without
  
            withstring=without
+          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}-subdirs" >&5
  echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${withstring:-with}-subdirs" >&5
  echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6; }
            no_cache=0
@@ -3507,43 +3144,183 @@ echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6; }
  if test "${with_subdirs+set}" = set; then
    withval=$with_subdirs;
                          if test "$withval" = yes; then
  if test "${with_subdirs+set}" = set; then
    withval=$with_subdirs;
                          if test "$withval" = yes; then
-                          ac_cv_use_subdirs='wxWITH_SUBDIRS=yes'
+                          wx_cv_use_subdirs='wxWITH_SUBDIRS=yes'
                          else
                          else
-                          ac_cv_use_subdirs='wxWITH_SUBDIRS=no'
+                          wx_cv_use_subdirs='wxWITH_SUBDIRS=no'
                          fi
  
  else
  
                          fi
  
  else
  
-                        LINE=`grep "wxWITH_SUBDIRS" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_subdirs='wxWITH_SUBDIRS='$DEFAULT_wxWITH_SUBDIRS
+                        wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_subdirs"
+          eval "$wx_cv_use_subdirs"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_subdirs >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_subdirs >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxWITH_SUBDIRS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$withstring" = xwithout; then
+            if test $wxWITH_SUBDIRS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxWITH_SUBDIRS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+# Check whether --with-flavour was given.
+if test "${with_flavour+set}" = set; then
+  withval=$with_flavour; WX_FLAVOUR="$withval"
+fi
+
+
+          enablestring=
+          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}-official_build" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-official_build was given.
+if test "${enable_official_build+set}" = set; then
+  enableval=$enable_official_build;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
+                          else
+                            wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_official_build"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_official_build >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_OFFICIAL_BUILD = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_OFFICIAL_BUILD
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+# Check whether --enable-vendor was given.
+if test "${enable_vendor+set}" = set; then
+  enableval=$enable_vendor; VENDOR="$enableval"
+fi
+
+if test "x$VENDOR" = "x"; then
+    VENDOR="custom"
+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}-all-features" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-all-features... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-all-features was given.
+if test "${enable_all_features+set}" = set; then
+  enableval=$enable_all_features;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_all_features='wxUSE_ALL_FEATURES=yes'
+                          else
+                            wx_cv_use_all_features='wxUSE_ALL_FEATURES=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_all_features"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_all_features >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ALL_FEATURES = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_ALL_FEATURES
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
  
  if test "$wxUSE_GUI" = "yes"; then
  
  
            enablestring=
  
  if test "$wxUSE_GUI" = "yes"; then
  
  
            enablestring=
+          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}-universal" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6; }
            no_cache=0
@@ -3551,38 +3328,52 @@ echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6;
  if test "${enable_universal+set}" = set; then
    enableval=$enable_universal;
                            if test "$enableval" = yes; then
  if test "${enable_universal+set}" = set; then
    enableval=$enable_universal;
                            if test "$enableval" = yes; then
-                            ac_cv_use_universal='wxUSE_UNIVERSAL=yes'
+                            wx_cv_use_universal='wxUSE_UNIVERSAL=yes'
                            else
                            else
-                            ac_cv_use_universal='wxUSE_UNIVERSAL=no'
+                            wx_cv_use_universal='wxUSE_UNIVERSAL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL
+                          wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_universal"
+          eval "$wx_cv_use_universal"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_universal >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_universal >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_UNIVERSAL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_UNIVERSAL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_UNIVERSAL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+if test "$wxUSE_UNIVERSAL" = "yes"; then
+
+# Check whether --with-themes was given.
+if test "${with_themes+set}" = set; then
+  withval=$with_themes; wxUNIV_THEMES="$withval"
+fi
+
+fi
+
  
  # Check whether --with-gtk was given.
  if test "${with_gtk+set}" = set; then
  
  # Check whether --with-gtk was given.
  if test "${with_gtk+set}" = set; then
@@ -3651,6 +3442,15 @@ fi
  
  
            enablestring=
  
  
            enablestring=
+          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}-nanox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-nanox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6; }
            no_cache=0
@@ -3658,38 +3458,43 @@ echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6; }
  if test "${enable_nanox+set}" = set; then
    enableval=$enable_nanox;
                            if test "$enableval" = yes; then
  if test "${enable_nanox+set}" = set; then
    enableval=$enable_nanox;
                            if test "$enableval" = yes; then
-                            ac_cv_use_nanox='wxUSE_NANOX=yes'
+                            wx_cv_use_nanox='wxUSE_NANOX=yes'
                            else
                            else
-                            ac_cv_use_nanox='wxUSE_NANOX=no'
+                            wx_cv_use_nanox='wxUSE_NANOX=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_NANOX" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_nanox='wxUSE_NANOX='$DEFAULT_wxUSE_NANOX
+                          wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_nanox"
+          eval "$wx_cv_use_nanox"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_nanox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_nanox >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_NANOX" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_NANOX = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_NANOX
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
  # Check whether --enable-gtk2 was given.
  if test "${enable_gtk2+set}" = set; then
  
  # Check whether --enable-gtk2 was given.
  if test "${enable_gtk2+set}" = set; then
@@ -3698,6 +3503,15 @@ fi
  
  
            enablestring=
  
  
            enablestring=
+          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}-gpe" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6; }
            no_cache=0
@@ -3705,38 +3519,44 @@ echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6; }
  if test "${enable_gpe+set}" = set; then
    enableval=$enable_gpe;
                            if test "$enableval" = yes; then
  if test "${enable_gpe+set}" = set; then
    enableval=$enable_gpe;
                            if test "$enableval" = yes; then
-                            ac_cv_use_gpe='wxUSE_GPE=yes'
+                            wx_cv_use_gpe='wxUSE_GPE=yes'
                            else
                            else
-                            ac_cv_use_gpe='wxUSE_GPE=no'
+                            wx_cv_use_gpe='wxUSE_GPE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_GPE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_gpe='wxUSE_GPE='$DEFAULT_wxUSE_GPE
+                          wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_gpe"
+          eval "$wx_cv_use_gpe"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_gpe >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gpe >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_GPE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_GPE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_GPE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
  
  
            { echo "$as_me:$LINENO: checking for --with-libpng" >&5
  
  
            { echo "$as_me:$LINENO: checking for --with-libpng" >&5
@@ -3747,13 +3567,13 @@ echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; }
  if test "${with_libpng+set}" = set; then
    withval=$with_libpng;
                          if test "$withval" = yes; then
  if test "${with_libpng+set}" = set; then
    withval=$with_libpng;
                          if test "$withval" = yes; then
-                          ac_cv_use_libpng='wxUSE_LIBPNG=yes'
+                          wx_cv_use_libpng='wxUSE_LIBPNG=yes'
                          elif test "$withval" = no; then
                          elif test "$withval" = no; then
-                          ac_cv_use_libpng='wxUSE_LIBPNG=no'
+                          wx_cv_use_libpng='wxUSE_LIBPNG=no'
                          elif test "$withval" = sys; then
                          elif test "$withval" = sys; then
-                          ac_cv_use_libpng='wxUSE_LIBPNG=sys'
+                          wx_cv_use_libpng='wxUSE_LIBPNG=sys'
                          elif test "$withval" = builtin; then
                          elif test "$withval" = builtin; then
-                          ac_cv_use_libpng='wxUSE_LIBPNG=builtin'
+                          wx_cv_use_libpng='wxUSE_LIBPNG=builtin'
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;}
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;}
@@ -3762,21 +3582,21 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or
  
  else
  
  
  else
  
-                        LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG
+                        wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_libpng"
+          eval "$wx_cv_use_libpng"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_libpng >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_libpng >> ${wx_arg_cache_file}.tmp
            fi
  
            if test "$wxUSE_LIBPNG" = yes; then
            fi
  
            if test "$wxUSE_LIBPNG" = yes; then
@@ -3806,13 +3626,13 @@ echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6; }
  if test "${with_libjpeg+set}" = set; then
    withval=$with_libjpeg;
                          if test "$withval" = yes; then
  if test "${with_libjpeg+set}" = set; then
    withval=$with_libjpeg;
                          if test "$withval" = yes; then
-                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
+                          wx_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
                          elif test "$withval" = no; then
                          elif test "$withval" = no; then
-                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=no'
+                          wx_cv_use_libjpeg='wxUSE_LIBJPEG=no'
                          elif test "$withval" = sys; then
                          elif test "$withval" = sys; then
-                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys'
+                          wx_cv_use_libjpeg='wxUSE_LIBJPEG=sys'
                          elif test "$withval" = builtin; then
                          elif test "$withval" = builtin; then
-                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=builtin'
+                          wx_cv_use_libjpeg='wxUSE_LIBJPEG=builtin'
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;}
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;}
@@ -3821,21 +3641,21 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o
  
  else
  
  
  else
  
-                        LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG
+                        wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_libjpeg"
+          eval "$wx_cv_use_libjpeg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp
            fi
  
            if test "$wxUSE_LIBJPEG" = yes; then
            fi
  
            if test "$wxUSE_LIBJPEG" = yes; then
@@ -3865,13 +3685,13 @@ echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6; }
  if test "${with_libtiff+set}" = set; then
    withval=$with_libtiff;
                          if test "$withval" = yes; then
  if test "${with_libtiff+set}" = set; then
    withval=$with_libtiff;
                          if test "$withval" = yes; then
-                          ac_cv_use_libtiff='wxUSE_LIBTIFF=yes'
+                          wx_cv_use_libtiff='wxUSE_LIBTIFF=yes'
                          elif test "$withval" = no; then
                          elif test "$withval" = no; then
-                          ac_cv_use_libtiff='wxUSE_LIBTIFF=no'
+                          wx_cv_use_libtiff='wxUSE_LIBTIFF=no'
                          elif test "$withval" = sys; then
                          elif test "$withval" = sys; then
-                          ac_cv_use_libtiff='wxUSE_LIBTIFF=sys'
+                          wx_cv_use_libtiff='wxUSE_LIBTIFF=sys'
                          elif test "$withval" = builtin; then
                          elif test "$withval" = builtin; then
-                          ac_cv_use_libtiff='wxUSE_LIBTIFF=builtin'
+                          wx_cv_use_libtiff='wxUSE_LIBTIFF=builtin'
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;}
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;}
@@ -3880,21 +3700,21 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o
  
  else
  
  
  else
  
-                        LINE=`grep "wxUSE_LIBTIFF" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF
+                        wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_libtiff"
+          eval "$wx_cv_use_libtiff"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_libtiff >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_libtiff >> ${wx_arg_cache_file}.tmp
            fi
  
            if test "$wxUSE_LIBTIFF" = yes; then
            fi
  
            if test "$wxUSE_LIBTIFF" = yes; then
@@ -3924,13 +3744,13 @@ echo $ECHO_N "checking for --with-libxpm... $ECHO_C" >&6; }
  if test "${with_libxpm+set}" = set; then
    withval=$with_libxpm;
                          if test "$withval" = yes; then
  if test "${with_libxpm+set}" = set; then
    withval=$with_libxpm;
                          if test "$withval" = yes; then
-                          ac_cv_use_libxpm='wxUSE_LIBXPM=yes'
+                          wx_cv_use_libxpm='wxUSE_LIBXPM=yes'
                          elif test "$withval" = no; then
                          elif test "$withval" = no; then
-                          ac_cv_use_libxpm='wxUSE_LIBXPM=no'
+                          wx_cv_use_libxpm='wxUSE_LIBXPM=no'
                          elif test "$withval" = sys; then
                          elif test "$withval" = sys; then
-                          ac_cv_use_libxpm='wxUSE_LIBXPM=sys'
+                          wx_cv_use_libxpm='wxUSE_LIBXPM=sys'
                          elif test "$withval" = builtin; then
                          elif test "$withval" = builtin; then
-                          ac_cv_use_libxpm='wxUSE_LIBXPM=builtin'
+                          wx_cv_use_libxpm='wxUSE_LIBXPM=builtin'
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}
@@ -3939,21 +3759,21 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or
  
  else
  
  
  else
  
-                        LINE=`grep "wxUSE_LIBXPM" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_libxpm='wxUSE_LIBXPM='$DEFAULT_wxUSE_LIBXPM
+                        wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_libxpm"
+          eval "$wx_cv_use_libxpm"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_libxpm >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_libxpm >> ${wx_arg_cache_file}.tmp
            fi
  
            if test "$wxUSE_LIBXPM" = yes; then
            fi
  
            if test "$wxUSE_LIBXPM" = yes; then
@@ -3976,6 +3796,14 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or
  
  
            withstring=
  
  
            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}-libmspack" >&5
  echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${withstring:-with}-libmspack" >&5
  echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6; }
            no_cache=0
@@ -3984,82 +3812,53 @@ echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6; }
  if test "${with_libmspack+set}" = set; then
    withval=$with_libmspack;
                          if test "$withval" = yes; then
  if test "${with_libmspack+set}" = set; then
    withval=$with_libmspack;
                          if test "$withval" = yes; then
-                          ac_cv_use_libmspack='wxUSE_LIBMSPACK=yes'
+                          wx_cv_use_libmspack='wxUSE_LIBMSPACK=yes'
                          else
                          else
-                          ac_cv_use_libmspack='wxUSE_LIBMSPACK=no'
+                          wx_cv_use_libmspack='wxUSE_LIBMSPACK=no'
                          fi
  
  else
  
                          fi
  
  else
  
-                        LINE=`grep "wxUSE_LIBMSPACK" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_libmspack='wxUSE_LIBMSPACK='$DEFAULT_wxUSE_LIBMSPACK
+                        wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_libmspack"
+          eval "$wx_cv_use_libmspack"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_libmspack >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_libmspack >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LIBMSPACK" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_LIBMSPACK = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LIBMSPACK
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
-          withstring=
-          { echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5
-echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6; }
-          no_cache=0
  
  
-# Check whether --with-sdl was given.
-if test "${with_sdl+set}" = set; then
-  withval=$with_sdl;
-                        if test "$withval" = yes; then
-                          ac_cv_use_sdl='wxUSE_LIBSDL=yes'
-                        else
-                          ac_cv_use_sdl='wxUSE_LIBSDL=no'
-                        fi
-
-else
-
-                        LINE=`grep "wxUSE_LIBSDL" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        ac_cv_use_sdl='wxUSE_LIBSDL='$DEFAULT_wxUSE_LIBSDL
-
-fi
-
-
-          eval "$ac_cv_use_sdl"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_sdl >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_LIBSDL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-          else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+          withstring=without
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
            fi
            fi
-
-
-          withstring=
            { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5
  echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5
  echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6; }
            no_cache=0
@@ -4068,40 +3867,53 @@ echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6; }
  if test "${with_gnomeprint+set}" = set; then
    withval=$with_gnomeprint;
                          if test "$withval" = yes; then
  if test "${with_gnomeprint+set}" = set; then
    withval=$with_gnomeprint;
                          if test "$withval" = yes; then
-                          ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes'
+                          wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes'
                          else
                          else
-                          ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no'
+                          wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no'
                          fi
  
  else
  
                          fi
  
  else
  
-                        LINE=`grep "wxUSE_LIBGNOMEPRINT" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT='$DEFAULT_wxUSE_LIBGNOMEPRINT
+                        wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_gnomeprint"
+          eval "$wx_cv_use_gnomeprint"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LIBGNOMEPRINT" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_LIBGNOMEPRINT = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LIBGNOMEPRINT
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            withstring=
  
            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}-gnomevfs" >&5
  echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomevfs" >&5
  echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6; }
            no_cache=0
@@ -4110,40 +3922,53 @@ echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6; }
  if test "${with_gnomevfs+set}" = set; then
    withval=$with_gnomevfs;
                          if test "$withval" = yes; then
  if test "${with_gnomevfs+set}" = set; then
    withval=$with_gnomevfs;
                          if test "$withval" = yes; then
-                          ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes'
+                          wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes'
                          else
                          else
-                          ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no'
+                          wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no'
                          fi
  
  else
  
                          fi
  
  else
  
-                        LINE=`grep "wxUSE_LIBGNOMEVFS" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS='$DEFAULT_wxUSE_LIBGNOMEVFS
+                        wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_gnomevfs"
+          eval "$wx_cv_use_gnomevfs"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LIBGNOMEVFS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_LIBGNOMEVFS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LIBGNOMEVFS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            withstring=
  
            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}-hildon" >&5
  echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${withstring:-with}-hildon" >&5
  echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6; }
            no_cache=0
@@ -4152,40 +3977,53 @@ echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6; }
  if test "${with_hildon+set}" = set; then
    withval=$with_hildon;
                          if test "$withval" = yes; then
  if test "${with_hildon+set}" = set; then
    withval=$with_hildon;
                          if test "$withval" = yes; then
-                          ac_cv_use_hildon='wxUSE_LIBHILDON=yes'
+                          wx_cv_use_hildon='wxUSE_LIBHILDON=yes'
                          else
                          else
-                          ac_cv_use_hildon='wxUSE_LIBHILDON=no'
+                          wx_cv_use_hildon='wxUSE_LIBHILDON=no'
                          fi
  
  else
  
                          fi
  
  else
  
-                        LINE=`grep "wxUSE_LIBHILDON" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_hildon='wxUSE_LIBHILDON='$DEFAULT_wxUSE_LIBHILDON
+                        wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_hildon"
+          eval "$wx_cv_use_hildon"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_hildon >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_hildon >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LIBHILDON" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_LIBHILDON = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LIBHILDON
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            withstring=
  
            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}-opengl" >&5
  echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5
  echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6; }
            no_cache=0
@@ -4194,52 +4032,56 @@ echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6; }
  if test "${with_opengl+set}" = set; then
    withval=$with_opengl;
                          if test "$withval" = yes; then
  if test "${with_opengl+set}" = set; then
    withval=$with_opengl;
                          if test "$withval" = yes; then
-                          ac_cv_use_opengl='wxUSE_OPENGL=yes'
+                          wx_cv_use_opengl='wxUSE_OPENGL=yes'
                          else
                          else
-                          ac_cv_use_opengl='wxUSE_OPENGL=no'
+                          wx_cv_use_opengl='wxUSE_OPENGL=no'
                          fi
  
  else
  
                          fi
  
  else
  
-                        LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL
+                        wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_opengl"
+          eval "$wx_cv_use_opengl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_opengl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_OPENGL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_OPENGL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_OPENGL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
-if test "$wxUSE_UNIVERSAL" = "yes"; then
-
-# Check whether --with-themes was given.
-if test "${with_themes+set}" = set; then
-  withval=$with_themes; wxUNIV_THEMES="$withval"
-fi
-
-fi
  
  fi
  
  
            withstring=
  
  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}-dmalloc" >&5
  echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${withstring:-with}-dmalloc" >&5
  echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6; }
            no_cache=0
@@ -4248,38 +4090,98 @@ echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6; }
  if test "${with_dmalloc+set}" = set; then
    withval=$with_dmalloc;
                          if test "$withval" = yes; then
  if test "${with_dmalloc+set}" = set; then
    withval=$with_dmalloc;
                          if test "$withval" = yes; then
-                          ac_cv_use_dmalloc='wxUSE_DMALLOC=yes'
+                          wx_cv_use_dmalloc='wxUSE_DMALLOC=yes'
                          else
                          else
-                          ac_cv_use_dmalloc='wxUSE_DMALLOC=no'
+                          wx_cv_use_dmalloc='wxUSE_DMALLOC=no'
                          fi
  
  else
  
                          fi
  
  else
  
-                        LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC
+                        wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_dmalloc"
+          eval "$wx_cv_use_dmalloc"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DMALLOC" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_DMALLOC = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DMALLOC
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          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}-sdl" >&5
+echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6; }
+          no_cache=0
+
+# Check whether --with-sdl was given.
+if test "${with_sdl+set}" = set; then
+  withval=$with_sdl;
+                        if test "$withval" = yes; then
+                          wx_cv_use_sdl='wxUSE_LIBSDL=yes'
+                        else
+                          wx_cv_use_sdl='wxUSE_LIBSDL=no'
+                        fi
+
+else
+
+                        LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_sdl"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_sdl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_LIBSDL = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_LIBSDL
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            { echo "$as_me:$LINENO: checking for --with-regex" >&5
  echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6; }
  
            { echo "$as_me:$LINENO: checking for --with-regex" >&5
  echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6; }
@@ -4289,13 +4191,13 @@ echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6; }
  if test "${with_regex+set}" = set; then
    withval=$with_regex;
                          if test "$withval" = yes; then
  if test "${with_regex+set}" = set; then
    withval=$with_regex;
                          if test "$withval" = yes; then
-                          ac_cv_use_regex='wxUSE_REGEX=yes'
+                          wx_cv_use_regex='wxUSE_REGEX=yes'
                          elif test "$withval" = no; then
                          elif test "$withval" = no; then
-                          ac_cv_use_regex='wxUSE_REGEX=no'
+                          wx_cv_use_regex='wxUSE_REGEX=no'
                          elif test "$withval" = sys; then
                          elif test "$withval" = sys; then
-                          ac_cv_use_regex='wxUSE_REGEX=sys'
+                          wx_cv_use_regex='wxUSE_REGEX=sys'
                          elif test "$withval" = builtin; then
                          elif test "$withval" = builtin; then
-                          ac_cv_use_regex='wxUSE_REGEX=builtin'
+                          wx_cv_use_regex='wxUSE_REGEX=builtin'
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;}
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;}
@@ -4304,21 +4206,21 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or
  
  else
  
  
  else
  
-                        LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX
+                        wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_regex"
+          eval "$wx_cv_use_regex"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_regex >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_regex >> ${wx_arg_cache_file}.tmp
            fi
  
            if test "$wxUSE_REGEX" = yes; then
            fi
  
            if test "$wxUSE_REGEX" = yes; then
@@ -4348,13 +4250,13 @@ echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6; }
  if test "${with_zlib+set}" = set; then
    withval=$with_zlib;
                          if test "$withval" = yes; then
  if test "${with_zlib+set}" = set; then
    withval=$with_zlib;
                          if test "$withval" = yes; then
-                          ac_cv_use_zlib='wxUSE_ZLIB=yes'
+                          wx_cv_use_zlib='wxUSE_ZLIB=yes'
                          elif test "$withval" = no; then
                          elif test "$withval" = no; then
-                          ac_cv_use_zlib='wxUSE_ZLIB=no'
+                          wx_cv_use_zlib='wxUSE_ZLIB=no'
                          elif test "$withval" = sys; then
                          elif test "$withval" = sys; then
-                          ac_cv_use_zlib='wxUSE_ZLIB=sys'
+                          wx_cv_use_zlib='wxUSE_ZLIB=sys'
                          elif test "$withval" = builtin; then
                          elif test "$withval" = builtin; then
-                          ac_cv_use_zlib='wxUSE_ZLIB=builtin'
+                          wx_cv_use_zlib='wxUSE_ZLIB=builtin'
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;}
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;}
@@ -4363,21 +4265,21 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b
  
  else
  
  
  else
  
-                        LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB
+                        wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_zlib"
+          eval "$wx_cv_use_zlib"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_zlib >> ${wx_arg_cache_file}.tmp
            fi
  
            if test "$wxUSE_ZLIB" = yes; then
            fi
  
            if test "$wxUSE_ZLIB" = yes; then
@@ -4407,13 +4309,13 @@ echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; }
  if test "${with_odbc+set}" = set; then
    withval=$with_odbc;
                          if test "$withval" = yes; then
  if test "${with_odbc+set}" = set; then
    withval=$with_odbc;
                          if test "$withval" = yes; then
-                          ac_cv_use_odbc='wxUSE_ODBC=yes'
+                          wx_cv_use_odbc='wxUSE_ODBC=yes'
                          elif test "$withval" = no; then
                          elif test "$withval" = no; then
-                          ac_cv_use_odbc='wxUSE_ODBC=no'
+                          wx_cv_use_odbc='wxUSE_ODBC=no'
                          elif test "$withval" = sys; then
                          elif test "$withval" = sys; then
-                          ac_cv_use_odbc='wxUSE_ODBC=sys'
+                          wx_cv_use_odbc='wxUSE_ODBC=sys'
                          elif test "$withval" = builtin; then
                          elif test "$withval" = builtin; then
-                          ac_cv_use_odbc='wxUSE_ODBC=builtin'
+                          wx_cv_use_odbc='wxUSE_ODBC=builtin'
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
@@ -4422,21 +4324,21 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b
  
  else
  
  
  else
  
-                        LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC
+                        wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_odbc"
+          eval "$wx_cv_use_odbc"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_odbc >> ${wx_arg_cache_file}.tmp
            fi
  
            if test "$wxUSE_ODBC" = yes; then
            fi
  
            if test "$wxUSE_ODBC" = yes; then
@@ -4466,13 +4368,13 @@ echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; }
  if test "${with_expat+set}" = set; then
    withval=$with_expat;
                          if test "$withval" = yes; then
  if test "${with_expat+set}" = set; then
    withval=$with_expat;
                          if test "$withval" = yes; then
-                          ac_cv_use_expat='wxUSE_EXPAT=yes'
+                          wx_cv_use_expat='wxUSE_EXPAT=yes'
                          elif test "$withval" = no; then
                          elif test "$withval" = no; then
-                          ac_cv_use_expat='wxUSE_EXPAT=no'
+                          wx_cv_use_expat='wxUSE_EXPAT=no'
                          elif test "$withval" = sys; then
                          elif test "$withval" = sys; then
-                          ac_cv_use_expat='wxUSE_EXPAT=sys'
+                          wx_cv_use_expat='wxUSE_EXPAT=sys'
                          elif test "$withval" = builtin; then
                          elif test "$withval" = builtin; then
-                          ac_cv_use_expat='wxUSE_EXPAT=builtin'
+                          wx_cv_use_expat='wxUSE_EXPAT=builtin'
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}
                          else
                            { { echo "$as_me:$LINENO: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&5
  echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}
@@ -4481,21 +4383,21 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or
  
  else
  
  
  else
  
-                        LINE=`grep "wxUSE_EXPAT" ${wx_arg_cache_file}`
+                        LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}`
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
                          if test "x$LINE" != x ; then
                            eval "DEFAULT_$LINE"
                          else
                            no_cache=1
                          fi
  
-                        ac_cv_use_expat='wxUSE_EXPAT='$DEFAULT_wxUSE_EXPAT
+                        wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_expat"
+          eval "$wx_cv_use_expat"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_expat >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_expat >> ${wx_arg_cache_file}.tmp
            fi
  
            if test "$wxUSE_EXPAT" = yes; then
            fi
  
            if test "$wxUSE_EXPAT" = yes; then
@@ -4519,7 +4421,16 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or
  
  
  
  
  
  
-          enablestring=
+          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}-shared" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
            no_cache=0
@@ -4527,40 +4438,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
  if test "${enable_shared+set}" = set; then
    enableval=$enable_shared;
                            if test "$enableval" = yes; then
  if test "${enable_shared+set}" = set; then
    enableval=$enable_shared;
                            if test "$enableval" = yes; then
-                            ac_cv_use_shared='wxUSE_SHARED=yes'
+                            wx_cv_use_shared='wxUSE_SHARED=yes'
                            else
                            else
-                            ac_cv_use_shared='wxUSE_SHARED=no'
+                            wx_cv_use_shared='wxUSE_SHARED=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SHARED" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED
+                          wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_shared"
+          eval "$wx_cv_use_shared"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_shared >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_shared >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SHARED" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SHARED = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SHARED
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+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
  
  
-          enablestring=
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
            no_cache=0
@@ -4568,40 +4493,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
  if test "${enable_optimise+set}" = set; then
    enableval=$enable_optimise;
                            if test "$enableval" = yes; then
  if test "${enable_optimise+set}" = set; then
    enableval=$enable_optimise;
                            if test "$enableval" = yes; then
-                            ac_cv_use_optimise='wxUSE_OPTIMISE=yes'
+                            wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
                            else
                            else
-                            ac_cv_use_optimise='wxUSE_OPTIMISE=no'
+                            wx_cv_use_optimise='wxUSE_OPTIMISE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_OPTIMISE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE
+                          wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_optimise"
+          eval "$wx_cv_use_optimise"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_optimise >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_optimise >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_OPTIMISE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_OPTIMISE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_OPTIMISE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-debug" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; }
            no_cache=0
@@ -4609,40 +4548,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; }
  if test "${enable_debug+set}" = set; then
    enableval=$enable_debug;
                            if test "$enableval" = yes; then
  if test "${enable_debug+set}" = set; then
    enableval=$enable_debug;
                            if test "$enableval" = yes; then
-                            ac_cv_use_debug='wxUSE_DEBUG=yes'
+                            wx_cv_use_debug='wxUSE_DEBUG=yes'
                            else
                            else
-                            ac_cv_use_debug='wxUSE_DEBUG=no'
+                            wx_cv_use_debug='wxUSE_DEBUG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DEBUG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_debug='wxUSE_DEBUG='$DEFAULT_wxUSE_DEBUG
+                          wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_debug"
+          eval "$wx_cv_use_debug"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_debug >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debug >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DEBUG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DEBUG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DEBUG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-stl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6; }
            no_cache=0
@@ -4650,40 +4603,361 @@ echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6; }
  if test "${enable_stl+set}" = set; then
    enableval=$enable_stl;
                            if test "$enableval" = yes; then
  if test "${enable_stl+set}" = set; then
    enableval=$enable_stl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_stl='wxUSE_STL=yes'
+                            wx_cv_use_stl='wxUSE_STL=yes'
                            else
                            else
-                            ac_cv_use_stl='wxUSE_STL=no'
+                            wx_cv_use_stl='wxUSE_STL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_stl='wxUSE_STL='$DEFAULT_wxUSE_STL
+                          wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_stl"
+          eval "$wx_cv_use_stl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_stl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_stl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STL
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          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}-std_iostreams" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-std_iostreams was given.
+if test "${enable_std_iostreams+set}" = set; then
+  enableval=$enable_std_iostreams;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
+                          else
+                            wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_std_iostreams"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STD_IOSTREAM = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_STD_IOSTREAM
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          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}-std_string" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-std_string was given.
+if test "${enable_std_string+set}" = set; then
+  enableval=$enable_std_string;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_std_string='wxUSE_STD_STRING=yes'
+                          else
+                            wx_cv_use_std_string='wxUSE_STD_STRING=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_std_string"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_std_string >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STD_STRING = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_STD_STRING
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+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}-unicode" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-unicode was given.
+if test "${enable_unicode+set}" = set; then
+  enableval=$enable_unicode;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_unicode='wxUSE_UNICODE=yes'
+                          else
+                            wx_cv_use_unicode='wxUSE_UNICODE=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_unicode"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_unicode >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_UNICODE = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_UNICODE
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          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}-mslu" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-mslu was given.
+if test "${enable_mslu+set}" = set; then
+  enableval=$enable_mslu;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
+                          else
+                            wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_mslu"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_mslu >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_UNICODE_MSLU = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_UNICODE_MSLU
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-utf8 was given.
+if test "${enable_utf8+set}" = set; then
+  enableval=$enable_utf8;
+                          wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
+
+else
+
+                          LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
+
+fi
+
+
+          eval "$wx_cv_use_utf8"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_utf8 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
+echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
+
+
+          enablestring=
+          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}-utf8only" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-utf8only was given.
+if test "${enable_utf8only+set}" = set; then
+  enableval=$enable_utf8only;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes'
+                          else
+                            wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_utf8only"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_utf8only >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_UNICODE_UTF8_LOCALE
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-extended_rtti" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-extended_rtti" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6; }
            no_cache=0
@@ -4691,42 +4965,56 @@ echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >
  if test "${enable_extended_rtti+set}" = set; then
    enableval=$enable_extended_rtti;
                            if test "$enableval" = yes; then
  if test "${enable_extended_rtti+set}" = set; then
    enableval=$enable_extended_rtti;
                            if test "$enableval" = yes; then
-                            ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes'
+                            wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes'
                            else
                            else
-                            ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
+                            wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_EXTENDED_RTTI" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI='$DEFAULT_wxUSE_EXTENDED_RTTI
+                          wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_extended_rtti"
+          eval "$wx_cv_use_extended_rtti"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_extended_rtti >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_extended_rtti >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_EXTENDED_RTTI" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_EXTENDED_RTTI = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_EXTENDED_RTTI
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  if test "$USE_OS2" = "1"; then
      DEFAULT_wxUSE_OMF=no
  
            enablestring=
  if test "$USE_OS2" = "1"; then
      DEFAULT_wxUSE_OMF=no
  
            enablestring=
+          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}-omf" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; }
            no_cache=0
@@ -4734,38 +5022,43 @@ echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; }
  if test "${enable_omf+set}" = set; then
    enableval=$enable_omf;
                            if test "$enableval" = yes; then
  if test "${enable_omf+set}" = set; then
    enableval=$enable_omf;
                            if test "$enableval" = yes; then
-                            ac_cv_use_omf='wxUSE_OMF=yes'
+                            wx_cv_use_omf='wxUSE_OMF=yes'
                            else
                            else
-                            ac_cv_use_omf='wxUSE_OMF=no'
+                            wx_cv_use_omf='wxUSE_OMF=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_OMF" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_omf='wxUSE_OMF='$DEFAULT_wxUSE_OMF
+                          wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_omf"
+          eval "$wx_cv_use_omf"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_omf >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_omf >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_OMF" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_OMF = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_OMF
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  fi
  
  if test "$wxUSE_DEBUG" = "yes"; then
  fi
  
  if test "$wxUSE_DEBUG" = "yes"; then
@@ -4780,6 +5073,15 @@ fi
  
  
            enablestring=
  
  
            enablestring=
+          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}-debug_flag" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
            no_cache=0
@@ -4787,40 +5089,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6;
  if test "${enable_debug_flag+set}" = set; then
    enableval=$enable_debug_flag;
                            if test "$enableval" = yes; then
  if test "${enable_debug_flag+set}" = set; then
    enableval=$enable_debug_flag;
                            if test "$enableval" = yes; then
-                            ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
+                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
                            else
                            else
-                            ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
+                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DEBUG_FLAG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG
+                          wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_debug_flag"
+          eval "$wx_cv_use_debug_flag"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DEBUG_FLAG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DEBUG_FLAG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DEBUG_FLAG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-debug_info" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
            no_cache=0
@@ -4828,40 +5144,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6;
  if test "${enable_debug_info+set}" = set; then
    enableval=$enable_debug_info;
                            if test "$enableval" = yes; then
  if test "${enable_debug_info+set}" = set; then
    enableval=$enable_debug_info;
                            if test "$enableval" = yes; then
-                            ac_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
+                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
                            else
                            else
-                            ac_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
+                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DEBUG_INFO" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO
+                          wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_debug_info"
+          eval "$wx_cv_use_debug_info"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_debug_info >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debug_info >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DEBUG_INFO" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DEBUG_INFO = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DEBUG_INFO
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-debug_gdb" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
            no_cache=0
@@ -4869,40 +5199,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6;
  if test "${enable_debug_gdb+set}" = set; then
    enableval=$enable_debug_gdb;
                            if test "$enableval" = yes; then
  if test "${enable_debug_gdb+set}" = set; then
    enableval=$enable_debug_gdb;
                            if test "$enableval" = yes; then
-                            ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
+                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
                            else
                            else
-                            ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
+                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DEBUG_GDB" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB='$DEFAULT_wxUSE_DEBUG_GDB
+                          wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_debug_gdb"
+          eval "$wx_cv_use_debug_gdb"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DEBUG_GDB" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DEBUG_GDB = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DEBUG_GDB
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-debug_cntxt" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
            no_cache=0
@@ -4910,40 +5254,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6
  if test "${enable_debug_cntxt+set}" = set; then
    enableval=$enable_debug_cntxt;
                            if test "$enableval" = yes; then
  if test "${enable_debug_cntxt+set}" = set; then
    enableval=$enable_debug_cntxt;
                            if test "$enableval" = yes; then
-                            ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
+                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
                            else
                            else
-                            ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
+                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DEBUG_CONTEXT" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT='$DEFAULT_wxUSE_DEBUG_CONTEXT
+                          wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_debug_cntxt"
+          eval "$wx_cv_use_debug_cntxt"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DEBUG_CONTEXT" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DEBUG_CONTEXT = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DEBUG_CONTEXT
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-mem_tracing" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
            no_cache=0
@@ -4951,40 +5309,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6
  if test "${enable_mem_tracing+set}" = set; then
    enableval=$enable_mem_tracing;
                            if test "$enableval" = yes; then
  if test "${enable_mem_tracing+set}" = set; then
    enableval=$enable_mem_tracing;
                            if test "$enableval" = yes; then
-                            ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
+                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
                            else
                            else
-                            ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
+                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MEM_TRACING" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING
+                          wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_mem_tracing"
+          eval "$wx_cv_use_mem_tracing"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MEM_TRACING" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MEM_TRACING = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_MEM_TRACING
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-profile" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-profile" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6; }
            no_cache=0
@@ -4992,40 +5364,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6; }
  if test "${enable_profile+set}" = set; then
    enableval=$enable_profile;
                            if test "$enableval" = yes; then
  if test "${enable_profile+set}" = set; then
    enableval=$enable_profile;
                            if test "$enableval" = yes; then
-                            ac_cv_use_profile='wxUSE_PROFILE=yes'
+                            wx_cv_use_profile='wxUSE_PROFILE=yes'
                            else
                            else
-                            ac_cv_use_profile='wxUSE_PROFILE=no'
+                            wx_cv_use_profile='wxUSE_PROFILE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PROFILE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE
+                          wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_profile"
+          eval "$wx_cv_use_profile"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_profile >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_profile >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PROFILE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROFILE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PROFILE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-no_rtti" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_rtti" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6; }
            no_cache=0
@@ -5033,40 +5419,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6; }
  if test "${enable_no_rtti+set}" = set; then
    enableval=$enable_no_rtti;
                            if test "$enableval" = yes; then
  if test "${enable_no_rtti+set}" = set; then
    enableval=$enable_no_rtti;
                            if test "$enableval" = yes; then
-                            ac_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
+                            wx_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
                            else
                            else
-                            ac_cv_use_no_rtti='wxUSE_NO_RTTI=no'
+                            wx_cv_use_no_rtti='wxUSE_NO_RTTI=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_NO_RTTI" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_no_rtti='wxUSE_NO_RTTI='$DEFAULT_wxUSE_NO_RTTI
+                          wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_no_rtti"
+          eval "$wx_cv_use_no_rtti"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_NO_RTTI" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_NO_RTTI = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_NO_RTTI
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-no_exceptions" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_exceptions" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >&6; }
            no_cache=0
@@ -5074,40 +5474,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >
  if test "${enable_no_exceptions+set}" = set; then
    enableval=$enable_no_exceptions;
                            if test "$enableval" = yes; then
  if test "${enable_no_exceptions+set}" = set; then
    enableval=$enable_no_exceptions;
                            if test "$enableval" = yes; then
-                            ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
+                            wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
                            else
                            else
-                            ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
+                            wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_NO_EXCEPTIONS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS='$DEFAULT_wxUSE_NO_EXCEPTIONS
+                          wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_no_exceptions"
+          eval "$wx_cv_use_no_exceptions"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_NO_EXCEPTIONS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_NO_EXCEPTIONS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_NO_EXCEPTIONS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-permissive" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-permissive" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6; }
            no_cache=0
@@ -5115,40 +5529,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6;
  if test "${enable_permissive+set}" = set; then
    enableval=$enable_permissive;
                            if test "$enableval" = yes; then
  if test "${enable_permissive+set}" = set; then
    enableval=$enable_permissive;
                            if test "$enableval" = yes; then
-                            ac_cv_use_permissive='wxUSE_PERMISSIVE=yes'
+                            wx_cv_use_permissive='wxUSE_PERMISSIVE=yes'
                            else
                            else
-                            ac_cv_use_permissive='wxUSE_PERMISSIVE=no'
+                            wx_cv_use_permissive='wxUSE_PERMISSIVE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_permissive='wxUSE_PERMISSIVE='$DEFAULT_wxUSE_PERMISSIVE
+                          wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_permissive"
+          eval "$wx_cv_use_permissive"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_permissive >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_permissive >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PERMISSIVE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PERMISSIVE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PERMISSIVE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            enablestring=
+          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}-no_deps" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_deps" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6; }
            no_cache=0
@@ -5156,40 +5584,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6; }
  if test "${enable_no_deps+set}" = set; then
    enableval=$enable_no_deps;
                            if test "$enableval" = yes; then
  if test "${enable_no_deps+set}" = set; then
    enableval=$enable_no_deps;
                            if test "$enableval" = yes; then
-                            ac_cv_use_no_deps='wxUSE_NO_DEPS=yes'
+                            wx_cv_use_no_deps='wxUSE_NO_DEPS=yes'
                            else
                            else
-                            ac_cv_use_no_deps='wxUSE_NO_DEPS=no'
+                            wx_cv_use_no_deps='wxUSE_NO_DEPS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_no_deps='wxUSE_NO_DEPS='$DEFAULT_wxUSE_NO_DEPS
+                          wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_no_deps"
+          eval "$wx_cv_use_no_deps"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_no_deps >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_no_deps >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_NO_DEPS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_NO_DEPS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_NO_DEPS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+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
  
  
-          enablestring=
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-vararg_macros" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-vararg_macros" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6; }
            no_cache=0
@@ -5197,38 +5639,43 @@ echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >
  if test "${enable_vararg_macros+set}" = set; then
    enableval=$enable_vararg_macros;
                            if test "$enableval" = yes; then
  if test "${enable_vararg_macros+set}" = set; then
    enableval=$enable_vararg_macros;
                            if test "$enableval" = yes; then
-                            ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes'
+                            wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes'
                            else
                            else
-                            ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no'
+                            wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_VARARG_MACROS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS='$DEFAULT_wxUSE_VARARG_MACROS
+                          wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_vararg_macros"
+          eval "$wx_cv_use_vararg_macros"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_VARARG_MACROS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_VARARG_MACROS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_VARARG_MACROS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
  
            enablestring=
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
@@ -5241,15 +5688,15 @@ if test "${enable_universal_binary+set}" = set; then
  
  else
  
  
  else
  
-                          LINE=`grep "wxUSE_UNIVERSAL_BINARY" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
-                            wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
                            else
                              no_cache=1
                            else
                              no_cache=1
-                            wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY=no"
                            fi
  
                            fi
  
+                          wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
+
  fi
  
  
  fi
  
  
@@ -5263,7 +5710,16 @@ echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
  
  
  
  
  
  
-          enablestring=enable
+          enablestring=
+          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}-compat26" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat26" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; }
            no_cache=0
@@ -5271,40 +5727,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; }
  if test "${enable_compat26+set}" = set; then
    enableval=$enable_compat26;
                            if test "$enableval" = yes; then
  if test "${enable_compat26+set}" = set; then
    enableval=$enable_compat26;
                            if test "$enableval" = yes; then
-                            ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes'
+                            wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes'
                            else
                            else
-                            ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no'
+                            wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "WXWIN_COMPATIBILITY_2_6" ${wx_arg_cache_file}`
+                          LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6='$DEFAULT_WXWIN_COMPATIBILITY_2_6
+                          wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_compat26"
+          eval "$wx_cv_use_compat26"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_compat26 >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_compat26 >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$WXWIN_COMPATIBILITY_2_6" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $WXWIN_COMPATIBILITY_2_6 = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$WXWIN_COMPATIBILITY_2_6
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=disable
  
            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}-compat28" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat28" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; }
            no_cache=0
@@ -5312,41 +5782,55 @@ echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; }
  if test "${enable_compat28+set}" = set; then
    enableval=$enable_compat28;
                            if test "$enableval" = yes; then
  if test "${enable_compat28+set}" = set; then
    enableval=$enable_compat28;
                            if test "$enableval" = yes; then
-                            ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes'
+                            wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes'
                            else
                            else
-                            ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
+                            wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "WXWIN_COMPATIBILITY_2_8" ${wx_arg_cache_file}`
+                          LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8='$DEFAULT_WXWIN_COMPATIBILITY_2_8
+                          wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_compat28"
+          eval "$wx_cv_use_compat28"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_compat28 >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_compat28 >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$WXWIN_COMPATIBILITY_2_8" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $WXWIN_COMPATIBILITY_2_8 = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$WXWIN_COMPATIBILITY_2_8
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
  
  
-          enablestring=
+
+          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}-rpath" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6; }
            no_cache=0
@@ -5354,43 +5838,168 @@ echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6; }
  if test "${enable_rpath+set}" = set; then
    enableval=$enable_rpath;
                            if test "$enableval" = yes; then
  if test "${enable_rpath+set}" = set; then
    enableval=$enable_rpath;
                            if test "$enableval" = yes; then
-                            ac_cv_use_rpath='wxUSE_RPATH=yes'
+                            wx_cv_use_rpath='wxUSE_RPATH=yes'
                            else
                            else
-                            ac_cv_use_rpath='wxUSE_RPATH=no'
+                            wx_cv_use_rpath='wxUSE_RPATH=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_RPATH" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_rpath='wxUSE_RPATH='$DEFAULT_wxUSE_RPATH
+                          wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_rpath"
+          eval "$wx_cv_use_rpath"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_rpath >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_rpath >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_RPATH" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RPATH = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_RPATH
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+
+          enablestring=
+          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}-objc_uniquifying" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-objc_uniquifying was given.
+if test "${enable_objc_uniquifying+set}" = set; then
+  enableval=$enable_objc_uniquifying;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes'
+                          else
+                            wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_objc_uniquifying"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_objc_uniquifying >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_OBJC_UNIQUIFYING = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_OBJC_UNIQUIFYING
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+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}-visibility" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-visibility was given.
+if test "${enable_visibility+set}" = set; then
+  enableval=$enable_visibility;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_visibility='wxUSE_VISIBILITY=yes'
+                          else
+                            wx_cv_use_visibility='wxUSE_VISIBILITY=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_visibility"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_visibility >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_VISIBILITY = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_VISIBILITY
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
  
  
            enablestring=
  
  
  
  
            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}-intl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-intl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6; }
            no_cache=0
@@ -5398,40 +6007,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6; }
  if test "${enable_intl+set}" = set; then
    enableval=$enable_intl;
                            if test "$enableval" = yes; then
  if test "${enable_intl+set}" = set; then
    enableval=$enable_intl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_intl='wxUSE_INTL=yes'
+                            wx_cv_use_intl='wxUSE_INTL=yes'
                            else
                            else
-                            ac_cv_use_intl='wxUSE_INTL=no'
+                            wx_cv_use_intl='wxUSE_INTL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL
+                          wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_intl"
+          eval "$wx_cv_use_intl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_intl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_intl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_INTL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_INTL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_INTL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-config" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-config" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6; }
            no_cache=0
@@ -5439,41 +6062,55 @@ echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6; }
  if test "${enable_config+set}" = set; then
    enableval=$enable_config;
                            if test "$enableval" = yes; then
  if test "${enable_config+set}" = set; then
    enableval=$enable_config;
                            if test "$enableval" = yes; then
-                            ac_cv_use_config='wxUSE_CONFIG=yes'
+                            wx_cv_use_config='wxUSE_CONFIG=yes'
                            else
                            else
-                            ac_cv_use_config='wxUSE_CONFIG=no'
+                            wx_cv_use_config='wxUSE_CONFIG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CONFIG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG
+                          wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_config"
+          eval "$wx_cv_use_config"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_config >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_config >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CONFIG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CONFIG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CONFIG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
  
            enablestring=
  
  
            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}-protocols" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocols" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6; }
            no_cache=0
@@ -5481,40 +6118,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6;
  if test "${enable_protocols+set}" = set; then
    enableval=$enable_protocols;
                            if test "$enableval" = yes; then
  if test "${enable_protocols+set}" = set; then
    enableval=$enable_protocols;
                            if test "$enableval" = yes; then
-                            ac_cv_use_protocols='wxUSE_PROTOCOL=yes'
+                            wx_cv_use_protocols='wxUSE_PROTOCOL=yes'
                            else
                            else
-                            ac_cv_use_protocols='wxUSE_PROTOCOL=no'
+                            wx_cv_use_protocols='wxUSE_PROTOCOL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_protocols='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL
+                          wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_protocols"
+          eval "$wx_cv_use_protocols"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_protocols >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_protocols >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PROTOCOL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROTOCOL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PROTOCOL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-ftp" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ftp" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6; }
            no_cache=0
@@ -5522,40 +6173,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6; }
  if test "${enable_ftp+set}" = set; then
    enableval=$enable_ftp;
                            if test "$enableval" = yes; then
  if test "${enable_ftp+set}" = set; then
    enableval=$enable_ftp;
                            if test "$enableval" = yes; then
-                            ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
+                            wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
                            else
                            else
-                            ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
+                            wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP
+                          wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_ftp"
+          eval "$wx_cv_use_ftp"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_ftp >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_ftp >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PROTOCOL_FTP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROTOCOL_FTP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PROTOCOL_FTP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-http" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-http" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6; }
            no_cache=0
@@ -5563,40 +6228,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6; }
  if test "${enable_http+set}" = set; then
    enableval=$enable_http;
                            if test "$enableval" = yes; then
  if test "${enable_http+set}" = set; then
    enableval=$enable_http;
                            if test "$enableval" = yes; then
-                            ac_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
+                            wx_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
                            else
                            else
-                            ac_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
+                            wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP
+                          wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_http"
+          eval "$wx_cv_use_http"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_http >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_http >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PROTOCOL_HTTP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROTOCOL_HTTP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PROTOCOL_HTTP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-fileproto" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fileproto" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6; }
            no_cache=0
@@ -5604,40 +6283,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6;
  if test "${enable_fileproto+set}" = set; then
    enableval=$enable_fileproto;
                            if test "$enableval" = yes; then
  if test "${enable_fileproto+set}" = set; then
    enableval=$enable_fileproto;
                            if test "$enableval" = yes; then
-                            ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
+                            wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
                            else
                            else
-                            ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
+                            wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE
+                          wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_fileproto"
+          eval "$wx_cv_use_fileproto"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_fileproto >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fileproto >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PROTOCOL_FILE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROTOCOL_FILE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PROTOCOL_FILE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-sockets" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sockets" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6; }
            no_cache=0
@@ -5645,40 +6338,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6; }
  if test "${enable_sockets+set}" = set; then
    enableval=$enable_sockets;
                            if test "$enableval" = yes; then
  if test "${enable_sockets+set}" = set; then
    enableval=$enable_sockets;
                            if test "$enableval" = yes; then
-                            ac_cv_use_sockets='wxUSE_SOCKETS=yes'
+                            wx_cv_use_sockets='wxUSE_SOCKETS=yes'
                            else
                            else
-                            ac_cv_use_sockets='wxUSE_SOCKETS=no'
+                            wx_cv_use_sockets='wxUSE_SOCKETS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SOCKETS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_sockets='wxUSE_SOCKETS='$DEFAULT_wxUSE_SOCKETS
+                          wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_sockets"
+          eval "$wx_cv_use_sockets"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_sockets >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_sockets >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SOCKETS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SOCKETS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SOCKETS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-ole" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ole" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6; }
            no_cache=0
@@ -5686,40 +6393,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6; }
  if test "${enable_ole+set}" = set; then
    enableval=$enable_ole;
                            if test "$enableval" = yes; then
  if test "${enable_ole+set}" = set; then
    enableval=$enable_ole;
                            if test "$enableval" = yes; then
-                            ac_cv_use_ole='wxUSE_OLE=yes'
+                            wx_cv_use_ole='wxUSE_OLE=yes'
                            else
                            else
-                            ac_cv_use_ole='wxUSE_OLE=no'
+                            wx_cv_use_ole='wxUSE_OLE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_OLE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_ole='wxUSE_OLE='$DEFAULT_wxUSE_OLE
+                          wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_ole"
+          eval "$wx_cv_use_ole"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_ole >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_ole >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_OLE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_OLE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_OLE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-dataobj" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataobj" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6; }
            no_cache=0
@@ -5727,41 +6448,55 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6; }
  if test "${enable_dataobj+set}" = set; then
    enableval=$enable_dataobj;
                            if test "$enableval" = yes; then
  if test "${enable_dataobj+set}" = set; then
    enableval=$enable_dataobj;
                            if test "$enableval" = yes; then
-                            ac_cv_use_dataobj='wxUSE_DATAOBJ=yes'
+                            wx_cv_use_dataobj='wxUSE_DATAOBJ=yes'
                            else
                            else
-                            ac_cv_use_dataobj='wxUSE_DATAOBJ=no'
+                            wx_cv_use_dataobj='wxUSE_DATAOBJ=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DATAOBJ" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_dataobj='wxUSE_DATAOBJ='$DEFAULT_wxUSE_DATAOBJ
+                          wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_dataobj"
+          eval "$wx_cv_use_dataobj"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_dataobj >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dataobj >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DATAOBJ" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DATAOBJ = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DATAOBJ
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
  
            enablestring=
  
  
            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}-ipc" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipc" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6; }
            no_cache=0
@@ -5769,41 +6504,221 @@ echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6; }
  if test "${enable_ipc+set}" = set; then
    enableval=$enable_ipc;
                            if test "$enableval" = yes; then
  if test "${enable_ipc+set}" = set; then
    enableval=$enable_ipc;
                            if test "$enableval" = yes; then
-                            ac_cv_use_ipc='wxUSE_IPC=yes'
+                            wx_cv_use_ipc='wxUSE_IPC=yes'
                            else
                            else
-                            ac_cv_use_ipc='wxUSE_IPC=no'
+                            wx_cv_use_ipc='wxUSE_IPC=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC
+                          wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_ipc"
+          eval "$wx_cv_use_ipc"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_ipc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_ipc >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_IPC" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_IPC = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_IPC
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
  
            enablestring=
  
  
            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}-baseevtloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-baseevtloop... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-baseevtloop was given.
+if test "${enable_baseevtloop+set}" = set; then
+  enableval=$enable_baseevtloop;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes'
+                          else
+                            wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_baseevtloop"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_baseevtloop >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CONSOLE_EVENTLOOP = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_CONSOLE_EVENTLOOP
+          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}-epoolloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-epoolloop... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-epoolloop was given.
+if test "${enable_epoolloop+set}" = set; then
+  enableval=$enable_epoolloop;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes'
+                          else
+                            wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_epoolloop"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_epoolloop >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_EPOLL_DISPATCHER = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_EPOLL_DISPATCHER
+          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}-selectloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-selectloop... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-selectloop was given.
+if test "${enable_selectloop+set}" = set; then
+  enableval=$enable_selectloop;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes'
+                          else
+                            wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_selectloop"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_selectloop >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SELECT_DISPATCHER = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_SELECT_DISPATCHER
+          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}-apple_ieee" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6; }
            no_cache=0
@@ -5811,40 +6726,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6;
  if test "${enable_apple_ieee+set}" = set; then
    enableval=$enable_apple_ieee;
                            if test "$enableval" = yes; then
  if test "${enable_apple_ieee+set}" = set; then
    enableval=$enable_apple_ieee;
                            if test "$enableval" = yes; then
-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
+                            wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
                            else
                            else
-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+                            wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
+                          wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_apple_ieee"
+          eval "$wx_cv_use_apple_ieee"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_APPLE_IEEE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_APPLE_IEEE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_APPLE_IEEE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-arcstream" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arcstream" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6; }
            no_cache=0
@@ -5852,40 +6781,109 @@ echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6;
  if test "${enable_arcstream+set}" = set; then
    enableval=$enable_arcstream;
                            if test "$enableval" = yes; then
  if test "${enable_arcstream+set}" = set; then
    enableval=$enable_arcstream;
                            if test "$enableval" = yes; then
-                            ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes'
+                            wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes'
                            else
                            else
-                            ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'
+                            wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_ARCHIVE_STREAMS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS='$DEFAULT_wxUSE_ARCHIVE_STREAMS
+                          wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_arcstream"
+          eval "$wx_cv_use_arcstream"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_arcstream >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_arcstream >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_ARCHIVE_STREAMS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ARCHIVE_STREAMS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_ARCHIVE_STREAMS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-base64" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-base64... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-base64 was given.
+if test "${enable_base64+set}" = set; then
+  enableval=$enable_base64;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_base64='wxUSE_BASE64=yes'
+                          else
+                            wx_cv_use_base64='wxUSE_BASE64=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_base64"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_base64 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_BASE64 = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_BASE64
+          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}-backtrace" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6; }
            no_cache=0
@@ -5893,40 +6891,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6;
  if test "${enable_backtrace+set}" = set; then
    enableval=$enable_backtrace;
                            if test "$enableval" = yes; then
  if test "${enable_backtrace+set}" = set; then
    enableval=$enable_backtrace;
                            if test "$enableval" = yes; then
-                            ac_cv_use_backtrace='wxUSE_STACKWALKER=yes'
+                            wx_cv_use_backtrace='wxUSE_STACKWALKER=yes'
                            else
                            else
-                            ac_cv_use_backtrace='wxUSE_STACKWALKER=no'
+                            wx_cv_use_backtrace='wxUSE_STACKWALKER=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STACKWALKER" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_backtrace='wxUSE_STACKWALKER='$DEFAULT_wxUSE_STACKWALKER
+                          wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_backtrace"
+          eval "$wx_cv_use_backtrace"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_backtrace >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_backtrace >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STACKWALKER" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STACKWALKER = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STACKWALKER
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-catch_segvs" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6; }
            no_cache=0
@@ -5934,40 +6946,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6
  if test "${enable_catch_segvs+set}" = set; then
    enableval=$enable_catch_segvs;
                            if test "$enableval" = yes; then
  if test "${enable_catch_segvs+set}" = set; then
    enableval=$enable_catch_segvs;
                            if test "$enableval" = yes; then
-                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
+                            wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
                            else
                            else
-                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
+                            wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION
+                          wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_catch_segvs"
+          eval "$wx_cv_use_catch_segvs"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ON_FATAL_EXCEPTION = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_ON_FATAL_EXCEPTION
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-cmdline" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6; }
            no_cache=0
@@ -5975,40 +7001,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6; }
  if test "${enable_cmdline+set}" = set; then
    enableval=$enable_cmdline;
                            if test "$enableval" = yes; then
  if test "${enable_cmdline+set}" = set; then
    enableval=$enable_cmdline;
                            if test "$enableval" = yes; then
-                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
+                            wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
                            else
                            else
-                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
+                            wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER
+                          wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_cmdline"
+          eval "$wx_cv_use_cmdline"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CMDLINE_PARSER" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CMDLINE_PARSER = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CMDLINE_PARSER
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-datetime" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6; }
            no_cache=0
@@ -6016,40 +7056,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6; }
  if test "${enable_datetime+set}" = set; then
    enableval=$enable_datetime;
                            if test "$enableval" = yes; then
  if test "${enable_datetime+set}" = set; then
    enableval=$enable_datetime;
                            if test "$enableval" = yes; then
-                            ac_cv_use_datetime='wxUSE_DATETIME=yes'
+                            wx_cv_use_datetime='wxUSE_DATETIME=yes'
                            else
                            else
-                            ac_cv_use_datetime='wxUSE_DATETIME=no'
+                            wx_cv_use_datetime='wxUSE_DATETIME=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME
+                          wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_datetime"
+          eval "$wx_cv_use_datetime"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_datetime >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DATETIME" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DATETIME = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DATETIME
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-debugreport" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debugreport" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6; }
            no_cache=0
@@ -6057,40 +7111,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6
  if test "${enable_debugreport+set}" = set; then
    enableval=$enable_debugreport;
                            if test "$enableval" = yes; then
  if test "${enable_debugreport+set}" = set; then
    enableval=$enable_debugreport;
                            if test "$enableval" = yes; then
-                            ac_cv_use_debugreport='wxUSE_DEBUGREPORT=yes'
+                            wx_cv_use_debugreport='wxUSE_DEBUGREPORT=yes'
                            else
                            else
-                            ac_cv_use_debugreport='wxUSE_DEBUGREPORT=no'
+                            wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DEBUGREPORT" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_debugreport='wxUSE_DEBUGREPORT='$DEFAULT_wxUSE_DEBUGREPORT
+                          wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_debugreport"
+          eval "$wx_cv_use_debugreport"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_debugreport >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debugreport >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DEBUGREPORT" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DEBUGREPORT = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DEBUGREPORT
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-dialupman" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6; }
            no_cache=0
@@ -6098,40 +7166,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6;
  if test "${enable_dialupman+set}" = set; then
    enableval=$enable_dialupman;
                            if test "$enableval" = yes; then
  if test "${enable_dialupman+set}" = set; then
    enableval=$enable_dialupman;
                            if test "$enableval" = yes; then
-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
+                            wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
                            else
                            else
-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+                            wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
+                          wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_dialupman"
+          eval "$wx_cv_use_dialupman"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DIALUP_MANAGER" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DIALUP_MANAGER = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DIALUP_MANAGER
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-dynlib" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynlib" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6; }
            no_cache=0
@@ -6139,40 +7221,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6; }
  if test "${enable_dynlib+set}" = set; then
    enableval=$enable_dynlib;
                            if test "$enableval" = yes; then
  if test "${enable_dynlib+set}" = set; then
    enableval=$enable_dynlib;
                            if test "$enableval" = yes; then
-                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
+                            wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
                            else
                            else
-                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
+                            wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS
+                          wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_dynlib"
+          eval "$wx_cv_use_dynlib"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DYNLIB_CLASS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DYNLIB_CLASS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DYNLIB_CLASS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-dynamicloader" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynamicloader" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6; }
            no_cache=0
@@ -6180,40 +7276,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >
  if test "${enable_dynamicloader+set}" = set; then
    enableval=$enable_dynamicloader;
                            if test "$enableval" = yes; then
  if test "${enable_dynamicloader+set}" = set; then
    enableval=$enable_dynamicloader;
                            if test "$enableval" = yes; then
-                            ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
+                            wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
                            else
                            else
-                            ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
+                            wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DYNAMIC_LOADER" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER='$DEFAULT_wxUSE_DYNAMIC_LOADER
+                          wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_dynamicloader"
+          eval "$wx_cv_use_dynamicloader"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DYNAMIC_LOADER" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DYNAMIC_LOADER = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DYNAMIC_LOADER
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-exceptions" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-exceptions" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6; }
            no_cache=0
@@ -6221,40 +7331,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6;
  if test "${enable_exceptions+set}" = set; then
    enableval=$enable_exceptions;
                            if test "$enableval" = yes; then
  if test "${enable_exceptions+set}" = set; then
    enableval=$enable_exceptions;
                            if test "$enableval" = yes; then
-                            ac_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'
+                            wx_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'
                            else
                            else
-                            ac_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
+                            wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_EXCEPTIONS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_exceptions='wxUSE_EXCEPTIONS='$DEFAULT_wxUSE_EXCEPTIONS
+                          wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_exceptions"
+          eval "$wx_cv_use_exceptions"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_exceptions >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_exceptions >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_EXCEPTIONS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_EXCEPTIONS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_EXCEPTIONS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-ffile" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6; }
            no_cache=0
@@ -6262,40 +7386,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6; }
  if test "${enable_ffile+set}" = set; then
    enableval=$enable_ffile;
                            if test "$enableval" = yes; then
  if test "${enable_ffile+set}" = set; then
    enableval=$enable_ffile;
                            if test "$enableval" = yes; then
-                            ac_cv_use_ffile='wxUSE_FFILE=yes'
+                            wx_cv_use_ffile='wxUSE_FFILE=yes'
                            else
                            else
-                            ac_cv_use_ffile='wxUSE_FFILE=no'
+                            wx_cv_use_ffile='wxUSE_FFILE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE
+                          wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_ffile"
+          eval "$wx_cv_use_ffile"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_ffile >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FFILE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FFILE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FFILE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-file" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6; }
            no_cache=0
@@ -6303,40 +7441,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6; }
  if test "${enable_file+set}" = set; then
    enableval=$enable_file;
                            if test "$enableval" = yes; then
  if test "${enable_file+set}" = set; then
    enableval=$enable_file;
                            if test "$enableval" = yes; then
-                            ac_cv_use_file='wxUSE_FILE=yes'
+                            wx_cv_use_file='wxUSE_FILE=yes'
                            else
                            else
-                            ac_cv_use_file='wxUSE_FILE=no'
+                            wx_cv_use_file='wxUSE_FILE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
+                          wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_file"
+          eval "$wx_cv_use_file"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_file >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FILE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FILE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FILE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-filesystem" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6; }
            no_cache=0
@@ -6344,40 +7496,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6;
  if test "${enable_filesystem+set}" = set; then
    enableval=$enable_filesystem;
                            if test "$enableval" = yes; then
  if test "${enable_filesystem+set}" = set; then
    enableval=$enable_filesystem;
                            if test "$enableval" = yes; then
-                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
+                            wx_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
                            else
                            else
-                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
+                            wx_cv_use_filesystem='wxUSE_FILESYSTEM=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM
+                          wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_filesystem"
+          eval "$wx_cv_use_filesystem"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FILESYSTEM" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FILESYSTEM = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FILESYSTEM
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-fontmap" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6; }
            no_cache=0
@@ -6385,40 +7551,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6; }
  if test "${enable_fontmap+set}" = set; then
    enableval=$enable_fontmap;
                            if test "$enableval" = yes; then
  if test "${enable_fontmap+set}" = set; then
    enableval=$enable_fontmap;
                            if test "$enableval" = yes; then
-                            ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
+                            wx_cv_use_fontmap='wxUSE_FONTMAP=yes'
                            else
                            else
-                            ac_cv_use_fontmap='wxUSE_FONTMAP=no'
+                            wx_cv_use_fontmap='wxUSE_FONTMAP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
+                          wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_fontmap"
+          eval "$wx_cv_use_fontmap"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FONTMAP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FONTMAP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FONTMAP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-fs_archive" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_archive" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6; }
            no_cache=0
@@ -6426,40 +7606,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6;
  if test "${enable_fs_archive+set}" = set; then
    enableval=$enable_fs_archive;
                            if test "$enableval" = yes; then
  if test "${enable_fs_archive+set}" = set; then
    enableval=$enable_fs_archive;
                            if test "$enableval" = yes; then
-                            ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes'
+                            wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes'
                            else
                            else
-                            ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no'
+                            wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FS_ARCHIVE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE='$DEFAULT_wxUSE_FS_ARCHIVE
+                          wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_fs_archive"
+          eval "$wx_cv_use_fs_archive"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FS_ARCHIVE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FS_ARCHIVE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FS_ARCHIVE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-fs_inet" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6; }
            no_cache=0
@@ -6467,40 +7661,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6; }
  if test "${enable_fs_inet+set}" = set; then
    enableval=$enable_fs_inet;
                            if test "$enableval" = yes; then
  if test "${enable_fs_inet+set}" = set; then
    enableval=$enable_fs_inet;
                            if test "$enableval" = yes; then
-                            ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
+                            wx_cv_use_fs_inet='wxUSE_FS_INET=yes'
                            else
                            else
-                            ac_cv_use_fs_inet='wxUSE_FS_INET=no'
+                            wx_cv_use_fs_inet='wxUSE_FS_INET=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET
+                          wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_fs_inet"
+          eval "$wx_cv_use_fs_inet"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FS_INET" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FS_INET = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FS_INET
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-fs_zip" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6; }
            no_cache=0
@@ -6508,40 +7716,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6; }
  if test "${enable_fs_zip+set}" = set; then
    enableval=$enable_fs_zip;
                            if test "$enableval" = yes; then
  if test "${enable_fs_zip+set}" = set; then
    enableval=$enable_fs_zip;
                            if test "$enableval" = yes; then
-                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
+                            wx_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
                            else
                            else
-                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
+                            wx_cv_use_fs_zip='wxUSE_FS_ZIP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP
+                          wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_fs_zip"
+          eval "$wx_cv_use_fs_zip"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FS_ZIP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FS_ZIP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FS_ZIP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-geometry" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6; }
            no_cache=0
@@ -6549,40 +7771,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6; }
  if test "${enable_geometry+set}" = set; then
    enableval=$enable_geometry;
                            if test "$enableval" = yes; then
  if test "${enable_geometry+set}" = set; then
    enableval=$enable_geometry;
                            if test "$enableval" = yes; then
-                            ac_cv_use_geometry='wxUSE_GEOMETRY=yes'
+                            wx_cv_use_geometry='wxUSE_GEOMETRY=yes'
                            else
                            else
-                            ac_cv_use_geometry='wxUSE_GEOMETRY=no'
+                            wx_cv_use_geometry='wxUSE_GEOMETRY=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY
+                          wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_geometry"
+          eval "$wx_cv_use_geometry"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_geometry >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_GEOMETRY" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_GEOMETRY = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_GEOMETRY
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-log" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6; }
            no_cache=0
@@ -6590,40 +7826,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6; }
  if test "${enable_log+set}" = set; then
    enableval=$enable_log;
                            if test "$enableval" = yes; then
  if test "${enable_log+set}" = set; then
    enableval=$enable_log;
                            if test "$enableval" = yes; then
-                            ac_cv_use_log='wxUSE_LOG=yes'
+                            wx_cv_use_log='wxUSE_LOG=yes'
                            else
                            else
-                            ac_cv_use_log='wxUSE_LOG=no'
+                            wx_cv_use_log='wxUSE_LOG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG
+                          wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_log"
+          eval "$wx_cv_use_log"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_log >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LOG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_LOG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LOG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-longlong" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6; }
            no_cache=0
@@ -6631,40 +7881,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6; }
  if test "${enable_longlong+set}" = set; then
    enableval=$enable_longlong;
                            if test "$enableval" = yes; then
  if test "${enable_longlong+set}" = set; then
    enableval=$enable_longlong;
                            if test "$enableval" = yes; then
-                            ac_cv_use_longlong='wxUSE_LONGLONG=yes'
+                            wx_cv_use_longlong='wxUSE_LONGLONG=yes'
                            else
                            else
-                            ac_cv_use_longlong='wxUSE_LONGLONG=no'
+                            wx_cv_use_longlong='wxUSE_LONGLONG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG
+                          wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_longlong"
+          eval "$wx_cv_use_longlong"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_longlong >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LONGLONG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_LONGLONG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LONGLONG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-mimetype" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6; }
            no_cache=0
@@ -6672,122 +7936,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6; }
  if test "${enable_mimetype+set}" = set; then
    enableval=$enable_mimetype;
                            if test "$enableval" = yes; then
  if test "${enable_mimetype+set}" = set; then
    enableval=$enable_mimetype;
                            if test "$enableval" = yes; then
-                            ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
+                            wx_cv_use_mimetype='wxUSE_MIMETYPE=yes'
                            else
                            else
-                            ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
+                            wx_cv_use_mimetype='wxUSE_MIMETYPE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
+                          wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_mimetype"
+          eval "$wx_cv_use_mimetype"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MIMETYPE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MIMETYPE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          fi
-
-
-          enablestring=
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6; }
-          no_cache=0
-          # Check whether --enable-mslu was given.
-if test "${enable_mslu+set}" = set; then
-  enableval=$enable_mslu;
-                          if test "$enableval" = yes; then
-                            ac_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
-                          else
-                            ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_UNICODE_MSLU" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_mslu='wxUSE_UNICODE_MSLU='$DEFAULT_wxUSE_UNICODE_MSLU
-
-fi
-
-
-          eval "$ac_cv_use_mslu"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_mslu >> ${wx_arg_cache_file}.tmp
+            result=$wxUSE_MIMETYPE
            fi
  
            fi
  
-          if test "$wxUSE_UNICODE_MSLU" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-          else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          fi
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
            enablestring=
  
  
            enablestring=
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; }
-          no_cache=0
-          # Check whether --enable-utf8 was given.
-if test "${enable_utf8+set}" = set; then
-  enableval=$enable_utf8;
-                          if test "$enableval" = yes; then
-                            ac_cv_use_utf8='wxUSE_UNICODE_UTF8=yes'
-                          else
-                            ac_cv_use_utf8='wxUSE_UNICODE_UTF8=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_UNICODE_UTF8" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
-
-fi
-
-
-          eval "$ac_cv_use_utf8"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_utf8 >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_UNICODE_UTF8" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-          else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
            fi
  
            fi
  
-
-          enablestring=
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6; }
            no_cache=0
@@ -6795,122 +7991,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6; }
  if test "${enable_snglinst+set}" = set; then
    enableval=$enable_snglinst;
                            if test "$enableval" = yes; then
  if test "${enable_snglinst+set}" = set; then
    enableval=$enable_snglinst;
                            if test "$enableval" = yes; then
-                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
+                            wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
                            else
                            else
-                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
+                            wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
+                          wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_snglinst"
+          eval "$wx_cv_use_snglinst"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SNGLINST_CHECKER" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SNGLINST_CHECKER = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SNGLINST_CHECKER
            fi
  
            fi
  
-
-          enablestring=
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6; }
-          no_cache=0
-          # Check whether --enable-std_iostreams was given.
-if test "${enable_std_iostreams+set}" = set; then
-  enableval=$enable_std_iostreams;
-                          if test "$enableval" = yes; then
-                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
-                          else
-                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM
-
-fi
-
-
-          eval "$ac_cv_use_std_iostreams"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_STD_IOSTREAM" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-          else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          fi
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
            enablestring=
  
  
            enablestring=
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6; }
-          no_cache=0
-          # Check whether --enable-std_string was given.
-if test "${enable_std_string+set}" = set; then
-  enableval=$enable_std_string;
-                          if test "$enableval" = yes; then
-                            ac_cv_use_std_string='wxUSE_STD_STRING=yes'
-                          else
-                            ac_cv_use_std_string='wxUSE_STD_STRING=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_STD_STRING" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_std_string='wxUSE_STD_STRING='$DEFAULT_wxUSE_STD_STRING
-
-fi
-
-
-          eval "$ac_cv_use_std_string"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_std_string >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_STD_STRING" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-          else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
            fi
  
            fi
  
-
-          enablestring=
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6; }
            no_cache=0
@@ -6918,40 +8046,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6; }
  if test "${enable_stdpaths+set}" = set; then
    enableval=$enable_stdpaths;
                            if test "$enableval" = yes; then
  if test "${enable_stdpaths+set}" = set; then
    enableval=$enable_stdpaths;
                            if test "$enableval" = yes; then
-                            ac_cv_use_stdpaths='wxUSE_STDPATHS=yes'
+                            wx_cv_use_stdpaths='wxUSE_STDPATHS=yes'
                            else
                            else
-                            ac_cv_use_stdpaths='wxUSE_STDPATHS=no'
+                            wx_cv_use_stdpaths='wxUSE_STDPATHS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STDPATHS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_stdpaths='wxUSE_STDPATHS='$DEFAULT_wxUSE_STDPATHS
+                          wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_stdpaths"
+          eval "$wx_cv_use_stdpaths"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STDPATHS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STDPATHS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STDPATHS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-stopwatch" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6; }
            no_cache=0
@@ -6959,40 +8101,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6;
  if test "${enable_stopwatch+set}" = set; then
    enableval=$enable_stopwatch;
                            if test "$enableval" = yes; then
  if test "${enable_stopwatch+set}" = set; then
    enableval=$enable_stopwatch;
                            if test "$enableval" = yes; then
-                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
+                            wx_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
                            else
                            else
-                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
+                            wx_cv_use_stopwatch='wxUSE_STOPWATCH=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
+                          wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_stopwatch"
+          eval "$wx_cv_use_stopwatch"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STOPWATCH" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STOPWATCH = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STOPWATCH
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-streams" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6; }
            no_cache=0
@@ -7000,40 +8156,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6; }
  if test "${enable_streams+set}" = set; then
    enableval=$enable_streams;
                            if test "$enableval" = yes; then
  if test "${enable_streams+set}" = set; then
    enableval=$enable_streams;
                            if test "$enableval" = yes; then
-                            ac_cv_use_streams='wxUSE_STREAMS=yes'
+                            wx_cv_use_streams='wxUSE_STREAMS=yes'
                            else
                            else
-                            ac_cv_use_streams='wxUSE_STREAMS=no'
+                            wx_cv_use_streams='wxUSE_STREAMS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
+                          wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_streams"
+          eval "$wx_cv_use_streams"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_streams >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STREAMS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STREAMS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STREAMS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-system_options" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6; }
            no_cache=0
@@ -7041,40 +8211,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C"
  if test "${enable_system_options+set}" = set; then
    enableval=$enable_system_options;
                            if test "$enableval" = yes; then
  if test "${enable_system_options+set}" = set; then
    enableval=$enable_system_options;
                            if test "$enableval" = yes; then
-                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
+                            wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
                            else
                            else
-                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
+                            wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS
+                          wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_system_options"
+          eval "$wx_cv_use_system_options"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_system_options >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SYSTEM_OPTIONS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SYSTEM_OPTIONS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SYSTEM_OPTIONS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-tarstream" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tarstream" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6; }
            no_cache=0
@@ -7082,40 +8266,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6;
  if test "${enable_tarstream+set}" = set; then
    enableval=$enable_tarstream;
                            if test "$enableval" = yes; then
  if test "${enable_tarstream+set}" = set; then
    enableval=$enable_tarstream;
                            if test "$enableval" = yes; then
-                            ac_cv_use_tarstream='wxUSE_TARSTREAM=yes'
+                            wx_cv_use_tarstream='wxUSE_TARSTREAM=yes'
                            else
                            else
-                            ac_cv_use_tarstream='wxUSE_TARSTREAM=no'
+                            wx_cv_use_tarstream='wxUSE_TARSTREAM=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TARSTREAM" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_tarstream='wxUSE_TARSTREAM='$DEFAULT_wxUSE_TARSTREAM
+                          wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_tarstream"
+          eval "$wx_cv_use_tarstream"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_tarstream >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tarstream >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TARSTREAM" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TARSTREAM = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TARSTREAM
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-textbuf" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6; }
            no_cache=0
@@ -7123,40 +8321,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6; }
  if test "${enable_textbuf+set}" = set; then
    enableval=$enable_textbuf;
                            if test "$enableval" = yes; then
  if test "${enable_textbuf+set}" = set; then
    enableval=$enable_textbuf;
                            if test "$enableval" = yes; then
-                            ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
+                            wx_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
                            else
                            else
-                            ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
+                            wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER
+                          wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_textbuf"
+          eval "$wx_cv_use_textbuf"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TEXTBUFFER" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TEXTBUFFER = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TEXTBUFFER
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-textfile" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6; }
            no_cache=0
@@ -7164,40 +8376,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6; }
  if test "${enable_textfile+set}" = set; then
    enableval=$enable_textfile;
                            if test "$enableval" = yes; then
  if test "${enable_textfile+set}" = set; then
    enableval=$enable_textfile;
                            if test "$enableval" = yes; then
-                            ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
+                            wx_cv_use_textfile='wxUSE_TEXTFILE=yes'
                            else
                            else
-                            ac_cv_use_textfile='wxUSE_TEXTFILE=no'
+                            wx_cv_use_textfile='wxUSE_TEXTFILE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
+                          wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_textfile"
+          eval "$wx_cv_use_textfile"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_textfile >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TEXTFILE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TEXTFILE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TEXTFILE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-timer" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6; }
            no_cache=0
@@ -7205,81 +8431,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6; }
  if test "${enable_timer+set}" = set; then
    enableval=$enable_timer;
                            if test "$enableval" = yes; then
  if test "${enable_timer+set}" = set; then
    enableval=$enable_timer;
                            if test "$enableval" = yes; then
-                            ac_cv_use_timer='wxUSE_TIMER=yes'
+                            wx_cv_use_timer='wxUSE_TIMER=yes'
                            else
                            else
-                            ac_cv_use_timer='wxUSE_TIMER=no'
+                            wx_cv_use_timer='wxUSE_TIMER=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
+                          wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_timer"
+          eval "$wx_cv_use_timer"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_timer >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TIMER" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TIMER = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TIMER
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
-          enablestring=
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6; }
-          no_cache=0
-          # Check whether --enable-unicode was given.
-if test "${enable_unicode+set}" = set; then
-  enableval=$enable_unicode;
-                          if test "$enableval" = yes; then
-                            ac_cv_use_unicode='wxUSE_UNICODE=yes'
-                          else
-                            ac_cv_use_unicode='wxUSE_UNICODE=no'
-                          fi
  
  
-else
-
-                          LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
-
-fi
-
-
-          eval "$ac_cv_use_unicode"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_UNICODE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-          else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
            fi
  
            fi
  
-
-          enablestring=
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; }
            no_cache=0
@@ -7287,40 +8486,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; }
  if test "${enable_sound+set}" = set; then
    enableval=$enable_sound;
                            if test "$enableval" = yes; then
  if test "${enable_sound+set}" = set; then
    enableval=$enable_sound;
                            if test "$enableval" = yes; then
-                            ac_cv_use_sound='wxUSE_SOUND=yes'
+                            wx_cv_use_sound='wxUSE_SOUND=yes'
                            else
                            else
-                            ac_cv_use_sound='wxUSE_SOUND=no'
+                            wx_cv_use_sound='wxUSE_SOUND=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SOUND" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_sound='wxUSE_SOUND='$DEFAULT_wxUSE_SOUND
+                          wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_sound"
+          eval "$wx_cv_use_sound"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_sound >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_sound >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SOUND" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SOUND = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SOUND
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; }
            no_cache=0
@@ -7328,40 +8541,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6;
  if test "${enable_mediactrl+set}" = set; then
    enableval=$enable_mediactrl;
                            if test "$enableval" = yes; then
  if test "${enable_mediactrl+set}" = set; then
    enableval=$enable_mediactrl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
+                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
                            else
                            else
-                            ac_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
+                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MEDIACTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_mediactrl='wxUSE_MEDIACTRL='$DEFAULT_wxUSE_MEDIACTRL
+                          wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_mediactrl"
+          eval "$wx_cv_use_mediactrl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_mediactrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mediactrl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MEDIACTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MEDIACTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_MEDIACTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; }
            no_cache=0
@@ -7369,40 +8596,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6;
  if test "${enable_gstreamer8+set}" = set; then
    enableval=$enable_gstreamer8;
                            if test "$enableval" = yes; then
  if test "${enable_gstreamer8+set}" = set; then
    enableval=$enable_gstreamer8;
                            if test "$enableval" = yes; then
-                            ac_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
+                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
                            else
                            else
-                            ac_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
+                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_GSTREAMER8" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_gstreamer8='wxUSE_GSTREAMER8='$DEFAULT_wxUSE_GSTREAMER8
+                          wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_gstreamer8"
+          eval "$wx_cv_use_gstreamer8"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_gstreamer8 >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gstreamer8 >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_GSTREAMER8" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_GSTREAMER8 = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_GSTREAMER8
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; }
            no_cache=0
@@ -7410,40 +8651,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C"
  if test "${enable_printfposparam+set}" = set; then
    enableval=$enable_printfposparam;
                            if test "$enableval" = yes; then
  if test "${enable_printfposparam+set}" = set; then
    enableval=$enable_printfposparam;
                            if test "$enableval" = yes; then
-                            ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
+                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
                            else
                            else
-                            ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
+                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PRINTF_POS_PARAMS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS='$DEFAULT_wxUSE_PRINTF_POS_PARAMS
+                          wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_printfposparam"
+          eval "$wx_cv_use_printfposparam"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_printfposparam >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_printfposparam >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PRINTF_POS_PARAMS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PRINTF_POS_PARAMS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PRINTF_POS_PARAMS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-zipstream" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-zipstream" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6; }
            no_cache=0
@@ -7451,41 +8706,55 @@ echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6;
  if test "${enable_zipstream+set}" = set; then
    enableval=$enable_zipstream;
                            if test "$enableval" = yes; then
  if test "${enable_zipstream+set}" = set; then
    enableval=$enable_zipstream;
                            if test "$enableval" = yes; then
-                            ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
+                            wx_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
                            else
                            else
-                            ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
+                            wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM
+                          wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_zipstream"
+          eval "$wx_cv_use_zipstream"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_ZIPSTREAM" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ZIPSTREAM = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_ZIPSTREAM
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
  
            enablestring=
  
  
            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}-url" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-url" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6; }
            no_cache=0
@@ -7493,40 +8762,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6; }
  if test "${enable_url+set}" = set; then
    enableval=$enable_url;
                            if test "$enableval" = yes; then
  if test "${enable_url+set}" = set; then
    enableval=$enable_url;
                            if test "$enableval" = yes; then
-                            ac_cv_use_url='wxUSE_URL=yes'
+                            wx_cv_use_url='wxUSE_URL=yes'
                            else
                            else
-                            ac_cv_use_url='wxUSE_URL=no'
+                            wx_cv_use_url='wxUSE_URL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_URL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_url='wxUSE_URL='$DEFAULT_wxUSE_URL
+                          wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_url"
+          eval "$wx_cv_use_url"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_url >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_url >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_URL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_URL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_URL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; }
            no_cache=0
@@ -7534,40 +8817,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; }
  if test "${enable_variant+set}" = set; then
    enableval=$enable_variant;
                            if test "$enableval" = yes; then
  if test "${enable_variant+set}" = set; then
    enableval=$enable_variant;
                            if test "$enableval" = yes; then
-                            ac_cv_use_variant='wxUSE_VARIANT=yes'
+                            wx_cv_use_variant='wxUSE_VARIANT=yes'
                            else
                            else
-                            ac_cv_use_variant='wxUSE_VARIANT=no'
+                            wx_cv_use_variant='wxUSE_VARIANT=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_VARIANT" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_variant='wxUSE_VARIANT='$DEFAULT_wxUSE_VARIANT
+                          wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_variant"
+          eval "$wx_cv_use_variant"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_variant >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_variant >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_VARIANT" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_VARIANT = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_VARIANT
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-protocol" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6; }
            no_cache=0
@@ -7575,40 +8872,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6; }
  if test "${enable_protocol+set}" = set; then
    enableval=$enable_protocol;
                            if test "$enableval" = yes; then
  if test "${enable_protocol+set}" = set; then
    enableval=$enable_protocol;
                            if test "$enableval" = yes; then
-                            ac_cv_use_protocol='wxUSE_PROTOCOL=yes'
+                            wx_cv_use_protocol='wxUSE_PROTOCOL=yes'
                            else
                            else
-                            ac_cv_use_protocol='wxUSE_PROTOCOL=no'
+                            wx_cv_use_protocol='wxUSE_PROTOCOL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_protocol='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL
+                          wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_protocol"
+          eval "$wx_cv_use_protocol"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_protocol >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_protocol >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PROTOCOL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROTOCOL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PROTOCOL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-protocol_http" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_http" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >&6; }
            no_cache=0
@@ -7616,40 +8927,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >
  if test "${enable_protocol_http+set}" = set; then
    enableval=$enable_protocol_http;
                            if test "$enableval" = yes; then
  if test "${enable_protocol_http+set}" = set; then
    enableval=$enable_protocol_http;
                            if test "$enableval" = yes; then
-                            ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
+                            wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
                            else
                            else
-                            ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
+                            wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP
+                          wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_protocol_http"
+          eval "$wx_cv_use_protocol_http"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PROTOCOL_HTTP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROTOCOL_HTTP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PROTOCOL_HTTP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-protocol_ftp" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_ftp" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&6; }
            no_cache=0
@@ -7657,40 +8982,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&
  if test "${enable_protocol_ftp+set}" = set; then
    enableval=$enable_protocol_ftp;
                            if test "$enableval" = yes; then
  if test "${enable_protocol_ftp+set}" = set; then
    enableval=$enable_protocol_ftp;
                            if test "$enableval" = yes; then
-                            ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
+                            wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
                            else
                            else
-                            ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
+                            wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP
+                          wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_protocol_ftp"
+          eval "$wx_cv_use_protocol_ftp"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PROTOCOL_FTP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROTOCOL_FTP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PROTOCOL_FTP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-protocol_file" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_file" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >&6; }
            no_cache=0
@@ -7698,43 +9037,55 @@ echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >
  if test "${enable_protocol_file+set}" = set; then
    enableval=$enable_protocol_file;
                            if test "$enableval" = yes; then
  if test "${enable_protocol_file+set}" = set; then
    enableval=$enable_protocol_file;
                            if test "$enableval" = yes; then
-                            ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
+                            wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
                            else
                            else
-                            ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
+                            wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE
+                          wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_protocol_file"
+          eval "$wx_cv_use_protocol_file"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PROTOCOL_FILE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROTOCOL_FILE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PROTOCOL_FILE
            fi
  
            fi
  
-
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
  
            enablestring=
  
  
  
            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}-threads" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-threads" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6; }
            no_cache=0
@@ -7742,44 +9093,58 @@ echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6; }
  if test "${enable_threads+set}" = set; then
    enableval=$enable_threads;
                            if test "$enableval" = yes; then
  if test "${enable_threads+set}" = set; then
    enableval=$enable_threads;
                            if test "$enableval" = yes; then
-                            ac_cv_use_threads='wxUSE_THREADS=yes'
+                            wx_cv_use_threads='wxUSE_THREADS=yes'
                            else
                            else
-                            ac_cv_use_threads='wxUSE_THREADS=no'
+                            wx_cv_use_threads='wxUSE_THREADS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
+                          wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_threads"
+          eval "$wx_cv_use_threads"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_threads >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_THREADS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_THREADS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_THREADS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
  if test "$wxUSE_GUI" = "yes"; then
  
  
  
            enablestring=
  
  if test "$wxUSE_GUI" = "yes"; then
  
  
  
            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}-docview" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-docview" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6; }
            no_cache=0
@@ -7787,40 +9152,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6; }
  if test "${enable_docview+set}" = set; then
    enableval=$enable_docview;
                            if test "$enableval" = yes; then
  if test "${enable_docview+set}" = set; then
    enableval=$enable_docview;
                            if test "$enableval" = yes; then
-                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
+                            wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
                            else
                            else
-                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
+                            wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
+                          wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_docview"
+          eval "$wx_cv_use_docview"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_docview >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DOC_VIEW_ARCHITECTURE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-help" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-help" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6; }
            no_cache=0
@@ -7828,40 +9207,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6; }
  if test "${enable_help+set}" = set; then
    enableval=$enable_help;
                            if test "$enableval" = yes; then
  if test "${enable_help+set}" = set; then
    enableval=$enable_help;
                            if test "$enableval" = yes; then
-                            ac_cv_use_help='wxUSE_HELP=yes'
+                            wx_cv_use_help='wxUSE_HELP=yes'
                            else
                            else
-                            ac_cv_use_help='wxUSE_HELP=no'
+                            wx_cv_use_help='wxUSE_HELP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
+                          wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_help"
+          eval "$wx_cv_use_help"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_help >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_HELP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_HELP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_HELP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-mshtmlhelp" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mshtmlhelp" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6; }
            no_cache=0
@@ -7869,40 +9262,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6;
  if test "${enable_mshtmlhelp+set}" = set; then
    enableval=$enable_mshtmlhelp;
                            if test "$enableval" = yes; then
  if test "${enable_mshtmlhelp+set}" = set; then
    enableval=$enable_mshtmlhelp;
                            if test "$enableval" = yes; then
-                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
+                            wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
                            else
                            else
-                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
+                            wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP
+                          wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_mshtmlhelp"
+          eval "$wx_cv_use_mshtmlhelp"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MS_HTML_HELP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MS_HTML_HELP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_MS_HTML_HELP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-html" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6; }
            no_cache=0
@@ -7910,40 +9317,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6; }
  if test "${enable_html+set}" = set; then
    enableval=$enable_html;
                            if test "$enableval" = yes; then
  if test "${enable_html+set}" = set; then
    enableval=$enable_html;
                            if test "$enableval" = yes; then
-                            ac_cv_use_html='wxUSE_HTML=yes'
+                            wx_cv_use_html='wxUSE_HTML=yes'
                            else
                            else
-                            ac_cv_use_html='wxUSE_HTML=no'
+                            wx_cv_use_html='wxUSE_HTML=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
+                          wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_html"
+          eval "$wx_cv_use_html"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_html >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_HTML" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_HTML = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_HTML
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-htmlhelp" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-htmlhelp" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6; }
            no_cache=0
@@ -7951,40 +9372,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6; }
  if test "${enable_htmlhelp+set}" = set; then
    enableval=$enable_htmlhelp;
                            if test "$enableval" = yes; then
  if test "${enable_htmlhelp+set}" = set; then
    enableval=$enable_htmlhelp;
                            if test "$enableval" = yes; then
-                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
+                            wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
                            else
                            else
-                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
+                            wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP
+                          wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_htmlhelp"
+          eval "$wx_cv_use_htmlhelp"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_WXHTML_HELP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_WXHTML_HELP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_WXHTML_HELP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-xrc" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xrc" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6; }
            no_cache=0
@@ -7992,40 +9427,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6; }
  if test "${enable_xrc+set}" = set; then
    enableval=$enable_xrc;
                            if test "$enableval" = yes; then
  if test "${enable_xrc+set}" = set; then
    enableval=$enable_xrc;
                            if test "$enableval" = yes; then
-                            ac_cv_use_xrc='wxUSE_XRC=yes'
+                            wx_cv_use_xrc='wxUSE_XRC=yes'
                            else
                            else
-                            ac_cv_use_xrc='wxUSE_XRC=no'
+                            wx_cv_use_xrc='wxUSE_XRC=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_XRC" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_xrc='wxUSE_XRC='$DEFAULT_wxUSE_XRC
+                          wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_xrc"
+          eval "$wx_cv_use_xrc"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_xrc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_xrc >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_XRC" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_XRC = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_XRC
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-aui" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aui" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6; }
            no_cache=0
@@ -8033,40 +9482,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6; }
  if test "${enable_aui+set}" = set; then
    enableval=$enable_aui;
                            if test "$enableval" = yes; then
  if test "${enable_aui+set}" = set; then
    enableval=$enable_aui;
                            if test "$enableval" = yes; then
-                            ac_cv_use_aui='wxUSE_AUI=yes'
+                            wx_cv_use_aui='wxUSE_AUI=yes'
                            else
                            else
-                            ac_cv_use_aui='wxUSE_AUI=no'
+                            wx_cv_use_aui='wxUSE_AUI=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_AUI" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_aui='wxUSE_AUI='$DEFAULT_wxUSE_AUI
+                          wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_aui"
+          eval "$wx_cv_use_aui"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_aui >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_aui >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_AUI" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_AUI = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_AUI
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-stc" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stc" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; }
            no_cache=0
@@ -8074,40 +9537,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; }
  if test "${enable_stc+set}" = set; then
    enableval=$enable_stc;
                            if test "$enableval" = yes; then
  if test "${enable_stc+set}" = set; then
    enableval=$enable_stc;
                            if test "$enableval" = yes; then
-                            ac_cv_use_stc='wxUSE_STC=yes'
+                            wx_cv_use_stc='wxUSE_STC=yes'
                            else
                            else
-                            ac_cv_use_stc='wxUSE_STC=no'
+                            wx_cv_use_stc='wxUSE_STC=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STC" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_stc='wxUSE_STC='$DEFAULT_wxUSE_STC
+                          wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_stc"
+          eval "$wx_cv_use_stc"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_stc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_stc >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STC" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STC = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STC
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-constraints" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6; }
            no_cache=0
@@ -8115,40 +9592,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6
  if test "${enable_constraints+set}" = set; then
    enableval=$enable_constraints;
                            if test "$enableval" = yes; then
  if test "${enable_constraints+set}" = set; then
    enableval=$enable_constraints;
                            if test "$enableval" = yes; then
-                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
+                            wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
                            else
                            else
-                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
+                            wx_cv_use_constraints='wxUSE_CONSTRAINTS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
+                          wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_constraints"
+          eval "$wx_cv_use_constraints"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_constraints >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CONSTRAINTS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CONSTRAINTS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CONSTRAINTS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; }
            no_cache=0
@@ -8156,40 +9647,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6;
  if test "${enable_printarch+set}" = set; then
    enableval=$enable_printarch;
                            if test "$enableval" = yes; then
  if test "${enable_printarch+set}" = set; then
    enableval=$enable_printarch;
                            if test "$enableval" = yes; then
-                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
                            else
                            else
-                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
+                          wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_printarch"
+          eval "$wx_cv_use_printarch"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_printarch >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PRINTING_ARCHITECTURE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PRINTING_ARCHITECTURE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; }
            no_cache=0
@@ -8197,40 +9702,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; }
  if test "${enable_mdi+set}" = set; then
    enableval=$enable_mdi;
                            if test "$enableval" = yes; then
  if test "${enable_mdi+set}" = set; then
    enableval=$enable_mdi;
                            if test "$enableval" = yes; then
-                            ac_cv_use_mdi='wxUSE_MDI=yes'
+                            wx_cv_use_mdi='wxUSE_MDI=yes'
                            else
                            else
-                            ac_cv_use_mdi='wxUSE_MDI=no'
+                            wx_cv_use_mdi='wxUSE_MDI=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MDI" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_mdi='wxUSE_MDI='$DEFAULT_wxUSE_MDI
+                          wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_mdi"
+          eval "$wx_cv_use_mdi"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mdi >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MDI" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MDI = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_MDI
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; }
            no_cache=0
@@ -8238,40 +9757,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; }
  if test "${enable_mdidoc+set}" = set; then
    enableval=$enable_mdidoc;
                            if test "$enableval" = yes; then
  if test "${enable_mdidoc+set}" = set; then
    enableval=$enable_mdidoc;
                            if test "$enableval" = yes; then
-                            ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
+                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
                            else
                            else
-                            ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
+                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
+                          wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_mdidoc"
+          eval "$wx_cv_use_mdidoc"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MDI_ARCHITECTURE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MDI_ARCHITECTURE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_MDI_ARCHITECTURE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-loggui" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; }
            no_cache=0
@@ -8279,40 +9812,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; }
  if test "${enable_loggui+set}" = set; then
    enableval=$enable_loggui;
                            if test "$enableval" = yes; then
  if test "${enable_loggui+set}" = set; then
    enableval=$enable_loggui;
                            if test "$enableval" = yes; then
-                            ac_cv_use_loggui='wxUSE_LOGGUI=yes'
+                            wx_cv_use_loggui='wxUSE_LOGGUI=yes'
                            else
                            else
-                            ac_cv_use_loggui='wxUSE_LOGGUI=no'
+                            wx_cv_use_loggui='wxUSE_LOGGUI=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI
+                          wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_loggui"
+          eval "$wx_cv_use_loggui"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_loggui >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LOGGUI" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_LOGGUI = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LOGGUI
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-logwin" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; }
            no_cache=0
@@ -8320,40 +9867,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; }
  if test "${enable_logwin+set}" = set; then
    enableval=$enable_logwin;
                            if test "$enableval" = yes; then
  if test "${enable_logwin+set}" = set; then
    enableval=$enable_logwin;
                            if test "$enableval" = yes; then
-                            ac_cv_use_logwin='wxUSE_LOGWINDOW=yes'
+                            wx_cv_use_logwin='wxUSE_LOGWINDOW=yes'
                            else
                            else
-                            ac_cv_use_logwin='wxUSE_LOGWINDOW=no'
+                            wx_cv_use_logwin='wxUSE_LOGWINDOW=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW
+                          wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_logwin"
+          eval "$wx_cv_use_logwin"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_logwin >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LOGWINDOW" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_LOGWINDOW = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LOGWINDOW
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-logdialog" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; }
            no_cache=0
@@ -8361,40 +9922,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6;
  if test "${enable_logdialog+set}" = set; then
    enableval=$enable_logdialog;
                            if test "$enableval" = yes; then
  if test "${enable_logdialog+set}" = set; then
    enableval=$enable_logdialog;
                            if test "$enableval" = yes; then
-                            ac_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
+                            wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
                            else
                            else
-                            ac_cv_use_logdialog='wxUSE_LOGDIALOG=no'
+                            wx_cv_use_logdialog='wxUSE_LOGDIALOG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_LOGDIALOG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_logdialog='wxUSE_LOGDIALOG='$DEFAULT_wxUSE_LOGDIALOG
+                          wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_logdialog"
+          eval "$wx_cv_use_logdialog"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_logdialog >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_logdialog >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LOGDIALOG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_LOGDIALOG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LOGDIALOG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-webkit" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; }
            no_cache=0
@@ -8402,40 +9977,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; }
  if test "${enable_webkit+set}" = set; then
    enableval=$enable_webkit;
                            if test "$enableval" = yes; then
  if test "${enable_webkit+set}" = set; then
    enableval=$enable_webkit;
                            if test "$enableval" = yes; then
-                            ac_cv_use_webkit='wxUSE_WEBKIT=yes'
+                            wx_cv_use_webkit='wxUSE_WEBKIT=yes'
                            else
                            else
-                            ac_cv_use_webkit='wxUSE_WEBKIT=no'
+                            wx_cv_use_webkit='wxUSE_WEBKIT=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_WEBKIT" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_webkit='wxUSE_WEBKIT='$DEFAULT_wxUSE_WEBKIT
+                          wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_webkit"
+          eval "$wx_cv_use_webkit"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_webkit >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_webkit >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_WEBKIT" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_WEBKIT = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_WEBKIT
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-richtext" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richtext" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6; }
            no_cache=0
@@ -8443,40 +10032,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6; }
  if test "${enable_richtext+set}" = set; then
    enableval=$enable_richtext;
                            if test "$enableval" = yes; then
  if test "${enable_richtext+set}" = set; then
    enableval=$enable_richtext;
                            if test "$enableval" = yes; then
-                            ac_cv_use_richtext='wxUSE_RICHTEXT=yes'
+                            wx_cv_use_richtext='wxUSE_RICHTEXT=yes'
                            else
                            else
-                            ac_cv_use_richtext='wxUSE_RICHTEXT=no'
+                            wx_cv_use_richtext='wxUSE_RICHTEXT=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_RICHTEXT" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_richtext='wxUSE_RICHTEXT='$DEFAULT_wxUSE_RICHTEXT
+                          wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_richtext"
+          eval "$wx_cv_use_richtext"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_richtext >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_richtext >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_RICHTEXT" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RICHTEXT = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_RICHTEXT
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-graphics_ctx" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; }
            no_cache=0
@@ -8484,41 +10087,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&
  if test "${enable_graphics_ctx+set}" = set; then
    enableval=$enable_graphics_ctx;
                            if test "$enableval" = yes; then
  if test "${enable_graphics_ctx+set}" = set; then
    enableval=$enable_graphics_ctx;
                            if test "$enableval" = yes; then
-                            ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
+                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
                            else
                            else
-                            ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
+                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_GRAPHICS_CONTEXT" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT='$DEFAULT_wxUSE_GRAPHICS_CONTEXT
+                          wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_graphics_ctx"
+          eval "$wx_cv_use_graphics_ctx"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_GRAPHICS_CONTEXT" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_GRAPHICS_CONTEXT = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_GRAPHICS_CONTEXT
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
            enablestring=
  
  
            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}-postscript" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; }
            no_cache=0
@@ -8526,43 +10142,111 @@ echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6;
  if test "${enable_postscript+set}" = set; then
    enableval=$enable_postscript;
                            if test "$enableval" = yes; then
  if test "${enable_postscript+set}" = set; then
    enableval=$enable_postscript;
                            if test "$enableval" = yes; then
-                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
+                            wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
                            else
                            else
-                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
+                            wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
+                          wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_postscript"
+          eval "$wx_cv_use_postscript"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_postscript >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_POSTSCRIPT" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_POSTSCRIPT = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_POSTSCRIPT
+          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}-svg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-svg was given.
+if test "${enable_svg+set}" = set; then
+  enableval=$enable_svg;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_svg='wxUSE_SVG=yes'
+                          else
+                            wx_cv_use_svg='wxUSE_SVG=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_svg"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_svg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SVG = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_SVG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
  
  
            enablestring=
  
  
  
  
            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}-clipboard" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-clipboard" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6; }
            no_cache=0
@@ -8570,40 +10254,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6;
  if test "${enable_clipboard+set}" = set; then
    enableval=$enable_clipboard;
                            if test "$enableval" = yes; then
  if test "${enable_clipboard+set}" = set; then
    enableval=$enable_clipboard;
                            if test "$enableval" = yes; then
-                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
+                            wx_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
                            else
                            else
-                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=no'
+                            wx_cv_use_clipboard='wxUSE_CLIPBOARD=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
+                          wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_clipboard"
+          eval "$wx_cv_use_clipboard"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CLIPBOARD" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CLIPBOARD = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CLIPBOARD
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-dnd" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dnd" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6; }
            no_cache=0
@@ -8611,40 +10309,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6; }
  if test "${enable_dnd+set}" = set; then
    enableval=$enable_dnd;
                            if test "$enableval" = yes; then
  if test "${enable_dnd+set}" = set; then
    enableval=$enable_dnd;
                            if test "$enableval" = yes; then
-                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
+                            wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
                            else
                            else
-                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
+                            wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP
+                          wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_dnd"
+          eval "$wx_cv_use_dnd"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dnd >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DRAG_AND_DROP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DRAG_AND_DROP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DRAG_AND_DROP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-metafile" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
            no_cache=0
@@ -8652,43 +10364,57 @@ echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
  if test "${enable_metafile+set}" = set; then
    enableval=$enable_metafile;
                            if test "$enableval" = yes; then
  if test "${enable_metafile+set}" = set; then
    enableval=$enable_metafile;
                            if test "$enableval" = yes; then
-                            ac_cv_use_metafile='wxUSE_METAFILE=yes'
+                            wx_cv_use_metafile='wxUSE_METAFILE=yes'
                            else
                            else
-                            ac_cv_use_metafile='wxUSE_METAFILE=no'
+                            wx_cv_use_metafile='wxUSE_METAFILE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
+                          wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_metafile"
+          eval "$wx_cv_use_metafile"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_METAFILE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_METAFILE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_METAFILE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
  
  
  
  
+DEFAULT_wxUSE_CONTROLS=none
+
+          enablestring=disable
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
  
  
-          enablestring=
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-controls" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-controls" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6; }
            no_cache=0
@@ -8696,38 +10422,43 @@ echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6; }
  if test "${enable_controls+set}" = set; then
    enableval=$enable_controls;
                            if test "$enableval" = yes; then
  if test "${enable_controls+set}" = set; then
    enableval=$enable_controls;
                            if test "$enableval" = yes; then
-                            ac_cv_use_controls='wxUSE_CONTROLS=yes'
+                            wx_cv_use_controls='wxUSE_CONTROLS=yes'
                            else
                            else
-                            ac_cv_use_controls='wxUSE_CONTROLS=no'
+                            wx_cv_use_controls='wxUSE_CONTROLS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS
+                          wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_controls"
+          eval "$wx_cv_use_controls"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_controls >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CONTROLS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CONTROLS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CONTROLS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
  if test "$wxUSE_CONTROLS" = "yes"; then
    DEFAULT_wxUSE_ACCEL=yes
  
  if test "$wxUSE_CONTROLS" = "yes"; then
    DEFAULT_wxUSE_ACCEL=yes
@@ -8839,6 +10570,15 @@ fi
  
  
            enablestring=
  
  
            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}-accel" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accel" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6; }
            no_cache=0
@@ -8846,40 +10586,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6; }
  if test "${enable_accel+set}" = set; then
    enableval=$enable_accel;
                            if test "$enableval" = yes; then
  if test "${enable_accel+set}" = set; then
    enableval=$enable_accel;
                            if test "$enableval" = yes; then
-                            ac_cv_use_accel='wxUSE_ACCEL=yes'
+                            wx_cv_use_accel='wxUSE_ACCEL=yes'
                            else
                            else
-                            ac_cv_use_accel='wxUSE_ACCEL=no'
+                            wx_cv_use_accel='wxUSE_ACCEL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL
+                          wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_accel"
+          eval "$wx_cv_use_accel"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_accel >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_ACCEL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ACCEL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_ACCEL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-animatectrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-animatectrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6; }
            no_cache=0
@@ -8887,40 +10641,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6
  if test "${enable_animatectrl+set}" = set; then
    enableval=$enable_animatectrl;
                            if test "$enableval" = yes; then
  if test "${enable_animatectrl+set}" = set; then
    enableval=$enable_animatectrl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes'
+                            wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes'
                            else
                            else
-                            ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no'
+                            wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_ANIMATIONCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL='$DEFAULT_wxUSE_ANIMATIONCTRL
+                          wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_animatectrl"
+          eval "$wx_cv_use_animatectrl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_ANIMATIONCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ANIMATIONCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_ANIMATIONCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-button" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; }
            no_cache=0
@@ -8928,40 +10696,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; }
  if test "${enable_button+set}" = set; then
    enableval=$enable_button;
                            if test "$enableval" = yes; then
  if test "${enable_button+set}" = set; then
    enableval=$enable_button;
                            if test "$enableval" = yes; then
-                            ac_cv_use_button='wxUSE_BUTTON=yes'
+                            wx_cv_use_button='wxUSE_BUTTON=yes'
                            else
                            else
-                            ac_cv_use_button='wxUSE_BUTTON=no'
+                            wx_cv_use_button='wxUSE_BUTTON=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON
+                          wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_button"
+          eval "$wx_cv_use_button"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_button >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_BUTTON" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_BUTTON = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_BUTTON
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-bmpbutton" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; }
            no_cache=0
@@ -8969,40 +10751,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6;
  if test "${enable_bmpbutton+set}" = set; then
    enableval=$enable_bmpbutton;
                            if test "$enableval" = yes; then
  if test "${enable_bmpbutton+set}" = set; then
    enableval=$enable_bmpbutton;
                            if test "$enableval" = yes; then
-                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
+                            wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
                            else
                            else
-                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
+                            wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON
+                          wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_bmpbutton"
+          eval "$wx_cv_use_bmpbutton"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_BMPBUTTON" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_BMPBUTTON = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_BMPBUTTON
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-bmpcombobox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; }
            no_cache=0
@@ -9010,40 +10806,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6
  if test "${enable_bmpcombobox+set}" = set; then
    enableval=$enable_bmpcombobox;
                            if test "$enableval" = yes; then
  if test "${enable_bmpcombobox+set}" = set; then
    enableval=$enable_bmpcombobox;
                            if test "$enableval" = yes; then
-                            ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
+                            wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
                            else
                            else
-                            ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
+                            wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_BITMAPCOMBOBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX='$DEFAULT_wxUSE_BITMAPCOMBOBOX
+                          wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_bmpcombobox"
+          eval "$wx_cv_use_bmpcombobox"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_BITMAPCOMBOBOX" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_BITMAPCOMBOBOX = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_BITMAPCOMBOBOX
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-calendar" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-calendar" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6; }
            no_cache=0
@@ -9051,40 +10861,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6; }
  if test "${enable_calendar+set}" = set; then
    enableval=$enable_calendar;
                            if test "$enableval" = yes; then
  if test "${enable_calendar+set}" = set; then
    enableval=$enable_calendar;
                            if test "$enableval" = yes; then
-                            ac_cv_use_calendar='wxUSE_CALCTRL=yes'
+                            wx_cv_use_calendar='wxUSE_CALCTRL=yes'
                            else
                            else
-                            ac_cv_use_calendar='wxUSE_CALCTRL=no'
+                            wx_cv_use_calendar='wxUSE_CALCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL
+                          wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_calendar"
+          eval "$wx_cv_use_calendar"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_calendar >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_calendar >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CALCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CALCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CALCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-caret" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-caret" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6; }
            no_cache=0
@@ -9092,40 +10916,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6; }
  if test "${enable_caret+set}" = set; then
    enableval=$enable_caret;
                            if test "$enableval" = yes; then
  if test "${enable_caret+set}" = set; then
    enableval=$enable_caret;
                            if test "$enableval" = yes; then
-                            ac_cv_use_caret='wxUSE_CARET=yes'
+                            wx_cv_use_caret='wxUSE_CARET=yes'
                            else
                            else
-                            ac_cv_use_caret='wxUSE_CARET=no'
+                            wx_cv_use_caret='wxUSE_CARET=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
+                          wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_caret"
+          eval "$wx_cv_use_caret"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_caret >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CARET" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CARET = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CARET
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-checkbox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checkbox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6; }
            no_cache=0
@@ -9133,40 +10971,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6; }
  if test "${enable_checkbox+set}" = set; then
    enableval=$enable_checkbox;
                            if test "$enableval" = yes; then
  if test "${enable_checkbox+set}" = set; then
    enableval=$enable_checkbox;
                            if test "$enableval" = yes; then
-                            ac_cv_use_checkbox='wxUSE_CHECKBOX=yes'
+                            wx_cv_use_checkbox='wxUSE_CHECKBOX=yes'
                            else
                            else
-                            ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
+                            wx_cv_use_checkbox='wxUSE_CHECKBOX=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX
+                          wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_checkbox"
+          eval "$wx_cv_use_checkbox"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CHECKBOX" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CHECKBOX = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CHECKBOX
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-checklst" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checklst" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6; }
            no_cache=0
@@ -9174,40 +11026,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6; }
  if test "${enable_checklst+set}" = set; then
    enableval=$enable_checklst;
                            if test "$enableval" = yes; then
  if test "${enable_checklst+set}" = set; then
    enableval=$enable_checklst;
                            if test "$enableval" = yes; then
-                            ac_cv_use_checklst='wxUSE_CHECKLST=yes'
+                            wx_cv_use_checklst='wxUSE_CHECKLST=yes'
                            else
                            else
-                            ac_cv_use_checklst='wxUSE_CHECKLST=no'
+                            wx_cv_use_checklst='wxUSE_CHECKLST=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST
+                          wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_checklst"
+          eval "$wx_cv_use_checklst"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_checklst >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CHECKLST" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CHECKLST = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CHECKLST
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-choice" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choice" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6; }
            no_cache=0
@@ -9215,40 +11081,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6; }
  if test "${enable_choice+set}" = set; then
    enableval=$enable_choice;
                            if test "$enableval" = yes; then
  if test "${enable_choice+set}" = set; then
    enableval=$enable_choice;
                            if test "$enableval" = yes; then
-                            ac_cv_use_choice='wxUSE_CHOICE=yes'
+                            wx_cv_use_choice='wxUSE_CHOICE=yes'
                            else
                            else
-                            ac_cv_use_choice='wxUSE_CHOICE=no'
+                            wx_cv_use_choice='wxUSE_CHOICE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE
+                          wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_choice"
+          eval "$wx_cv_use_choice"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_choice >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CHOICE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CHOICE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CHOICE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-choicebook" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicebook" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6; }
            no_cache=0
@@ -9256,40 +11136,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6;
  if test "${enable_choicebook+set}" = set; then
    enableval=$enable_choicebook;
                            if test "$enableval" = yes; then
  if test "${enable_choicebook+set}" = set; then
    enableval=$enable_choicebook;
                            if test "$enableval" = yes; then
-                            ac_cv_use_choicebook='wxUSE_CHOICEBOOK=yes'
+                            wx_cv_use_choicebook='wxUSE_CHOICEBOOK=yes'
                            else
                            else
-                            ac_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
+                            wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CHOICEBOOK" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_choicebook='wxUSE_CHOICEBOOK='$DEFAULT_wxUSE_CHOICEBOOK
+                          wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_choicebook"
+          eval "$wx_cv_use_choicebook"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_choicebook >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_choicebook >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CHOICEBOOK" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CHOICEBOOK = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CHOICEBOOK
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-collpane" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-collpane" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6; }
            no_cache=0
@@ -9297,40 +11191,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6; }
  if test "${enable_collpane+set}" = set; then
    enableval=$enable_collpane;
                            if test "$enableval" = yes; then
  if test "${enable_collpane+set}" = set; then
    enableval=$enable_collpane;
                            if test "$enableval" = yes; then
-                            ac_cv_use_collpane='wxUSE_COLLPANE=yes'
+                            wx_cv_use_collpane='wxUSE_COLLPANE=yes'
                            else
                            else
-                            ac_cv_use_collpane='wxUSE_COLLPANE=no'
+                            wx_cv_use_collpane='wxUSE_COLLPANE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_COLLPANE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_collpane='wxUSE_COLLPANE='$DEFAULT_wxUSE_COLLPANE
+                          wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_collpane"
+          eval "$wx_cv_use_collpane"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_collpane >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_collpane >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_COLLPANE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_COLLPANE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_COLLPANE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-colourpicker" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-colourpicker" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&6; }
            no_cache=0
@@ -9338,40 +11246,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&
  if test "${enable_colourpicker+set}" = set; then
    enableval=$enable_colourpicker;
                            if test "$enableval" = yes; then
  if test "${enable_colourpicker+set}" = set; then
    enableval=$enable_colourpicker;
                            if test "$enableval" = yes; then
-                            ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes'
+                            wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes'
                            else
                            else
-                            ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no'
+                            wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_COLOURPICKERCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL='$DEFAULT_wxUSE_COLOURPICKERCTRL
+                          wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_colourpicker"
+          eval "$wx_cv_use_colourpicker"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_COLOURPICKERCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_COLOURPICKERCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_COLOURPICKERCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-combobox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combobox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6; }
            no_cache=0
@@ -9379,40 +11301,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6; }
  if test "${enable_combobox+set}" = set; then
    enableval=$enable_combobox;
                            if test "$enableval" = yes; then
  if test "${enable_combobox+set}" = set; then
    enableval=$enable_combobox;
                            if test "$enableval" = yes; then
-                            ac_cv_use_combobox='wxUSE_COMBOBOX=yes'
+                            wx_cv_use_combobox='wxUSE_COMBOBOX=yes'
                            else
                            else
-                            ac_cv_use_combobox='wxUSE_COMBOBOX=no'
+                            wx_cv_use_combobox='wxUSE_COMBOBOX=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX
+                          wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_combobox"
+          eval "$wx_cv_use_combobox"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_combobox >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_COMBOBOX" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_COMBOBOX = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_COMBOBOX
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-comboctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-comboctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6; }
            no_cache=0
@@ -9420,40 +11356,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6;
  if test "${enable_comboctrl+set}" = set; then
    enableval=$enable_comboctrl;
                            if test "$enableval" = yes; then
  if test "${enable_comboctrl+set}" = set; then
    enableval=$enable_comboctrl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_comboctrl='wxUSE_COMBOCTRL=yes'
+                            wx_cv_use_comboctrl='wxUSE_COMBOCTRL=yes'
                            else
                            else
-                            ac_cv_use_comboctrl='wxUSE_COMBOCTRL=no'
+                            wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_COMBOCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_comboctrl='wxUSE_COMBOCTRL='$DEFAULT_wxUSE_COMBOCTRL
+                          wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_comboctrl"
+          eval "$wx_cv_use_comboctrl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_COMBOCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_COMBOCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_COMBOCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-datepick" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; }
            no_cache=0
@@ -9461,40 +11411,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; }
  if test "${enable_datepick+set}" = set; then
    enableval=$enable_datepick;
                            if test "$enableval" = yes; then
  if test "${enable_datepick+set}" = set; then
    enableval=$enable_datepick;
                            if test "$enableval" = yes; then
-                            ac_cv_use_datepick='wxUSE_DATEPICKCTRL=yes'
+                            wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes'
                            else
                            else
-                            ac_cv_use_datepick='wxUSE_DATEPICKCTRL=no'
+                            wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DATEPICKCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_datepick='wxUSE_DATEPICKCTRL='$DEFAULT_wxUSE_DATEPICKCTRL
+                          wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_datepick"
+          eval "$wx_cv_use_datepick"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_datepick >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_datepick >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DATEPICKCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DATEPICKCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DATEPICKCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-dirpicker" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; }
            no_cache=0
@@ -9502,40 +11466,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6;
  if test "${enable_dirpicker+set}" = set; then
    enableval=$enable_dirpicker;
                            if test "$enableval" = yes; then
  if test "${enable_dirpicker+set}" = set; then
    enableval=$enable_dirpicker;
                            if test "$enableval" = yes; then
-                            ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes'
+                            wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes'
                            else
                            else
-                            ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
+                            wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DIRPICKERCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL='$DEFAULT_wxUSE_DIRPICKERCTRL
+                          wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_dirpicker"
+          eval "$wx_cv_use_dirpicker"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DIRPICKERCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DIRPICKERCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DIRPICKERCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-display" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; }
            no_cache=0
@@ -9543,40 +11521,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; }
  if test "${enable_display+set}" = set; then
    enableval=$enable_display;
                            if test "$enableval" = yes; then
  if test "${enable_display+set}" = set; then
    enableval=$enable_display;
                            if test "$enableval" = yes; then
-                            ac_cv_use_display='wxUSE_DISPLAY=yes'
+                            wx_cv_use_display='wxUSE_DISPLAY=yes'
                            else
                            else
-                            ac_cv_use_display='wxUSE_DISPLAY=no'
+                            wx_cv_use_display='wxUSE_DISPLAY=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DISPLAY" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_display='wxUSE_DISPLAY='$DEFAULT_wxUSE_DISPLAY
+                          wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_display"
+          eval "$wx_cv_use_display"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_display >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_display >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DISPLAY" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DISPLAY = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DISPLAY
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-detect_sm" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; }
            no_cache=0
@@ -9584,40 +11576,109 @@ echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6;
  if test "${enable_detect_sm+set}" = set; then
    enableval=$enable_detect_sm;
                            if test "$enableval" = yes; then
  if test "${enable_detect_sm+set}" = set; then
    enableval=$enable_detect_sm;
                            if test "$enableval" = yes; then
-                            ac_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
+                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
                            else
                            else
-                            ac_cv_use_detect_sm='wxUSE_DETECT_SM=no'
+                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DETECT_SM" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_detect_sm='wxUSE_DETECT_SM='$DEFAULT_wxUSE_DETECT_SM
+                          wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_detect_sm"
+          eval "$wx_cv_use_detect_sm"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_detect_sm >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_detect_sm >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DETECT_SM" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DETECT_SM = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DETECT_SM
+          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}-editablebox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-editablebox was given.
+if test "${enable_editablebox+set}" = set; then
+  enableval=$enable_editablebox;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes'
+                          else
+                            wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_editablebox"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_editablebox >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_EDITABLELISTBOX = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_EDITABLELISTBOX
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-filepicker" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; }
            no_cache=0
@@ -9625,40 +11686,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6;
  if test "${enable_filepicker+set}" = set; then
    enableval=$enable_filepicker;
                            if test "$enableval" = yes; then
  if test "${enable_filepicker+set}" = set; then
    enableval=$enable_filepicker;
                            if test "$enableval" = yes; then
-                            ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
+                            wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
                            else
                            else
-                            ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
+                            wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FILEPICKERCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL='$DEFAULT_wxUSE_FILEPICKERCTRL
+                          wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_filepicker"
+          eval "$wx_cv_use_filepicker"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_filepicker >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_filepicker >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FILEPICKERCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FILEPICKERCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FILEPICKERCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-fontpicker" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontpicker" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6; }
            no_cache=0
@@ -9666,40 +11741,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6;
  if test "${enable_fontpicker+set}" = set; then
    enableval=$enable_fontpicker;
                            if test "$enableval" = yes; then
  if test "${enable_fontpicker+set}" = set; then
    enableval=$enable_fontpicker;
                            if test "$enableval" = yes; then
-                            ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes'
+                            wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes'
                            else
                            else
-                            ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no'
+                            wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FONTPICKERCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL='$DEFAULT_wxUSE_FONTPICKERCTRL
+                          wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_fontpicker"
+          eval "$wx_cv_use_fontpicker"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FONTPICKERCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FONTPICKERCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FONTPICKERCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-gauge" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gauge" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6; }
            no_cache=0
@@ -9707,40 +11796,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6; }
  if test "${enable_gauge+set}" = set; then
    enableval=$enable_gauge;
                            if test "$enableval" = yes; then
  if test "${enable_gauge+set}" = set; then
    enableval=$enable_gauge;
                            if test "$enableval" = yes; then
-                            ac_cv_use_gauge='wxUSE_GAUGE=yes'
+                            wx_cv_use_gauge='wxUSE_GAUGE=yes'
                            else
                            else
-                            ac_cv_use_gauge='wxUSE_GAUGE=no'
+                            wx_cv_use_gauge='wxUSE_GAUGE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
+                          wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_gauge"
+          eval "$wx_cv_use_gauge"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gauge >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_GAUGE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_GAUGE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_GAUGE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-grid" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-grid" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6; }
            no_cache=0
@@ -9748,40 +11851,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6; }
  if test "${enable_grid+set}" = set; then
    enableval=$enable_grid;
                            if test "$enableval" = yes; then
  if test "${enable_grid+set}" = set; then
    enableval=$enable_grid;
                            if test "$enableval" = yes; then
-                            ac_cv_use_grid='wxUSE_GRID=yes'
+                            wx_cv_use_grid='wxUSE_GRID=yes'
                            else
                            else
-                            ac_cv_use_grid='wxUSE_GRID=no'
+                            wx_cv_use_grid='wxUSE_GRID=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
+                          wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_grid"
+          eval "$wx_cv_use_grid"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_grid >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_GRID" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_GRID = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_GRID
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-dataviewctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; }
            no_cache=0
@@ -9789,40 +11906,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&
  if test "${enable_dataviewctrl+set}" = set; then
    enableval=$enable_dataviewctrl;
                            if test "$enableval" = yes; then
  if test "${enable_dataviewctrl+set}" = set; then
    enableval=$enable_dataviewctrl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
+                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
                            else
                            else
-                            ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
+                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DATAVIEWCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL='$DEFAULT_wxUSE_DATAVIEWCTRL
+                          wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_dataviewctrl"
+          eval "$wx_cv_use_dataviewctrl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DATAVIEWCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DATAVIEWCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DATAVIEWCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-hyperlink" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hyperlink" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6; }
            no_cache=0
@@ -9830,40 +11961,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6;
  if test "${enable_hyperlink+set}" = set; then
    enableval=$enable_hyperlink;
                            if test "$enableval" = yes; then
  if test "${enable_hyperlink+set}" = set; then
    enableval=$enable_hyperlink;
                            if test "$enableval" = yes; then
-                            ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes'
+                            wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes'
                            else
                            else
-                            ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no'
+                            wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_HYPERLINKCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL='$DEFAULT_wxUSE_HYPERLINKCTRL
+                          wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_hyperlink"
+          eval "$wx_cv_use_hyperlink"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_HYPERLINKCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_HYPERLINKCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_HYPERLINKCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-imaglist" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6; }
            no_cache=0
@@ -9871,40 +12016,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6; }
  if test "${enable_imaglist+set}" = set; then
    enableval=$enable_imaglist;
                            if test "$enableval" = yes; then
  if test "${enable_imaglist+set}" = set; then
    enableval=$enable_imaglist;
                            if test "$enableval" = yes; then
-                            ac_cv_use_imaglist='wxUSE_IMAGLIST=yes'
+                            wx_cv_use_imaglist='wxUSE_IMAGLIST=yes'
                            else
                            else
-                            ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
+                            wx_cv_use_imaglist='wxUSE_IMAGLIST=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
+                          wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_imaglist"
+          eval "$wx_cv_use_imaglist"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_IMAGLIST" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_IMAGLIST = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_IMAGLIST
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-listbook" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbook" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6; }
            no_cache=0
@@ -9912,40 +12071,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6; }
  if test "${enable_listbook+set}" = set; then
    enableval=$enable_listbook;
                            if test "$enableval" = yes; then
  if test "${enable_listbook+set}" = set; then
    enableval=$enable_listbook;
                            if test "$enableval" = yes; then
-                            ac_cv_use_listbook='wxUSE_LISTBOOK=yes'
+                            wx_cv_use_listbook='wxUSE_LISTBOOK=yes'
                            else
                            else
-                            ac_cv_use_listbook='wxUSE_LISTBOOK=no'
+                            wx_cv_use_listbook='wxUSE_LISTBOOK=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_LISTBOOK" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_listbook='wxUSE_LISTBOOK='$DEFAULT_wxUSE_LISTBOOK
+                          wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_listbook"
+          eval "$wx_cv_use_listbook"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_listbook >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_listbook >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LISTBOOK" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_LISTBOOK = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LISTBOOK
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-listbox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6; }
            no_cache=0
@@ -9953,40 +12126,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6; }
  if test "${enable_listbox+set}" = set; then
    enableval=$enable_listbox;
                            if test "$enableval" = yes; then
  if test "${enable_listbox+set}" = set; then
    enableval=$enable_listbox;
                            if test "$enableval" = yes; then
-                            ac_cv_use_listbox='wxUSE_LISTBOX=yes'
+                            wx_cv_use_listbox='wxUSE_LISTBOX=yes'
                            else
                            else
-                            ac_cv_use_listbox='wxUSE_LISTBOX=no'
+                            wx_cv_use_listbox='wxUSE_LISTBOX=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX
+                          wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_listbox"
+          eval "$wx_cv_use_listbox"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_listbox >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LISTBOX" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_LISTBOX = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LISTBOX
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-listctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6; }
            no_cache=0
@@ -9994,40 +12181,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6; }
  if test "${enable_listctrl+set}" = set; then
    enableval=$enable_listctrl;
                            if test "$enableval" = yes; then
  if test "${enable_listctrl+set}" = set; then
    enableval=$enable_listctrl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_listctrl='wxUSE_LISTCTRL=yes'
+                            wx_cv_use_listctrl='wxUSE_LISTCTRL=yes'
                            else
                            else
-                            ac_cv_use_listctrl='wxUSE_LISTCTRL=no'
+                            wx_cv_use_listctrl='wxUSE_LISTCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL
+                          wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_listctrl"
+          eval "$wx_cv_use_listctrl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_LISTCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_LISTCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_LISTCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-notebook" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notebook" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6; }
            no_cache=0
@@ -10035,40 +12236,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6; }
  if test "${enable_notebook+set}" = set; then
    enableval=$enable_notebook;
                            if test "$enableval" = yes; then
  if test "${enable_notebook+set}" = set; then
    enableval=$enable_notebook;
                            if test "$enableval" = yes; then
-                            ac_cv_use_notebook='wxUSE_NOTEBOOK=yes'
+                            wx_cv_use_notebook='wxUSE_NOTEBOOK=yes'
                            else
                            else
-                            ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
+                            wx_cv_use_notebook='wxUSE_NOTEBOOK=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
+                          wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_notebook"
+          eval "$wx_cv_use_notebook"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_notebook >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_NOTEBOOK" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_NOTEBOOK = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_NOTEBOOK
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-odcombobox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombobox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6; }
            no_cache=0
@@ -10076,40 +12291,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6;
  if test "${enable_odcombobox+set}" = set; then
    enableval=$enable_odcombobox;
                            if test "$enableval" = yes; then
  if test "${enable_odcombobox+set}" = set; then
    enableval=$enable_odcombobox;
                            if test "$enableval" = yes; then
-                            ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes'
+                            wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes'
                            else
                            else
-                            ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no'
+                            wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_ODCOMBOBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX='$DEFAULT_wxUSE_ODCOMBOBOX
+                          wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_odcombobox"
+          eval "$wx_cv_use_odcombobox"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_ODCOMBOBOX" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ODCOMBOBOX = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_ODCOMBOBOX
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-radiobox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6; }
            no_cache=0
@@ -10117,40 +12346,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6; }
  if test "${enable_radiobox+set}" = set; then
    enableval=$enable_radiobox;
                            if test "$enableval" = yes; then
  if test "${enable_radiobox+set}" = set; then
    enableval=$enable_radiobox;
                            if test "$enableval" = yes; then
-                            ac_cv_use_radiobox='wxUSE_RADIOBOX=yes'
+                            wx_cv_use_radiobox='wxUSE_RADIOBOX=yes'
                            else
                            else
-                            ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
+                            wx_cv_use_radiobox='wxUSE_RADIOBOX=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX
+                          wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_radiobox"
+          eval "$wx_cv_use_radiobox"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_RADIOBOX" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RADIOBOX = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_RADIOBOX
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-radiobtn" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobtn" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6; }
            no_cache=0
@@ -10158,40 +12401,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6; }
  if test "${enable_radiobtn+set}" = set; then
    enableval=$enable_radiobtn;
                            if test "$enableval" = yes; then
  if test "${enable_radiobtn+set}" = set; then
    enableval=$enable_radiobtn;
                            if test "$enableval" = yes; then
-                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
+                            wx_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
                            else
                            else
-                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
+                            wx_cv_use_radiobtn='wxUSE_RADIOBTN=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN
+                          wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_radiobtn"
+          eval "$wx_cv_use_radiobtn"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_RADIOBTN" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RADIOBTN = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_RADIOBTN
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-sash" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sash" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6; }
            no_cache=0
@@ -10199,40 +12456,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6; }
  if test "${enable_sash+set}" = set; then
    enableval=$enable_sash;
                            if test "$enableval" = yes; then
  if test "${enable_sash+set}" = set; then
    enableval=$enable_sash;
                            if test "$enableval" = yes; then
-                            ac_cv_use_sash='wxUSE_SASH=yes'
+                            wx_cv_use_sash='wxUSE_SASH=yes'
                            else
                            else
-                            ac_cv_use_sash='wxUSE_SASH=no'
+                            wx_cv_use_sash='wxUSE_SASH=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH
+                          wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_sash"
+          eval "$wx_cv_use_sash"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_sash >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SASH" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SASH = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SASH
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-scrollbar" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-scrollbar" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6; }
            no_cache=0
@@ -10240,40 +12511,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6;
  if test "${enable_scrollbar+set}" = set; then
    enableval=$enable_scrollbar;
                            if test "$enableval" = yes; then
  if test "${enable_scrollbar+set}" = set; then
    enableval=$enable_scrollbar;
                            if test "$enableval" = yes; then
-                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
+                            wx_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
                            else
                            else
-                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
+                            wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR
+                          wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_scrollbar"
+          eval "$wx_cv_use_scrollbar"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SCROLLBAR" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SCROLLBAR = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SCROLLBAR
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-searchctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6; }
            no_cache=0
@@ -10281,40 +12566,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6;
  if test "${enable_searchctrl+set}" = set; then
    enableval=$enable_searchctrl;
                            if test "$enableval" = yes; then
  if test "${enable_searchctrl+set}" = set; then
    enableval=$enable_searchctrl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
+                            wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
                            else
                            else
-                            ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
+                            wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SEARCHCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_searchctrl='wxUSE_SEARCHCTRL='$DEFAULT_wxUSE_SEARCHCTRL
+                          wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_searchctrl"
+          eval "$wx_cv_use_searchctrl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SEARCHCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SEARCHCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SEARCHCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-slider" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6; }
            no_cache=0
@@ -10322,40 +12621,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6; }
  if test "${enable_slider+set}" = set; then
    enableval=$enable_slider;
                            if test "$enableval" = yes; then
  if test "${enable_slider+set}" = set; then
    enableval=$enable_slider;
                            if test "$enableval" = yes; then
-                            ac_cv_use_slider='wxUSE_SLIDER=yes'
+                            wx_cv_use_slider='wxUSE_SLIDER=yes'
                            else
                            else
-                            ac_cv_use_slider='wxUSE_SLIDER=no'
+                            wx_cv_use_slider='wxUSE_SLIDER=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER
+                          wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_slider"
+          eval "$wx_cv_use_slider"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_slider >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SLIDER" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SLIDER = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SLIDER
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-spinbtn" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinbtn" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6; }
            no_cache=0
@@ -10363,40 +12676,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6; }
  if test "${enable_spinbtn+set}" = set; then
    enableval=$enable_spinbtn;
                            if test "$enableval" = yes; then
  if test "${enable_spinbtn+set}" = set; then
    enableval=$enable_spinbtn;
                            if test "$enableval" = yes; then
-                            ac_cv_use_spinbtn='wxUSE_SPINBTN=yes'
+                            wx_cv_use_spinbtn='wxUSE_SPINBTN=yes'
                            else
                            else
-                            ac_cv_use_spinbtn='wxUSE_SPINBTN=no'
+                            wx_cv_use_spinbtn='wxUSE_SPINBTN=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN
+                          wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_spinbtn"
+          eval "$wx_cv_use_spinbtn"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SPINBTN" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SPINBTN = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SPINBTN
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-spinctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6; }
            no_cache=0
@@ -10404,40 +12731,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6; }
  if test "${enable_spinctrl+set}" = set; then
    enableval=$enable_spinctrl;
                            if test "$enableval" = yes; then
  if test "${enable_spinctrl+set}" = set; then
    enableval=$enable_spinctrl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
+                            wx_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
                            else
                            else
-                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
+                            wx_cv_use_spinctrl='wxUSE_SPINCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL
+                          wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_spinctrl"
+          eval "$wx_cv_use_spinctrl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SPINCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SPINCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SPINCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-splitter" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splitter" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6; }
            no_cache=0
@@ -10445,40 +12786,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6; }
  if test "${enable_splitter+set}" = set; then
    enableval=$enable_splitter;
                            if test "$enableval" = yes; then
  if test "${enable_splitter+set}" = set; then
    enableval=$enable_splitter;
                            if test "$enableval" = yes; then
-                            ac_cv_use_splitter='wxUSE_SPLITTER=yes'
+                            wx_cv_use_splitter='wxUSE_SPLITTER=yes'
                            else
                            else
-                            ac_cv_use_splitter='wxUSE_SPLITTER=no'
+                            wx_cv_use_splitter='wxUSE_SPLITTER=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER
+                          wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_splitter"
+          eval "$wx_cv_use_splitter"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_splitter >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SPLITTER" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SPLITTER = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SPLITTER
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-statbmp" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbmp" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6; }
            no_cache=0
@@ -10486,40 +12841,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6; }
  if test "${enable_statbmp+set}" = set; then
    enableval=$enable_statbmp;
                            if test "$enableval" = yes; then
  if test "${enable_statbmp+set}" = set; then
    enableval=$enable_statbmp;
                            if test "$enableval" = yes; then
-                            ac_cv_use_statbmp='wxUSE_STATBMP=yes'
+                            wx_cv_use_statbmp='wxUSE_STATBMP=yes'
                            else
                            else
-                            ac_cv_use_statbmp='wxUSE_STATBMP=no'
+                            wx_cv_use_statbmp='wxUSE_STATBMP=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
+                          wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_statbmp"
+          eval "$wx_cv_use_statbmp"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STATBMP" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STATBMP = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STATBMP
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-statbox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbox" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6; }
            no_cache=0
@@ -10527,40 +12896,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6; }
  if test "${enable_statbox+set}" = set; then
    enableval=$enable_statbox;
                            if test "$enableval" = yes; then
  if test "${enable_statbox+set}" = set; then
    enableval=$enable_statbox;
                            if test "$enableval" = yes; then
-                            ac_cv_use_statbox='wxUSE_STATBOX=yes'
+                            wx_cv_use_statbox='wxUSE_STATBOX=yes'
                            else
                            else
-                            ac_cv_use_statbox='wxUSE_STATBOX=no'
+                            wx_cv_use_statbox='wxUSE_STATBOX=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
+                          wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_statbox"
+          eval "$wx_cv_use_statbox"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_statbox >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STATBOX" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STATBOX = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STATBOX
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-statline" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statline" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6; }
            no_cache=0
@@ -10568,40 +12951,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6; }
  if test "${enable_statline+set}" = set; then
    enableval=$enable_statline;
                            if test "$enableval" = yes; then
  if test "${enable_statline+set}" = set; then
    enableval=$enable_statline;
                            if test "$enableval" = yes; then
-                            ac_cv_use_statline='wxUSE_STATLINE=yes'
+                            wx_cv_use_statline='wxUSE_STATLINE=yes'
                            else
                            else
-                            ac_cv_use_statline='wxUSE_STATLINE=no'
+                            wx_cv_use_statline='wxUSE_STATLINE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
+                          wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_statline"
+          eval "$wx_cv_use_statline"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_statline >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STATLINE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STATLINE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STATLINE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-stattext" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stattext" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6; }
            no_cache=0
@@ -10609,40 +13006,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6; }
  if test "${enable_stattext+set}" = set; then
    enableval=$enable_stattext;
                            if test "$enableval" = yes; then
  if test "${enable_stattext+set}" = set; then
    enableval=$enable_stattext;
                            if test "$enableval" = yes; then
-                            ac_cv_use_stattext='wxUSE_STATTEXT=yes'
+                            wx_cv_use_stattext='wxUSE_STATTEXT=yes'
                            else
                            else
-                            ac_cv_use_stattext='wxUSE_STATTEXT=no'
+                            wx_cv_use_stattext='wxUSE_STATTEXT=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT
+                          wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_stattext"
+          eval "$wx_cv_use_stattext"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_stattext >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STATTEXT" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STATTEXT = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STATTEXT
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-statusbar" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statusbar" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6; }
            no_cache=0
@@ -10650,40 +13061,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6;
  if test "${enable_statusbar+set}" = set; then
    enableval=$enable_statusbar;
                            if test "$enableval" = yes; then
  if test "${enable_statusbar+set}" = set; then
    enableval=$enable_statusbar;
                            if test "$enableval" = yes; then
-                            ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
+                            wx_cv_use_statusbar='wxUSE_STATUSBAR=yes'
                            else
                            else
-                            ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
+                            wx_cv_use_statusbar='wxUSE_STATUSBAR=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
+                          wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_statusbar"
+          eval "$wx_cv_use_statusbar"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STATUSBAR" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STATUSBAR = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STATUSBAR
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-tabdialog" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tabdialog" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6; }
            no_cache=0
@@ -10691,40 +13116,109 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6;
  if test "${enable_tabdialog+set}" = set; then
    enableval=$enable_tabdialog;
                            if test "$enableval" = yes; then
  if test "${enable_tabdialog+set}" = set; then
    enableval=$enable_tabdialog;
                            if test "$enableval" = yes; then
-                            ac_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes'
+                            wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes'
                            else
                            else
-                            ac_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
+                            wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TAB_DIALOG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_tabdialog='wxUSE_TAB_DIALOG='$DEFAULT_wxUSE_TAB_DIALOG
+                          wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_tabdialog"
+          eval "$wx_cv_use_tabdialog"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TAB_DIALOG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TAB_DIALOG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TAB_DIALOG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-taskbaricon" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-taskbaricon was given.
+if test "${enable_taskbaricon+set}" = set; then
+  enableval=$enable_taskbaricon;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes'
+                          else
+                            wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_taskbaricon"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_taskbaricon >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TASKBARICON = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_TASKBARICON
+          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}-textctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; }
            no_cache=0
@@ -10732,40 +13226,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; }
  if test "${enable_textctrl+set}" = set; then
    enableval=$enable_textctrl;
                            if test "$enableval" = yes; then
  if test "${enable_textctrl+set}" = set; then
    enableval=$enable_textctrl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
+                            wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
                            else
                            else
-                            ac_cv_use_textctrl='wxUSE_TEXTCTRL=no'
+                            wx_cv_use_textctrl='wxUSE_TEXTCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL
+                          wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_textctrl"
+          eval "$wx_cv_use_textctrl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TEXTCTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TEXTCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TEXTCTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-togglebtn" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; }
            no_cache=0
@@ -10773,40 +13281,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6;
  if test "${enable_togglebtn+set}" = set; then
    enableval=$enable_togglebtn;
                            if test "$enableval" = yes; then
  if test "${enable_togglebtn+set}" = set; then
    enableval=$enable_togglebtn;
                            if test "$enableval" = yes; then
-                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
+                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
                            else
                            else
-                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
+                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN
+                          wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_togglebtn"
+          eval "$wx_cv_use_togglebtn"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TOGGLEBTN" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TOGGLEBTN = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TOGGLEBTN
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-toolbar" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; }
            no_cache=0
@@ -10814,40 +13336,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; }
  if test "${enable_toolbar+set}" = set; then
    enableval=$enable_toolbar;
                            if test "$enableval" = yes; then
  if test "${enable_toolbar+set}" = set; then
    enableval=$enable_toolbar;
                            if test "$enableval" = yes; then
-                            ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+                            wx_cv_use_toolbar='wxUSE_TOOLBAR=yes'
                            else
                            else
-                            ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
+                            wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
+                          wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_toolbar"
+          eval "$wx_cv_use_toolbar"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TOOLBAR" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TOOLBAR = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TOOLBAR
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-tbarnative" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; }
            no_cache=0
@@ -10855,40 +13391,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6;
  if test "${enable_tbarnative+set}" = set; then
    enableval=$enable_tbarnative;
                            if test "$enableval" = yes; then
  if test "${enable_tbarnative+set}" = set; then
    enableval=$enable_tbarnative;
                            if test "$enableval" = yes; then
-                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
                            else
                            else
-                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
+                          wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_tbarnative"
+          eval "$wx_cv_use_tbarnative"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TOOLBAR_NATIVE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TOOLBAR_NATIVE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-treebook" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; }
            no_cache=0
@@ -10896,40 +13446,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; }
  if test "${enable_treebook+set}" = set; then
    enableval=$enable_treebook;
                            if test "$enableval" = yes; then
  if test "${enable_treebook+set}" = set; then
    enableval=$enable_treebook;
                            if test "$enableval" = yes; then
-                            ac_cv_use_treebook='wxUSE_TREEBOOK=yes'
+                            wx_cv_use_treebook='wxUSE_TREEBOOK=yes'
                            else
                            else
-                            ac_cv_use_treebook='wxUSE_TREEBOOK=no'
+                            wx_cv_use_treebook='wxUSE_TREEBOOK=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TREEBOOK" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_treebook='wxUSE_TREEBOOK='$DEFAULT_wxUSE_TREEBOOK
+                          wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_treebook"
+          eval "$wx_cv_use_treebook"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_treebook >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_treebook >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TREEBOOK" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TREEBOOK = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TREEBOOK
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-toolbook" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbook" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6; }
            no_cache=0
@@ -10937,40 +13501,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6; }
  if test "${enable_toolbook+set}" = set; then
    enableval=$enable_toolbook;
                            if test "$enableval" = yes; then
  if test "${enable_toolbook+set}" = set; then
    enableval=$enable_toolbook;
                            if test "$enableval" = yes; then
-                            ac_cv_use_toolbook='wxUSE_TOOLBOOK=yes'
+                            wx_cv_use_toolbook='wxUSE_TOOLBOOK=yes'
                            else
                            else
-                            ac_cv_use_toolbook='wxUSE_TOOLBOOK=no'
+                            wx_cv_use_toolbook='wxUSE_TOOLBOOK=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TOOLBOOK" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_toolbook='wxUSE_TOOLBOOK='$DEFAULT_wxUSE_TOOLBOOK
+                          wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_toolbook"
+          eval "$wx_cv_use_toolbook"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_toolbook >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_toolbook >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TOOLBOOK" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TOOLBOOK = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TOOLBOOK
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-treectrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; }
            no_cache=0
@@ -10978,40 +13556,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; }
  if test "${enable_treectrl+set}" = set; then
    enableval=$enable_treectrl;
                            if test "$enableval" = yes; then
  if test "${enable_treectrl+set}" = set; then
    enableval=$enable_treectrl;
                            if test "$enableval" = yes; then
-                            ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
+                            wx_cv_use_treectrl='wxUSE_TREECTRL=yes'
                            else
                            else
-                            ac_cv_use_treectrl='wxUSE_TREECTRL=no'
+                            wx_cv_use_treectrl='wxUSE_TREECTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
+                          wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_treectrl"
+          eval "$wx_cv_use_treectrl"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TREECTRL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TREECTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TREECTRL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-tipwindow" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; }
            no_cache=0
@@ -11019,40 +13611,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6;
  if test "${enable_tipwindow+set}" = set; then
    enableval=$enable_tipwindow;
                            if test "$enableval" = yes; then
  if test "${enable_tipwindow+set}" = set; then
    enableval=$enable_tipwindow;
                            if test "$enableval" = yes; then
-                            ac_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
+                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
                            else
                            else
-                            ac_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
+                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TIPWINDOW" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_tipwindow='wxUSE_TIPWINDOW='$DEFAULT_wxUSE_TIPWINDOW
+                          wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_tipwindow"
+          eval "$wx_cv_use_tipwindow"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TIPWINDOW" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TIPWINDOW = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TIPWINDOW
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-popupwin" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; }
            no_cache=0
@@ -11060,42 +13666,56 @@ echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; }
  if test "${enable_popupwin+set}" = set; then
    enableval=$enable_popupwin;
                            if test "$enableval" = yes; then
  if test "${enable_popupwin+set}" = set; then
    enableval=$enable_popupwin;
                            if test "$enableval" = yes; then
-                            ac_cv_use_popupwin='wxUSE_POPUPWIN=yes'
+                            wx_cv_use_popupwin='wxUSE_POPUPWIN=yes'
                            else
                            else
-                            ac_cv_use_popupwin='wxUSE_POPUPWIN=no'
+                            wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_POPUPWIN" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN
+                          wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_popupwin"
+          eval "$wx_cv_use_popupwin"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_popupwin >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_POPUPWIN" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_POPUPWIN = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_POPUPWIN
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
  
  
            enablestring=
  
  
  
            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}-commondlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commondlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11103,40 +13723,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6;
  if test "${enable_commondlg+set}" = set; then
    enableval=$enable_commondlg;
                            if test "$enableval" = yes; then
  if test "${enable_commondlg+set}" = set; then
    enableval=$enable_commondlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
+                            wx_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
                            else
                            else
-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
+                            wx_cv_use_commondlg='wxUSE_COMMONDLGS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
+                          wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_commondlg"
+          eval "$wx_cv_use_commondlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_COMMONDLGS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_COMMONDLGS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_COMMONDLGS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-aboutdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aboutdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11144,40 +13778,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6; }
  if test "${enable_aboutdlg+set}" = set; then
    enableval=$enable_aboutdlg;
                            if test "$enableval" = yes; then
  if test "${enable_aboutdlg+set}" = set; then
    enableval=$enable_aboutdlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes'
+                            wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes'
                            else
                            else
-                            ac_cv_use_aboutdlg='wxUSE_ABOUTDLG=no'
+                            wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_ABOUTDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_aboutdlg='wxUSE_ABOUTDLG='$DEFAULT_wxUSE_ABOUTDLG
+                          wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_aboutdlg"
+          eval "$wx_cv_use_aboutdlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_ABOUTDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ABOUTDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_ABOUTDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-choicedlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicedlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11185,40 +13833,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6;
  if test "${enable_choicedlg+set}" = set; then
    enableval=$enable_choicedlg;
                            if test "$enableval" = yes; then
  if test "${enable_choicedlg+set}" = set; then
    enableval=$enable_choicedlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
+                            wx_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
                            else
                            else
-                            ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
+                            wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_CHOICEDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG
+                          wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_choicedlg"
+          eval "$wx_cv_use_choicedlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_CHOICEDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CHOICEDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_CHOICEDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-coldlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-coldlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11226,40 +13888,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6; }
  if test "${enable_coldlg+set}" = set; then
    enableval=$enable_coldlg;
                            if test "$enableval" = yes; then
  if test "${enable_coldlg+set}" = set; then
    enableval=$enable_coldlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_coldlg='wxUSE_COLOURDLG=yes'
+                            wx_cv_use_coldlg='wxUSE_COLOURDLG=yes'
                            else
                            else
-                            ac_cv_use_coldlg='wxUSE_COLOURDLG=no'
+                            wx_cv_use_coldlg='wxUSE_COLOURDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG
+                          wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_coldlg"
+          eval "$wx_cv_use_coldlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_COLOURDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_COLOURDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_COLOURDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-filedlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filedlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11267,40 +13943,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6; }
  if test "${enable_filedlg+set}" = set; then
    enableval=$enable_filedlg;
                            if test "$enableval" = yes; then
  if test "${enable_filedlg+set}" = set; then
    enableval=$enable_filedlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_filedlg='wxUSE_FILEDLG=yes'
+                            wx_cv_use_filedlg='wxUSE_FILEDLG=yes'
                            else
                            else
-                            ac_cv_use_filedlg='wxUSE_FILEDLG=no'
+                            wx_cv_use_filedlg='wxUSE_FILEDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG
+                          wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_filedlg"
+          eval "$wx_cv_use_filedlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FILEDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FILEDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FILEDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-finddlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-finddlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11308,40 +13998,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6; }
  if test "${enable_finddlg+set}" = set; then
    enableval=$enable_finddlg;
                            if test "$enableval" = yes; then
  if test "${enable_finddlg+set}" = set; then
    enableval=$enable_finddlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
+                            wx_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
                            else
                            else
-                            ac_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
+                            wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_finddlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG
+                          wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_finddlg"
+          eval "$wx_cv_use_finddlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_finddlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_finddlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FINDREPLDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FINDREPLDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FINDREPLDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-fontdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11349,40 +14053,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6; }
  if test "${enable_fontdlg+set}" = set; then
    enableval=$enable_fontdlg;
                            if test "$enableval" = yes; then
  if test "${enable_fontdlg+set}" = set; then
    enableval=$enable_fontdlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_fontdlg='wxUSE_FONTDLG=yes'
+                            wx_cv_use_fontdlg='wxUSE_FONTDLG=yes'
                            else
                            else
-                            ac_cv_use_fontdlg='wxUSE_FONTDLG=no'
+                            wx_cv_use_fontdlg='wxUSE_FONTDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG
+                          wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_fontdlg"
+          eval "$wx_cv_use_fontdlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_FONTDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FONTDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_FONTDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-dirdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11390,40 +14108,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6; }
  if test "${enable_dirdlg+set}" = set; then
    enableval=$enable_dirdlg;
                            if test "$enableval" = yes; then
  if test "${enable_dirdlg+set}" = set; then
    enableval=$enable_dirdlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
+                            wx_cv_use_dirdlg='wxUSE_DIRDLG=yes'
                            else
                            else
-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
+                            wx_cv_use_dirdlg='wxUSE_DIRDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
+                          wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_dirdlg"
+          eval "$wx_cv_use_dirdlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DIRDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DIRDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DIRDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-msgdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-msgdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11431,40 +14163,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6; }
  if test "${enable_msgdlg+set}" = set; then
    enableval=$enable_msgdlg;
                            if test "$enableval" = yes; then
  if test "${enable_msgdlg+set}" = set; then
    enableval=$enable_msgdlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'
+                            wx_cv_use_msgdlg='wxUSE_MSGDLG=yes'
                            else
                            else
-                            ac_cv_use_msgdlg='wxUSE_MSGDLG=no'
+                            wx_cv_use_msgdlg='wxUSE_MSGDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG
+                          wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_msgdlg"
+          eval "$wx_cv_use_msgdlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MSGDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MSGDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_MSGDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-numberdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-numberdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11472,40 +14218,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6;
  if test "${enable_numberdlg+set}" = set; then
    enableval=$enable_numberdlg;
                            if test "$enableval" = yes; then
  if test "${enable_numberdlg+set}" = set; then
    enableval=$enable_numberdlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
+                            wx_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
                            else
                            else
-                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
+                            wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG
+                          wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_numberdlg"
+          eval "$wx_cv_use_numberdlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_NUMBERDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_NUMBERDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_NUMBERDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-splash" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splash" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6; }
            no_cache=0
@@ -11513,40 +14273,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6; }
  if test "${enable_splash+set}" = set; then
    enableval=$enable_splash;
                            if test "$enableval" = yes; then
  if test "${enable_splash+set}" = set; then
    enableval=$enable_splash;
                            if test "$enableval" = yes; then
-                            ac_cv_use_splash='wxUSE_SPLASH=yes'
+                            wx_cv_use_splash='wxUSE_SPLASH=yes'
                            else
                            else
-                            ac_cv_use_splash='wxUSE_SPLASH=no'
+                            wx_cv_use_splash='wxUSE_SPLASH=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH
+                          wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_splash"
+          eval "$wx_cv_use_splash"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_splash >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_splash >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SPLASH" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SPLASH = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SPLASH
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-textdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11554,40 +14328,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6; }
  if test "${enable_textdlg+set}" = set; then
    enableval=$enable_textdlg;
                            if test "$enableval" = yes; then
  if test "${enable_textdlg+set}" = set; then
    enableval=$enable_textdlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_textdlg='wxUSE_TEXTDLG=yes'
+                            wx_cv_use_textdlg='wxUSE_TEXTDLG=yes'
                            else
                            else
-                            ac_cv_use_textdlg='wxUSE_TEXTDLG=no'
+                            wx_cv_use_textdlg='wxUSE_TEXTDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG
+                          wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_textdlg"
+          eval "$wx_cv_use_textdlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TEXTDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TEXTDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TEXTDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-tipdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11595,40 +14383,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6; }
  if test "${enable_tipdlg+set}" = set; then
    enableval=$enable_tipdlg;
                            if test "$enableval" = yes; then
  if test "${enable_tipdlg+set}" = set; then
    enableval=$enable_tipdlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
+                            wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
                            else
                            else
-                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
+                            wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS
+                          wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_tipdlg"
+          eval "$wx_cv_use_tipdlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_STARTUP_TIPS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_STARTUP_TIPS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_STARTUP_TIPS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-progressdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-progressdlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11636,40 +14438,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6
  if test "${enable_progressdlg+set}" = set; then
    enableval=$enable_progressdlg;
                            if test "$enableval" = yes; then
  if test "${enable_progressdlg+set}" = set; then
    enableval=$enable_progressdlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
+                            wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
                            else
                            else
-                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
+                            wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG
+                          wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_progressdlg"
+          eval "$wx_cv_use_progressdlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PROGRESSDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PROGRESSDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PROGRESSDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-wizarddlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wizarddlg" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6; }
            no_cache=0
@@ -11677,42 +14493,56 @@ echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6;
  if test "${enable_wizarddlg+set}" = set; then
    enableval=$enable_wizarddlg;
                            if test "$enableval" = yes; then
  if test "${enable_wizarddlg+set}" = set; then
    enableval=$enable_wizarddlg;
                            if test "$enableval" = yes; then
-                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
+                            wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
                            else
                            else
-                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
+                            wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG
+                          wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_wizarddlg"
+          eval "$wx_cv_use_wizarddlg"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_WIZARDDLG" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_WIZARDDLG = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_WIZARDDLG
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
  
  
            enablestring=
  
  
  
            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}-menus" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-menus" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6; }
            no_cache=0
@@ -11720,40 +14550,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6; }
  if test "${enable_menus+set}" = set; then
    enableval=$enable_menus;
                            if test "$enableval" = yes; then
  if test "${enable_menus+set}" = set; then
    enableval=$enable_menus;
                            if test "$enableval" = yes; then
-                            ac_cv_use_menus='wxUSE_MENUS=yes'
+                            wx_cv_use_menus='wxUSE_MENUS=yes'
                            else
                            else
-                            ac_cv_use_menus='wxUSE_MENUS=no'
+                            wx_cv_use_menus='wxUSE_MENUS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS
+                          wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_menus"
+          eval "$wx_cv_use_menus"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_menus >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MENUS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MENUS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_MENUS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-miniframe" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-miniframe" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6; }
            no_cache=0
@@ -11761,40 +14605,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6;
  if test "${enable_miniframe+set}" = set; then
    enableval=$enable_miniframe;
                            if test "$enableval" = yes; then
  if test "${enable_miniframe+set}" = set; then
    enableval=$enable_miniframe;
                            if test "$enableval" = yes; then
-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
+                            wx_cv_use_miniframe='wxUSE_MINIFRAME=yes'
                            else
                            else
-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
+                            wx_cv_use_miniframe='wxUSE_MINIFRAME=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
+                          wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_miniframe"
+          eval "$wx_cv_use_miniframe"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MINIFRAME" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MINIFRAME = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_MINIFRAME
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-tooltips" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tooltips" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6; }
            no_cache=0
@@ -11802,40 +14660,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6; }
  if test "${enable_tooltips+set}" = set; then
    enableval=$enable_tooltips;
                            if test "$enableval" = yes; then
  if test "${enable_tooltips+set}" = set; then
    enableval=$enable_tooltips;
                            if test "$enableval" = yes; then
-                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
+                            wx_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
                            else
                            else
-                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'
+                            wx_cv_use_tooltips='wxUSE_TOOLTIPS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS
+                          wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_tooltips"
+          eval "$wx_cv_use_tooltips"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TOOLTIPS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TOOLTIPS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TOOLTIPS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-splines" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splines" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6; }
            no_cache=0
@@ -11843,40 +14715,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6; }
  if test "${enable_splines+set}" = set; then
    enableval=$enable_splines;
                            if test "$enableval" = yes; then
  if test "${enable_splines+set}" = set; then
    enableval=$enable_splines;
                            if test "$enableval" = yes; then
-                            ac_cv_use_splines='wxUSE_SPLINES=yes'
+                            wx_cv_use_splines='wxUSE_SPLINES=yes'
                            else
                            else
-                            ac_cv_use_splines='wxUSE_SPLINES=no'
+                            wx_cv_use_splines='wxUSE_SPLINES=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES
+                          wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_splines"
+          eval "$wx_cv_use_splines"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_splines >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_SPLINES" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SPLINES = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_SPLINES
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-mousewheel" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6; }
            no_cache=0
@@ -11884,40 +14770,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6;
  if test "${enable_mousewheel+set}" = set; then
    enableval=$enable_mousewheel;
                            if test "$enableval" = yes; then
  if test "${enable_mousewheel+set}" = set; then
    enableval=$enable_mousewheel;
                            if test "$enableval" = yes; then
-                            ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes'
+                            wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes'
                            else
                            else
-                            ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no'
+                            wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_MOUSEWHEEL" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL='$DEFAULT_wxUSE_MOUSEWHEEL
+                          wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_mousewheel"
+          eval "$wx_cv_use_mousewheel"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_MOUSEWHEEL" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MOUSEWHEEL = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_MOUSEWHEEL
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-validators" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6; }
            no_cache=0
@@ -11925,40 +14825,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6;
  if test "${enable_validators+set}" = set; then
    enableval=$enable_validators;
                            if test "$enableval" = yes; then
  if test "${enable_validators+set}" = set; then
    enableval=$enable_validators;
                            if test "$enableval" = yes; then
-                            ac_cv_use_validators='wxUSE_VALIDATORS=yes'
+                            wx_cv_use_validators='wxUSE_VALIDATORS=yes'
                            else
                            else
-                            ac_cv_use_validators='wxUSE_VALIDATORS=no'
+                            wx_cv_use_validators='wxUSE_VALIDATORS=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS
+                          wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_validators"
+          eval "$wx_cv_use_validators"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_validators >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_VALIDATORS" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_VALIDATORS = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_VALIDATORS
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-busyinfo" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-busyinfo" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6; }
            no_cache=0
@@ -11966,40 +14880,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6; }
  if test "${enable_busyinfo+set}" = set; then
    enableval=$enable_busyinfo;
                            if test "$enableval" = yes; then
  if test "${enable_busyinfo+set}" = set; then
    enableval=$enable_busyinfo;
                            if test "$enableval" = yes; then
-                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
+                            wx_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
                            else
                            else
-                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'
+                            wx_cv_use_busyinfo='wxUSE_BUSYINFO=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO
+                          wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_busyinfo"
+          eval "$wx_cv_use_busyinfo"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_BUSYINFO" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_BUSYINFO = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_BUSYINFO
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-joystick" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-joystick" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6; }
            no_cache=0
@@ -12007,40 +14935,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6; }
  if test "${enable_joystick+set}" = set; then
    enableval=$enable_joystick;
                            if test "$enableval" = yes; then
  if test "${enable_joystick+set}" = set; then
    enableval=$enable_joystick;
                            if test "$enableval" = yes; then
-                            ac_cv_use_joystick='wxUSE_JOYSTICK=yes'
+                            wx_cv_use_joystick='wxUSE_JOYSTICK=yes'
                            else
                            else
-                            ac_cv_use_joystick='wxUSE_JOYSTICK=no'
+                            wx_cv_use_joystick='wxUSE_JOYSTICK=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK
+                          wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_joystick"
+          eval "$wx_cv_use_joystick"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_joystick >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_JOYSTICK" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_JOYSTICK = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_JOYSTICK
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-metafile" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
            no_cache=0
@@ -12048,40 +14990,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
  if test "${enable_metafile+set}" = set; then
    enableval=$enable_metafile;
                            if test "$enableval" = yes; then
  if test "${enable_metafile+set}" = set; then
    enableval=$enable_metafile;
                            if test "$enableval" = yes; then
-                            ac_cv_use_metafile='wxUSE_METAFILE=yes'
+                            wx_cv_use_metafile='wxUSE_METAFILE=yes'
                            else
                            else
-                            ac_cv_use_metafile='wxUSE_METAFILE=no'
+                            wx_cv_use_metafile='wxUSE_METAFILE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
+                          wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_metafile"
+          eval "$wx_cv_use_metafile"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_METAFILE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_METAFILE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_METAFILE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-dragimage" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dragimage" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6; }
            no_cache=0
@@ -12089,40 +15045,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6;
  if test "${enable_dragimage+set}" = set; then
    enableval=$enable_dragimage;
                            if test "$enableval" = yes; then
  if test "${enable_dragimage+set}" = set; then
    enableval=$enable_dragimage;
                            if test "$enableval" = yes; then
-                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
+                            wx_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
                            else
                            else
-                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
+                            wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE
+                          wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_dragimage"
+          eval "$wx_cv_use_dragimage"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dragimage >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_DRAGIMAGE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DRAGIMAGE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_DRAGIMAGE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-accessibility" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accessibility" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6; }
            no_cache=0
@@ -12130,86 +15100,56 @@ echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >
  if test "${enable_accessibility+set}" = set; then
    enableval=$enable_accessibility;
                            if test "$enableval" = yes; then
  if test "${enable_accessibility+set}" = set; then
    enableval=$enable_accessibility;
                            if test "$enableval" = yes; then
-                            ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
+                            wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
                            else
                            else
-                            ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
+                            wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_ACCESSIBILITY" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_accessibility='wxUSE_ACCESSIBILITY='$DEFAULT_wxUSE_ACCESSIBILITY
+                          wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_accessibility"
+          eval "$wx_cv_use_accessibility"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_accessibility >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_accessibility >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_ACCESSIBILITY" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ACCESSIBILITY = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_ACCESSIBILITY
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
-if test "$wxUSE_MSW" = "1"; then
  
  
-          enablestring=
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dccache" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; }
-          no_cache=0
-          # Check whether --enable-dccache was given.
-if test "${enable_dccache+set}" = set; then
-  enableval=$enable_dccache;
-                          if test "$enableval" = yes; then
-                            ac_cv_use_dccache='wxUSE_DC_CACHEING=yes'
-                          else
-                            ac_cv_use_dccache='wxUSE_DC_CACHEING=no'
-                          fi
  
  
-else
  
  
-                          LINE=`grep "wxUSE_DC_CACHEING" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_dccache='wxUSE_DC_CACHEING='$DEFAULT_wxUSE_DC_CACHEING
-
-fi
-
-
-          eval "$ac_cv_use_dccache"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_dccache >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_DC_CACHEING" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-          else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
            fi
  
            fi
  
-fi
-
-
-
-          enablestring=
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6; }
            no_cache=0
@@ -12217,40 +15157,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6; }
  if test "${enable_palette+set}" = set; then
    enableval=$enable_palette;
                            if test "$enableval" = yes; then
  if test "${enable_palette+set}" = set; then
    enableval=$enable_palette;
                            if test "$enableval" = yes; then
-                            ac_cv_use_palette='wxUSE_PALETTE=yes'
+                            wx_cv_use_palette='wxUSE_PALETTE=yes'
                            else
                            else
-                            ac_cv_use_palette='wxUSE_PALETTE=no'
+                            wx_cv_use_palette='wxUSE_PALETTE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PALETTE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_palette='wxUSE_PALETTE='$DEFAULT_wxUSE_PALETTE
+                          wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_palette"
+          eval "$wx_cv_use_palette"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_palette >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_palette >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PALETTE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PALETTE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PALETTE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-image" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-image" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6; }
            no_cache=0
@@ -12258,40 +15212,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6; }
  if test "${enable_image+set}" = set; then
    enableval=$enable_image;
                            if test "$enableval" = yes; then
  if test "${enable_image+set}" = set; then
    enableval=$enable_image;
                            if test "$enableval" = yes; then
-                            ac_cv_use_image='wxUSE_IMAGE=yes'
+                            wx_cv_use_image='wxUSE_IMAGE=yes'
                            else
                            else
-                            ac_cv_use_image='wxUSE_IMAGE=no'
+                            wx_cv_use_image='wxUSE_IMAGE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE
+                          wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_image"
+          eval "$wx_cv_use_image"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_image >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_IMAGE" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_IMAGE = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_IMAGE
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-gif" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gif" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6; }
            no_cache=0
@@ -12299,40 +15267,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6; }
  if test "${enable_gif+set}" = set; then
    enableval=$enable_gif;
                            if test "$enableval" = yes; then
  if test "${enable_gif+set}" = set; then
    enableval=$enable_gif;
                            if test "$enableval" = yes; then
-                            ac_cv_use_gif='wxUSE_GIF=yes'
+                            wx_cv_use_gif='wxUSE_GIF=yes'
                            else
                            else
-                            ac_cv_use_gif='wxUSE_GIF=no'
+                            wx_cv_use_gif='wxUSE_GIF=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF
+                          wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_gif"
+          eval "$wx_cv_use_gif"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gif >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_GIF" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_GIF = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_GIF
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-pcx" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pcx" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6; }
            no_cache=0
@@ -12340,40 +15322,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6; }
  if test "${enable_pcx+set}" = set; then
    enableval=$enable_pcx;
                            if test "$enableval" = yes; then
  if test "${enable_pcx+set}" = set; then
    enableval=$enable_pcx;
                            if test "$enableval" = yes; then
-                            ac_cv_use_pcx='wxUSE_PCX=yes'
+                            wx_cv_use_pcx='wxUSE_PCX=yes'
                            else
                            else
-                            ac_cv_use_pcx='wxUSE_PCX=no'
+                            wx_cv_use_pcx='wxUSE_PCX=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX
+                          wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_pcx"
+          eval "$wx_cv_use_pcx"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_pcx >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PCX" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PCX = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PCX
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-tga" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tga" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6; }
            no_cache=0
@@ -12381,40 +15377,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6; }
  if test "${enable_tga+set}" = set; then
    enableval=$enable_tga;
                            if test "$enableval" = yes; then
  if test "${enable_tga+set}" = set; then
    enableval=$enable_tga;
                            if test "$enableval" = yes; then
-                            ac_cv_use_tga='wxUSE_TGA=yes'
+                            wx_cv_use_tga='wxUSE_TGA=yes'
                            else
                            else
-                            ac_cv_use_tga='wxUSE_TGA=no'
+                            wx_cv_use_tga='wxUSE_TGA=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_TGA" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_tga='wxUSE_TGA='$DEFAULT_wxUSE_TGA
+                          wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_tga"
+          eval "$wx_cv_use_tga"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_tga >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tga >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_TGA" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TGA = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_TGA
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-iff" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iff" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6; }
            no_cache=0
@@ -12422,40 +15432,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6; }
  if test "${enable_iff+set}" = set; then
    enableval=$enable_iff;
                            if test "$enableval" = yes; then
  if test "${enable_iff+set}" = set; then
    enableval=$enable_iff;
                            if test "$enableval" = yes; then
-                            ac_cv_use_iff='wxUSE_IFF=yes'
+                            wx_cv_use_iff='wxUSE_IFF=yes'
                            else
                            else
-                            ac_cv_use_iff='wxUSE_IFF=no'
+                            wx_cv_use_iff='wxUSE_IFF=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_IFF" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_iff='wxUSE_IFF='$DEFAULT_wxUSE_IFF
+                          wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_iff"
+          eval "$wx_cv_use_iff"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_iff >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_iff >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_IFF" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_IFF = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_IFF
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-pnm" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pnm" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6; }
            no_cache=0
@@ -12463,40 +15487,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6; }
  if test "${enable_pnm+set}" = set; then
    enableval=$enable_pnm;
                            if test "$enableval" = yes; then
  if test "${enable_pnm+set}" = set; then
    enableval=$enable_pnm;
                            if test "$enableval" = yes; then
-                            ac_cv_use_pnm='wxUSE_PNM=yes'
+                            wx_cv_use_pnm='wxUSE_PNM=yes'
                            else
                            else
-                            ac_cv_use_pnm='wxUSE_PNM=no'
+                            wx_cv_use_pnm='wxUSE_PNM=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM
+                          wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_pnm"
+          eval "$wx_cv_use_pnm"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_pnm >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_PNM" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_PNM = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_PNM
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-xpm" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xpm" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6; }
            no_cache=0
@@ -12504,40 +15542,54 @@ echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6; }
  if test "${enable_xpm+set}" = set; then
    enableval=$enable_xpm;
                            if test "$enableval" = yes; then
  if test "${enable_xpm+set}" = set; then
    enableval=$enable_xpm;
                            if test "$enableval" = yes; then
-                            ac_cv_use_xpm='wxUSE_XPM=yes'
+                            wx_cv_use_xpm='wxUSE_XPM=yes'
                            else
                            else
-                            ac_cv_use_xpm='wxUSE_XPM=no'
+                            wx_cv_use_xpm='wxUSE_XPM=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_xpm='wxUSE_XPM='$DEFAULT_wxUSE_XPM
+                          wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_xpm"
+          eval "$wx_cv_use_xpm"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_xpm >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_xpm >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_XPM" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_XPM = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_XPM
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
  
            enablestring=
  
            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}-ico_cur" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6; }
            no_cache=0
            { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ico_cur" >&5
  echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6; }
            no_cache=0
@@ -12545,101 +15597,157 @@ echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6; }
  if test "${enable_ico_cur+set}" = set; then
    enableval=$enable_ico_cur;
                            if test "$enableval" = yes; then
  if test "${enable_ico_cur+set}" = set; then
    enableval=$enable_ico_cur;
                            if test "$enableval" = yes; then
-                            ac_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
+                            wx_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
                            else
                            else
-                            ac_cv_use_ico_cur='wxUSE_ICO_CUR=no'
+                            wx_cv_use_ico_cur='wxUSE_ICO_CUR=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_ICO_CUR" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_ico_cur='wxUSE_ICO_CUR='$DEFAULT_wxUSE_ICO_CUR
+                          wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_ico_cur"
+          eval "$wx_cv_use_ico_cur"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_ICO_CUR" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ICO_CUR = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_ICO_CUR
            fi
  
            fi
  
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
-fi
  
  
  
  
  
  
-# Check whether --with-flavour was given.
-if test "${with_flavour+set}" = set; then
-  withval=$with_flavour; WX_FLAVOUR="$withval"
+          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}-dccache" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-dccache was given.
+if test "${enable_dccache+set}" = set; then
+  enableval=$enable_dccache;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_dccache='wxUSE_DC_CACHEING=yes'
+                          else
+                            wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
+
  fi
  
  
  fi
  
  
+          eval "$wx_cv_use_dccache"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_dccache >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DC_CACHEING = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_DC_CACHEING
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
            enablestring=
  
  
            enablestring=
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6; }
+          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}-uxtheme" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-uxtheme... $ECHO_C" >&6; }
            no_cache=0
            no_cache=0
-          # Check whether --enable-official_build was given.
-if test "${enable_official_build+set}" = set; then
-  enableval=$enable_official_build;
+          # Check whether --enable-uxtheme was given.
+if test "${enable_uxtheme+set}" = set; then
+  enableval=$enable_uxtheme;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
+                            wx_cv_use_uxtheme='wxUSE_UXTHEME=yes'
                            else
                            else
-                            ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
+                            wx_cv_use_uxtheme='wxUSE_UXTHEME=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          LINE=`grep "wxUSE_OFFICIAL_BUILD" ${wx_arg_cache_file}`
+                          LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}`
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
                            if test "x$LINE" != x ; then
                              eval "DEFAULT_$LINE"
                            else
                              no_cache=1
                            fi
  
-                          ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD='$DEFAULT_wxUSE_OFFICIAL_BUILD
+                          wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$ac_cv_use_official_build"
+          eval "$wx_cv_use_uxtheme"
            if test "$no_cache" != 1; then
            if test "$no_cache" != 1; then
-            echo $ac_cv_use_official_build >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_uxtheme >> ${wx_arg_cache_file}.tmp
            fi
  
            fi
  
-          if test "$wxUSE_OFFICIAL_BUILD" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_UXTHEME = yes; then
+              result=no
+            else
+              result=yes
+            fi
            else
            else
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            result=$wxUSE_UXTHEME
            fi
  
            fi
  
-# Check whether --enable-vendor was given.
-if test "${enable_vendor+set}" = set; then
-  enableval=$enable_vendor; VENDOR="$enableval"
-fi
-
-if test "x$VENDOR" = "x"; then
-    VENDOR="custom"
-fi
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
  
  
  
  
+fi
  
  
            echo "saving argument cache $wx_arg_cache_file"
  
  
            echo "saving argument cache $wx_arg_cache_file"
@@ -13759,6 +16867,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+
      ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
      ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13821,17 +16930,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5
  echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5
  echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; }
+    if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
+        :; INTELCC=yes
+    else
+        :;
+    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
  
      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 "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
-        :; INTELCC=yes
-    else
-        :;
-    fi
+
  
  
          if test "x$GCC" != "xyes"; then
  
  
          if test "x$GCC" != "xyes"; then
@@ -14055,15 +17165,17 @@ fi
  
                          case `uname -s` in
              AIX*)
  
                          case `uname -s` in
              AIX*)
-                ac_ext=c
+
+
+    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
-{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5
+    { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5
  echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; }
  echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; }
-if test "${bakefile_cv_c_compiler_xlc+set}" = set; then
+if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -14076,9 +17188,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  int
  main ()
  {
  int
  main ()
  {
-#ifndef __xlC__
-       choke me
-#endif
+
+             #ifndef __xlC__
+                choke me
+             #endif
  
    ;
    return 0;
  
    ;
    return 0;
@@ -14101,41 +17214,48 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  bakefile_compiler_xlc=yes
+  bakefile_cv_c_compiler___xlC__=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
  
-       bakefile_compiler_xlc=no
+       bakefile_cv_c_compiler___xlC__=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
-    bakefile_cv_c_compiler_xlc=$bakefile_compiler_xlc
  
  
-fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_xlc" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler_xlc" >&6; }
  
  
-XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes`
-ac_ext=c
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6; }
+    if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then
+        :; XLCC=yes
+    else
+        :;
+    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
  
  
  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
  
  
+
                  ;;
  
              Darwin)
                  ;;
  
              Darwin)
-                ac_ext=c
+
+
+    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
-{ echo "$as_me:$LINENO: checking whether we are using the Metrowerks C compiler" >&5
+    { echo "$as_me:$LINENO: checking whether we are using the Metrowerks C compiler" >&5
  echo $ECHO_N "checking whether we are using the Metrowerks C compiler... $ECHO_C" >&6; }
  echo $ECHO_N "checking whether we are using the Metrowerks C compiler... $ECHO_C" >&6; }
-if test "${bakefile_cv_c_compiler_mwerks+set}" = set; then
+if test "${bakefile_cv_c_compiler___MWERKS__+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -14148,9 +17268,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  int
  main ()
  {
  int
  main ()
  {
-#ifndef __MWERKS__
-       choke me
-#endif
+
+             #ifndef __MWERKS__
+                choke me
+             #endif
  
    ;
    return 0;
  
    ;
    return 0;
@@ -14173,38 +17294,45 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  bakefile_compiler_mwerks=yes
+  bakefile_cv_c_compiler___MWERKS__=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
  
-       bakefile_compiler_mwerks=no
+       bakefile_cv_c_compiler___MWERKS__=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
-    bakefile_cv_c_compiler_mwerks=$bakefile_compiler_mwerks
  
  
-fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_mwerks" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler_mwerks" >&6; }
  
  
-MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes`
-ac_ext=c
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___MWERKS__" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___MWERKS__" >&6; }
+    if test "x$bakefile_cv_c_compiler___MWERKS__" = "xyes"; then
+        :; MWCC=yes
+    else
+        :;
+    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
  
  
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
-                ac_ext=c
+
+
+
+    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
-{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5
+    { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5
  echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; }
  echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; }
-if test "${bakefile_cv_c_compiler_xlc+set}" = set; then
+if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -14217,9 +17345,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  int
  main ()
  {
  int
  main ()
  {
-#ifndef __xlC__
-       choke me
-#endif
+
+             #ifndef __xlC__
+                choke me
+             #endif
  
    ;
    return 0;
  
    ;
    return 0;
@@ -14242,29 +17371,34 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  bakefile_compiler_xlc=yes
+  bakefile_cv_c_compiler___xlC__=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
  
-       bakefile_compiler_xlc=no
+       bakefile_cv_c_compiler___xlC__=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
-    bakefile_cv_c_compiler_xlc=$bakefile_compiler_xlc
  
  
-fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_xlc" >&5
-echo "${ECHO_T}$bakefile_cv_c_compiler_xlc" >&6; }
  
  
-XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes`
-ac_ext=c
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6; }
+    if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then
+        :; XLCC=yes
+    else
+        :;
+    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
  
  
  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
  
  
+
                  ;;
  
              IRIX*)
                  ;;
  
              IRIX*)
@@ -14332,17 +17466,97 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5
  echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5
  echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6; }
+    if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
+        :; SGICC=yes
+    else
+        :;
+    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
  
      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 "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
-        :; SGICC=yes
+
+
+                ;;
+
+            Linux*)
+
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+    { echo "$as_me:$LINENO: checking whether we are using the Sun C compiler" >&5
+echo $ECHO_N "checking whether we are using the Sun C compiler... $ECHO_C" >&6; }
+if test "${bakefile_cv_c_compiler___SUNPRO_C+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.  */
+
+int
+main ()
+{
+
+             #ifndef __SUNPRO_C
+                choke me
+             #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
+  bakefile_cv_c_compiler___SUNPRO_C=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       bakefile_cv_c_compiler___SUNPRO_C=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; }
+    if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
+        :; SUNCC=yes
      else
          :;
      fi
      else
          :;
      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
+
  
  
                  ;;
  
  
                  ;;
@@ -14412,17 +17626,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5
  echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5
  echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6; }
+    if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then
+        :; HPCC=yes
+    else
+        :;
+    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
  
      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 "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then
-        :; HPCC=yes
-    else
-        :;
-    fi
  
  
                  ;;
  
  
                  ;;
@@ -14492,17 +17706,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5
  echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5
  echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6; }
+    if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then
+        :; COMPAQCC=yes
+    else
+        :;
+    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
  
      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 "x$bakefile_cv_c_compiler___DECC" = "xyes"; then
-        :; COMPAQCC=yes
-    else
-        :;
-    fi
  
  
                  ;;
  
  
                  ;;
@@ -14572,17 +17786,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
  echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
  echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; }
+    if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
+        :; SUNCC=yes
+    else
+        :;
+    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
  
      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 "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
-        :; SUNCC=yes
-    else
-        :;
-    fi
  
  
                  ;;
  
  
                  ;;
@@ -15405,6 +18619,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+
      ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
      ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -15467,17 +18682,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
  echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
  echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then
+        :; INTELCXX=yes
+    else
+        :;
+    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
  
      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 "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
-        :; INTELCXX=yes
-    else
-        :;
-    fi
+
  
  
          if test "x$GCXX" != "xyes"; then
  
  
          if test "x$GCXX" != "xyes"; then
@@ -15701,87 +18917,17 @@ fi
  
                          case `uname -s` in
              AIX*)
  
                          case `uname -s` in
              AIX*)
-                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
  
  
-{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; }
-if test "${bakefile_cv_cxx_compiler_xlc+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.  */
  
  
-int
-main ()
-{
-#ifndef __xlC__
-       choke me
-#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
-  bakefile_compiler_xlc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       bakefile_compiler_xlc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    bakefile_cv_cxx_compiler_xlc=$bakefile_compiler_xlc
-
-fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_xlc" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler_xlc" >&6; }
-
-XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes`
-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
-
-
-                ;;
-
-            Darwin)
-                ac_ext=cpp
+    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
  
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
-{ echo "$as_me:$LINENO: checking whether we are using the Metrowerks C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the Metrowerks C++ compiler... $ECHO_C" >&6; }
-if test "${bakefile_cv_cxx_compiler_mwerks+set}" = set; then
+    { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; }
+if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -15794,9 +18940,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  int
  main ()
  {
  int
  main ()
  {
-#ifndef __MWERKS__
-       choke me
-#endif
+
+             #ifndef __xlC__
+                choke me
+             #endif
  
    ;
    return 0;
  
    ;
    return 0;
@@ -15819,38 +18966,125 @@ 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
-  bakefile_compiler_mwerks=yes
+  bakefile_cv_cxx_compiler___xlC__=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
  
-       bakefile_compiler_mwerks=no
+       bakefile_cv_cxx_compiler___xlC__=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
-    bakefile_cv_cxx_compiler_mwerks=$bakefile_compiler_mwerks
+
  
  fi
  
  fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_mwerks" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler_mwerks" >&6; }
+{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then
+        :; XLCXX=yes
+    else
+        :;
+    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
  
  
-MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes`
-ac_ext=c
+
+
+                ;;
+
+            Darwin)
+
+
+    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
+
+    { echo "$as_me:$LINENO: checking whether we are using the Metrowerks C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the Metrowerks C++ compiler... $ECHO_C" >&6; }
+if test "${bakefile_cv_cxx_compiler___MWERKS__+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.  */
+
+int
+main ()
+{
+
+             #ifndef __MWERKS__
+                choke me
+             #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
+  bakefile_cv_cxx_compiler___MWERKS__=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       bakefile_cv_cxx_compiler___MWERKS__=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___MWERKS__" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___MWERKS__" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___MWERKS__" = "xyes"; then
+        :; MWCXX=yes
+    else
+        :;
+    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
  
  
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
-                ac_ext=cpp
+
+
+
+    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
  
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
-{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5
+    { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5
  echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; }
  echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; }
-if test "${bakefile_cv_cxx_compiler_xlc+set}" = set; then
+if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -15863,9 +19097,10 @@ cat >>conftest.$ac_ext <<_ACEOF
  int
  main ()
  {
  int
  main ()
  {
-#ifndef __xlC__
-       choke me
-#endif
+
+             #ifndef __xlC__
+                choke me
+             #endif
  
    ;
    return 0;
  
    ;
    return 0;
@@ -15888,29 +19123,34 @@ 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
-  bakefile_compiler_xlc=yes
+  bakefile_cv_cxx_compiler___xlC__=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
  
-       bakefile_compiler_xlc=no
+       bakefile_cv_cxx_compiler___xlC__=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
-    bakefile_cv_cxx_compiler_xlc=$bakefile_compiler_xlc
  
  
-fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_xlc" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler_xlc" >&6; }
  
  
-XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes`
-ac_ext=c
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then
+        :; XLCXX=yes
+    else
+        :;
+    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
  
  
  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
  
  
+
                  ;;
  
              IRIX*)
                  ;;
  
              IRIX*)
@@ -15978,17 +19218,97 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5
  echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5
  echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6; }
+    if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then
+        :; SGICXX=yes
+    else
+        :;
+    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
  
      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 "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
-        :; SGICXX=yes
+
+
+                ;;
+
+            Linux*)
+
+
+    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
+
+    { echo "$as_me:$LINENO: checking whether we are using the Sun C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6; }
+if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+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.  */
+
+int
+main ()
+{
+
+             #ifndef __SUNPRO_CC
+                choke me
+             #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
+  bakefile_cv_cxx_compiler___SUNPRO_CC=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       bakefile_cv_cxx_compiler___SUNPRO_CC=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then
+        :; SUNCXX=yes
      else
          :;
      fi
      else
          :;
      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
+
  
  
                  ;;
  
  
                  ;;
@@ -16058,17 +19378,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5
  echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5
  echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then
+        :; HPCXX=yes
+    else
+        :;
+    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
  
      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 "x$bakefile_cv_c_compiler___HP_aCC" = "xyes"; then
-        :; HPCXX=yes
-    else
-        :;
-    fi
  
  
                  ;;
  
  
                  ;;
@@ -16138,17 +19458,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5
  echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5
  echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then
+        :; COMPAQCXX=yes
+    else
+        :;
+    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
  
      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 "x$bakefile_cv_c_compiler___DECCXX" = "xyes"; then
-        :; COMPAQCXX=yes
-    else
-        :;
-    fi
  
  
                  ;;
  
  
                  ;;
@@ -16218,17 +19538,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
  echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
  echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then
+        :; SUNCXX=yes
+    else
+        :;
+    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
  
      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 "x$bakefile_cv_c_compiler___SUNPRO_CC" = "xyes"; then
-        :; SUNCXX=yes
-    else
-        :;
-    fi
  
  
                  ;;
  
  
                  ;;
@@ -16237,6 +19557,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+if test "$CXX" = "g++" -a "$GXX" != "yes"; then
+    { { echo "$as_me:$LINENO: error: C++ compiler is needed to build wxWidgets" >&5
+echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -17932,9 +21258,13 @@ done
  
  
  if test "$ac_cv_header_wchar_h" != "yes"; then
  
  
  if test "$ac_cv_header_wchar_h" != "yes"; then
-    { echo "$as_me:$LINENO: checking for wcstr.h" >&5
-echo $ECHO_N "checking for wcstr.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_wcstr_h+set}" = set; then
+
+for ac_header in wcstr.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -17945,7 +21275,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
  
  /* end confdefs.h.  */
  $ac_includes_default
  
-#include <wcstr.h>
+#include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
@@ -17964,19 +21294,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_header_wcstr_h=yes
+  eval "$as_ac_Header=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
  
-       ac_cv_header_wcstr_h=no
+       eval "$as_ac_Header=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_wcstr_h" >&5
-echo "${ECHO_T}$ac_cv_header_wcstr_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
  
  
+done
  
  fi
  
  
  fi
  
@@ -17992,9 +21330,13 @@ case "${host}" in
  esac
  
  if test "$USE_UNIX" = 1 ; then
  esac
  
  if test "$USE_UNIX" = 1 ; then
-    { echo "$as_me:$LINENO: checking for sys/select.h" >&5
-echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_select_h+set}" = set; then
+
+for ac_header in sys/select.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -18005,7 +21347,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
  
  /* end confdefs.h.  */
  $ac_includes_default
  
-#include <sys/select.h>
+#include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
@@ -18024,19 +21366,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_header_sys_select_h=yes
+  eval "$as_ac_Header=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
  
-       ac_cv_header_sys_select_h=no
+       eval "$as_ac_Header=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_select_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
  
  
+done
  
  fi
  
  
  fi
  
@@ -22005,6 +25355,12 @@ if test "${wx_cv_func_va_copy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
+        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
+
          cat >conftest.$ac_ext <<_ACEOF
  
              #include <stdarg.h>
          cat >conftest.$ac_ext <<_ACEOF
  
              #include <stdarg.h>
@@ -22036,7 +25392,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_exeext &&
         $as_test_x conftest$ac_exeext; then
          test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -22051,6 +25407,12 @@ fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
+        ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
  
  
  fi
  
  
  fi
@@ -22469,11 +25831,13 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
  int
  main ()
  {
  int
  main ()
  {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
    ;
    return 0;
  }
    ;
    return 0;
  }
@@ -22513,11 +25877,13 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #define _LARGEFILE_SOURCE 1
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
  int
  main ()
  {
  int
  main ()
  {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
    ;
    return 0;
  }
    ;
    return 0;
  }
@@ -22758,9 +26124,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
  
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
  
-    { echo "$as_me:$LINENO: checking for iostream" >&5
-echo $ECHO_N "checking for iostream... $ECHO_C" >&6; }
-if test "${ac_cv_header_iostream+set}" = set; then
+
+for ac_header in iostream
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -22771,7 +26141,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  
  /* end confdefs.h.  */
  
  
-#include <iostream>
+#include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
@@ -22790,19 +26160,27 @@ 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
-  ac_cv_header_iostream=yes
+  eval "$as_ac_Header=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
  
-       ac_cv_header_iostream=no
+       eval "$as_ac_Header=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_iostream" >&5
-echo "${ECHO_T}$ac_cv_header_iostream" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
  
  
+fi
+
+done
  
  
      if test "$ac_cv_header_iostream" = "yes" ; then
  
  
      if test "$ac_cv_header_iostream" = "yes" ; then
@@ -26673,9 +30051,13 @@ TOOLKIT_INCLUDE=
  WIDGET_SET=
  
  if test "$USE_WIN32" = 1 ; then
  WIDGET_SET=
  
  if test "$USE_WIN32" = 1 ; then
-    { echo "$as_me:$LINENO: checking for w32api.h" >&5
-echo $ECHO_N "checking for w32api.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_w32api_h+set}" = set; then
+
+for ac_header in w32api.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -26686,7 +30068,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  
  /* end confdefs.h.  */
  
  
-#include <w32api.h>
+#include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
@@ -26705,19 +30087,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_header_w32api_h=yes
+  eval "$as_ac_Header=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
  
-       ac_cv_header_w32api_h=no
+       eval "$as_ac_Header=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_w32api_h" >&5
-echo "${ECHO_T}$ac_cv_header_w32api_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
  
  
+done
  
      { echo "$as_me:$LINENO: checking for windows.h" >&5
  echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; }
  
      { echo "$as_me:$LINENO: checking for windows.h" >&5
  echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; }
@@ -26922,7 +30312,7 @@ echo "${ECHO_T}" >&6; }
                                                                                  case "${host}" in
                          *-*-solaris2* )
                              if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
                                                                                  case "${host}" in
                          *-*-solaris2* )
                              if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
-                            enable_gtktest=no
+                                enable_gtktest=no
                              fi
                      esac
  
                              fi
                      esac
  
@@ -27241,11 +30631,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  
                                          case "${host}" in
                          *-*-solaris2* )
  
                                          case "${host}" in
                          *-*-solaris2* )
-                            if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
-                                GTK_CFLAGS=`echo $GTK_CFLAGS | sed 's/-mt//'`
-                                GTK_LIBS=`echo $GTK_LIBS | sed 's/-mt//'`
-                            fi
-                                                        if test "$wxUSE_SHARED" != "yes"; then
+                            if test "$wxUSE_SHARED" != "yes"; then
                                  GTK_LIBS="$GTK_LIBS -lX11"
                              fi
                      esac
                                  GTK_LIBS="$GTK_LIBS -lX11"
                              fi
                      esac
@@ -31491,11 +34877,29 @@ else
  fi
  
  
  fi
  
  
+
+if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then
+    if test "$TOOLKIT" = "DFB" ; then
+        wxUSE_UNICODE_UTF8=yes
+    elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "1" ; then
+        wxUSE_UNICODE_UTF8=yes
+    elif test "$USE_OS2" = "1" ; then
+                                wxUSE_UNICODE_UTF8=yes
+    else
+        wxUSE_UNICODE_UTF8=no
+    fi
+fi
+
+
  if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
  if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
-                { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
-echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+
+for ac_header in X11/Xlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -31506,7 +34910,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  
  /* end confdefs.h.  */
  
  
-#include <X11/Xlib.h>
+#include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
@@ -31525,23 +34929,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_header_X11_Xlib_h=yes
+  eval "$as_ac_Header=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
  
-       ac_cv_header_X11_Xlib_h=no
+       eval "$as_ac_Header=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
  
  
  
  
-        { echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
-echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
+for ac_header in X11/XKBlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -31556,7 +34972,7 @@ cat >>conftest.$ac_ext <<_ACEOF
                            #endif
  
  
                            #endif
  
  
-#include <X11/XKBlib.h>
+#include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
@@ -31575,19 +34991,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_header_X11_XKBlib_h=yes
+  eval "$as_ac_Header=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
  
-       ac_cv_header_X11_XKBlib_h=no
+       eval "$as_ac_Header=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
  
  
+done
  
      fi
  fi
  
      fi
  fi
@@ -31941,9 +35365,13 @@ echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; }
              if test "$ac_find_libraries" != "" ; then
                  { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
              if test "$ac_find_libraries" != "" ; then
                  { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
-                { echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5
-echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then
+
+for ac_header in X11/extensions/xf86vmode.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -31958,7 +35386,7 @@ cat >>conftest.$ac_ext <<_ACEOF
                                        #endif
  
  
                                        #endif
  
  
-#include <X11/extensions/xf86vmode.h>
+#include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
@@ -31977,24 +35405,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_header_X11_extensions_xf86vmode_h=yes
+  eval "$as_ac_Header=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
  
-       ac_cv_header_X11_extensions_xf86vmode_h=no
+       eval "$as_ac_Header=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6; }
-if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
  
                                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
  
  fi
  
  
                                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
  
  fi
  
+done
  
              else
                  { echo "$as_me:$LINENO: result: no" >&5
  
              else
                  { echo "$as_me:$LINENO: result: no" >&5
@@ -32587,6 +36020,111 @@ echo "${ECHO_T}$wx_cv_version_script" >&6; }
      esac
  
  
      esac
  
  
+            if test "$wxUSE_VISIBILITY" != "no"; then
+
+
+  if test -n "$GCC"; then
+    CFLAGS_VISIBILITY="-fvisibility=hidden"
+    CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden"
+    { echo "$as_me:$LINENO: checking for symbols visibility support" >&5
+echo $ECHO_N "checking for symbols visibility support... $ECHO_C" >&6; }
+    if test "${wx_cv_cc_visibility+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+      wx_save_CXXFLAGS="$CXXFLAGS"
+      CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+      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
+
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+         /* we need gcc >= 4.0, older versions with visibility support
+            didn't have class visibility: */
+         #if defined(__GNUC__) && __GNUC__ < 4
+         error this gcc is too old;
+         #endif
+
+         extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+         extern __attribute__((__visibility__("default"))) int exportedvar;
+         extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+         extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+         class __attribute__((__visibility__("default"))) Foo {
+           Foo() {}
+         };
+
+int
+main ()
+{
+
+  ;
+  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_cc_visibility=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_cc_visibility=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+      CXXFLAGS="$wx_save_CXXFLAGS"
+fi
+
+    { echo "$as_me:$LINENO: result: $wx_cv_cc_visibility" >&5
+echo "${ECHO_T}$wx_cv_cc_visibility" >&6; }
+    if test $wx_cv_cc_visibility = yes; then
+      cat >>confdefs.h <<\_ACEOF
+#define HAVE_VISIBILITY 1
+_ACEOF
+
+    else
+      CFLAGS_VISIBILITY=""
+      CXXFLAGS_VISIBILITY=""
+    fi
+
+
+  fi
+
+    fi
+
+        if test "x$SUNCXX" = xyes; then
+        SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib"
+        WXCONFIG_RPATH="-R\$libdir"
+    else
      case "${host}" in
        *-*-linux* | *-*-gnu* )
          SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
      case "${host}" in
        *-*-linux* | *-*-gnu* )
          SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
@@ -32594,14 +36132,14 @@ echo "${ECHO_T}$wx_cv_version_script" >&6; }
          ;;
  
        *-*-solaris2* )
          ;;
  
        *-*-solaris2* )
-        if test "$GCC" = yes ; then
-                                    CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS"
  
  
-                                    saveLdflags="$LDFLAGS"
-            LDFLAGS="$saveLdflags -Wl,-rpath,/"
-            { echo "$as_me:$LINENO: checking if the linker accepts -rpath" >&5
+                        CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS"
+
+                        saveLdflags="$LDFLAGS"
+        LDFLAGS="$saveLdflags -Wl,-rpath,/"
+        { echo "$as_me:$LINENO: checking if the linker accepts -rpath" >&5
  echo $ECHO_N "checking if the linker accepts -rpath... $ECHO_C" >&6; }
  echo $ECHO_N "checking if the linker accepts -rpath... $ECHO_C" >&6; }
-            cat >conftest.$ac_ext <<_ACEOF
+        cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -32635,22 +36173,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
-                    { echo "$as_me:$LINENO: result: yes" >&5
+                { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
  echo "${ECHO_T}yes" >&6; }
-                    SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
-                    WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
+                SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
+                WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
  
  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; }
-                    { echo "$as_me:$LINENO: checking if the linker accepts -R" >&5
+                { echo "$as_me:$LINENO: checking if the linker accepts -R" >&5
  echo $ECHO_N "checking if the linker accepts -R... $ECHO_C" >&6; }
  echo $ECHO_N "checking if the linker accepts -R... $ECHO_C" >&6; }
-                    LDFLAGS="$saveLdflags -Wl,-R,/"
-                    cat >conftest.$ac_ext <<_ACEOF
+                LDFLAGS="$saveLdflags -Wl,-R,/"
+                cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -32684,17 +36222,17 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
-                            { echo "$as_me:$LINENO: result: yes" >&5
+                        { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
  echo "${ECHO_T}yes" >&6; }
-                            SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib"
-                            WXCONFIG_RPATH="-Wl,-R,\$libdir"
+                        SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib"
+                        WXCONFIG_RPATH="-Wl,-R,\$libdir"
  
  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; }
  
  fi
  echo "${ECHO_T}no" >&6; }
  
  fi
@@ -32706,11 +36244,7 @@ fi
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
-            LDFLAGS="$saveLdflags"
-        else
-            SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib"
-            WXCONFIG_RPATH="-R\$libdir"
-        fi
+        LDFLAGS="$saveLdflags"
        ;;
  
        *-*-darwin* )
        ;;
  
        *-*-darwin* )
@@ -32740,6 +36274,7 @@ EOF
          ;;
  
      esac
          ;;
  
      esac
+    fi
  
      if test $wxUSE_RPATH = "no"; then
          SAMPLES_RPATH_FLAG=''
  
      if test $wxUSE_RPATH = "no"; then
          SAMPLES_RPATH_FLAG=''
@@ -33567,6 +37102,79 @@ _ACEOF
      fi
  fi
  
      fi
  fi
  
+{ echo "$as_me:$LINENO: checking if wchar_t is separate type" >&5
+echo $ECHO_N "checking if wchar_t is separate type... $ECHO_C" >&6; }
+if test "${wx_cv_wchar_t_is_separate_type+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 <wchar.h>
+int
+main ()
+{
+
+            return 0; }
+
+            struct Foo { void foo(wchar_t);
+                         void foo(unsigned short);
+                         void foo(unsigned int);
+                         void foo(unsigned long); };
+
+            int bar() {
+
+  ;
+  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_wchar_t_is_separate_type=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_wchar_t_is_separate_type=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_wchar_t_is_separate_type" >&5
+echo "${ECHO_T}$wx_cv_wchar_t_is_separate_type" >&6; }
+
+if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxWCHAR_T_IS_REAL_TYPE 1
+_ACEOF
+
+else
+    cat >>confdefs.h <<\_ACEOF
+#define wxWCHAR_T_IS_REAL_TYPE 0
+_ACEOF
+
+fi
+
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -33893,72 +37501,167 @@ _ACEOF
  
      fi
  
  
      fi
  
-                    if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
-        CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
-    fi
-
-                { echo "$as_me:$LINENO: checking for mbstate_t" >&5
-echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_mbstate_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 <wchar.h>
-
-typedef mbstate_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_mbstate_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_mbstate_t=no
-fi
  
  
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
-echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; }
-if test $ac_cv_type_mbstate_t = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_MBSTATE_T 1
-_ACEOF
-
-
-for ac_func in wcsrtombs
+for ac_func in wcsdup
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+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.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+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
+  (eval "$ac_link") 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_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+                    if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
+        CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
+    fi
+
+                { echo "$as_me:$LINENO: checking for mbstate_t" >&5
+echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_mbstate_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 <wchar.h>
+
+typedef mbstate_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_mbstate_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_type_mbstate_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
+echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; }
+if test $ac_cv_type_mbstate_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_MBSTATE_T 1
+_ACEOF
+
+
+for ac_func in wcsrtombs
  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
@@ -34710,9 +38413,13 @@ _ACEOF
  #include <wchar.h>"
      case "${host}" in
          *-*-solaris2* )
  #include <wchar.h>"
      case "${host}" in
          *-*-solaris2* )
-            { echo "$as_me:$LINENO: checking for widec.h" >&5
-echo $ECHO_N "checking for widec.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_widec_h+set}" = set; then
+
+for ac_header in widec.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -34723,7 +38430,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
  
  /* end confdefs.h.  */
  $ac_includes_default
  
-#include <widec.h>
+#include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
@@ -34742,19 +38449,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_header_widec_h=yes
+  eval "$as_ac_Header=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
  
-       ac_cv_header_widec_h=no
+       eval "$as_ac_Header=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_widec_h" >&5
-echo "${ECHO_T}$ac_cv_header_widec_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
  
  
+done
  
              if test "$ac_cv_header_widec_h" = "yes"; then
                  wchar_headers="$wchar_headers
  
              if test "$ac_cv_header_widec_h" = "yes"; then
                  wchar_headers="$wchar_headers
@@ -35063,6 +38778,12 @@ _ACEOF
  
  fi
  
  
  fi
  
+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
+
  
    for wx_func in round
    do
  
    for wx_func in round
    do
@@ -35111,7 +38832,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_exeext &&
         $as_test_x conftest$ac_exeext; then
          test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -35144,6 +38865,12 @@ _ACEOF
      fi
    done
  
      fi
    done
  
+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 "$TOOLKIT" != "MSW"; then
  
  
  if test "$TOOLKIT" != "MSW"; then
  
@@ -36365,7 +40092,7 @@ done
  
  
  
  
  
  
-for ac_func in putenv setenv
+for ac_func in setenv putenv
  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
@@ -37651,12 +41378,14 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
  
  
                                  THREAD_OPTS="-pthread"
  
  
                                  THREAD_OPTS="-pthread"
+        if test "x$SUNCXX" = xyes; then
+            THREAD_OPTS="-mt lthread $THREAD_OPTS"
+        fi
+
          case "${host}" in
            *-*-solaris2* | *-*-sunos4* )
                  if test "x$GCC" = "xyes"; then
                                          THREAD_OPTS="-pthreads $THREAD_OPTS"
          case "${host}" in
            *-*-solaris2* | *-*-sunos4* )
                  if test "x$GCC" = "xyes"; then
                                          THREAD_OPTS="-pthreads $THREAD_OPTS"
-                else
-                    THREAD_OPTS="-mt $THREAD_OPTS"
                  fi
                  ;;
            *-*-freebsd*)
                  fi
                  ;;
            *-*-freebsd*)
@@ -37916,6 +41645,12 @@ if test "${wx_cv_func_pthread_cleanup+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
+                                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
+
          cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
          cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -37951,7 +41686,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
  
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
  
@@ -37968,6 +41703,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
  
  fi
  { echo "$as_me:$LINENO: result: $wx_cv_func_pthread_cleanup" >&5
  
  fi
  { echo "$as_me:$LINENO: result: $wx_cv_func_pthread_cleanup" >&5
@@ -37979,9 +41720,13 @@ _ACEOF
  
        fi
  
  
        fi
  
-      { echo "$as_me:$LINENO: checking for sched.h" >&5
-echo $ECHO_N "checking for sched.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sched_h+set}" = set; then
+
+for ac_header in sched.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -37992,7 +41737,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
  
  /* end confdefs.h.  */
  $ac_includes_default
  
-#include <sched.h>
+#include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
@@ -38011,19 +41756,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_header_sched_h=yes
+  eval "$as_ac_Header=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
  
-       ac_cv_header_sched_h=no
+       eval "$as_ac_Header=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sched_h" >&5
-echo "${ECHO_T}$ac_cv_header_sched_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
  
  
+done
  
        if test "$ac_cv_header_sched_h" = "yes"; then
            { echo "$as_me:$LINENO: checking for sched_yield" >&5
  
        if test "$ac_cv_header_sched_h" = "yes"; then
            { echo "$as_me:$LINENO: checking for sched_yield" >&5
@@ -39353,6 +43106,7 @@ echo $ECHO_N "checking how many arguments gethostbyname_r() takes... $ECHO_C" >&
  else
  
  
  else
  
  
+################################################################
  
  ac_cv_func_which_gethostbyname_r=unknown
  
  
  ac_cv_func_which_gethostbyname_r=unknown
  
@@ -39582,6 +43336,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
  
  
  fi
  
+################################################################
  
  
  fi
  
  
  fi
@@ -39730,115 +43485,82 @@ _ACEOF
  fi
  
        fi
  fi
  
        fi
-                              { echo "$as_me:$LINENO: checking for getservbyname_r" >&5
-echo $ECHO_N "checking for getservbyname_r... $ECHO_C" >&6; }
+
+{ echo "$as_me:$LINENO: checking how many arguments getservbyname_r() takes" >&5
+echo $ECHO_N "checking how many arguments getservbyname_r() takes... $ECHO_C" >&6; }
  if test "${ac_cv_func_which_getservbyname_r+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  if test "${ac_cv_func_which_getservbyname_r+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-{ echo "$as_me:$LINENO: checking for getservbyname_r" >&5
-echo $ECHO_N "checking for getservbyname_r... $ECHO_C" >&6; }
-if test "${ac_cv_func_getservbyname_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+                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
+
+
+        cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
-/* Define getservbyname_r to an innocuous variant, in case <limits.h> declares getservbyname_r.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define getservbyname_r innocuous_getservbyname_r
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char getservbyname_r (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef getservbyname_r
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getservbyname_r ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_getservbyname_r || defined __stub___getservbyname_r
-choke me
-#endif
-
+#include <netdb.h>
  int
  main ()
  {
  int
  main ()
  {
-return getservbyname_r ();
+
+                char *name;
+                char *proto;
+                struct servent *se, *res;
+                char buffer[2048];
+                int buflen = 2048;
+                (void) getservbyname_r(name, proto, se, buffer, buflen, &res)
+
    ;
    return 0;
  }
  _ACEOF
    ;
    return 0;
  }
  _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+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
  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_link") 2>conftest.er1
+  (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); } && {
    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 -z "$ac_cxx_werror_flag" ||
          test ! -s conftest.err
          test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_getservbyname_r=yes
+       } && test -s conftest.$ac_objext; then
+  ac_cv_func_which_getservbyname_r=six
  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
  
-       ac_cv_func_getservbyname_r=no
-fi
  
  
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_getservbyname_r" >&5
-echo "${ECHO_T}$ac_cv_func_getservbyname_r" >&6; }
-if test $ac_cv_func_getservbyname_r = yes; then
-
-        cat >conftest.$ac_ext <<_ACEOF
+                cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
-
-#               include <netdb.h>
-
+#include <netdb.h>
  int
  main ()
  {
  
  int
  main ()
  {
  
-
-        char *name;
-        char *proto;
-        struct servent *se;
-        struct servent_data data;
-        (void) getservbyname_r(name, proto, se, &data);
-
+                        char *name;
+                        char *proto;
+                        struct servent *se;
+                        char buffer[2048];
+                        int buflen = 2048;
+                        (void) getservbyname_r(name, proto, se, buffer, buflen)
  
    ;
    return 0;
  
    ;
    return 0;
@@ -39858,34 +43580,31 @@ 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
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_func_which_getservbyname_r=four
+  ac_cv_func_which_getservbyname_r=five
  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
  
  
-  cat >conftest.$ac_ext <<_ACEOF
+                        cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
-
-#   include <netdb.h>
-
+#include <netdb.h>
  int
  main ()
  {
  
  int
  main ()
  {
  
-        char *name;
-        char *proto;
-        struct servent *se, *res;
-        char buffer[2048];
-        int buflen = 2048;
-        (void) getservbyname_r(name, proto, se, buffer, buflen, &res)
+                                char *name;
+                                char *proto;
+                                struct servent *se;
+                                struct servent_data data;
+                                (void) getservbyname_r(name, proto, se, &data);
  
    ;
    return 0;
  
    ;
    return 0;
@@ -39905,69 +43624,21 @@ 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 ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_func_which_getservbyname_r=six
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#   include <netdb.h>
-
-int
-main ()
-{
-
-        char *name;
-        char *proto;
-        struct servent *se;
-        char buffer[2048];
-        int buflen = 2048;
-        (void) getservbyname_r(name, proto, se, buffer, buflen)
-
-  ;
-  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 -z "$ac_cxx_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_func_which_getservbyname_r=five
+  ac_cv_func_which_getservbyname_r=four
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
         ac_cv_func_which_getservbyname_r=no
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
         ac_cv_func_which_getservbyname_r=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
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -39976,10 +43647,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
  
  
-else
-  ac_cv_func_which_getservbyname_r=no
-fi
  
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_which_getservbyname_r" >&5
  
  fi
  { echo "$as_me:$LINENO: result: $ac_cv_func_which_getservbyname_r" >&5
@@ -40000,7 +43674,6 @@ elif test $ac_cv_func_which_getservbyname_r = four; then
  #define HAVE_FUNC_GETSERVBYNAME_R_4 1
  _ACEOF
  
  #define HAVE_FUNC_GETSERVBYNAME_R_4 1
  _ACEOF
  
-
  fi
  
  
  fi
  
  
@@ -42040,6 +45713,13 @@ _ACEOF
  
  fi
  
  
  fi
  
+if test "$wxUSE_BASE64" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_BASE64 1
+_ACEOF
+
+fi
+
  if test "$wxUSE_STREAMS" = "yes" ; then
    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_STREAMS 1
  if test "$wxUSE_STREAMS" = "yes" ; then
    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_STREAMS 1
@@ -42054,11 +45734,191 @@ _ACEOF
  
  fi
  
  
  fi
  
+if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_OBJC_UNIQUIFYING 1
+_ACEOF
+
+fi
  
  
  
  
-if test "$wxUSE_DATETIME" = "yes"; then
+if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_CONSOLE_EVENTLOOP 1
+_ACEOF
+
+
+    if test "$wxUSE_UNIX" = "yes"; then
+        if test "$wxUSE_SELECT_DISPATCHER" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define wxUSE_SELECT_DISPATCHER 1
+_ACEOF
+
+        fi
+
+        if test "$wxUSE_EPOLL_DISPATCHER" = "yes"; then
+
+for ac_header in sys/epoll.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $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.  */
+$ac_includes_default
+#include <$ac_header>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $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 <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+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_cpp conftest.$ac_ext") 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); } >/dev/null && {
+        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to wx-dev@lists.wxwidgets.org ##
+## ----------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
  
  
-for ac_func in strptime
+            if test "$ac_cv_header_sys_epoll_h" = "yes"; then
+                cat >>confdefs.h <<\_ACEOF
+#define wxUSE_EPOLL_DISPATCHER 1
+_ACEOF
+
+            else
+                { echo "$as_me:$LINENO: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5
+echo "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;}
+            fi
+        fi
+    fi
+fi
+
+
+
+
+for ac_func in gettimeofday ftime
  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
@@ -42147,10 +46007,213 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-
+ break
  fi
  done
  
  fi
  done
  
+
+if test "$ac_cv_func_gettimeofday" = "yes"; then
+    { echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5
+echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6; }
+if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+                cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+                #include <sys/time.h>
+                #include <unistd.h>
+
+int
+main ()
+{
+
+                struct timeval tv;
+                gettimeofday(&tv, NULL);
+
+  ;
+  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_func_gettimeofday_has_2_args=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+                    #include <sys/time.h>
+                    #include <unistd.h>
+
+int
+main ()
+{
+
+                    struct timeval tv;
+                    gettimeofday(&tv);
+
+  ;
+  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_func_gettimeofday_has_2_args=no
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+                    { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5
+echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
+                    wx_cv_func_gettimeofday_has_2_args=unknown
+
+
+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_func_gettimeofday_has_2_args" >&5
+echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; }
+
+    if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define WX_GETTIMEOFDAY_NO_TZ 1
+_ACEOF
+
+    fi
+fi
+
+if test "$wxUSE_DATETIME" = "yes"; then
+        { echo "$as_me:$LINENO: checking for strptime" >&5
+echo $ECHO_N "checking for strptime... $ECHO_C" >&6; }
+if test "${ac_cv_func_strptime+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.  */
+/* Define strptime to an innocuous variant, in case <limits.h> declares strptime.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define strptime innocuous_strptime
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char strptime (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef strptime
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strptime ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_strptime || defined __stub___strptime
+choke me
+#endif
+
+int
+main ()
+{
+return strptime ();
+  ;
+  return 0;
+}
+_ACEOF
+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
+  (eval "$ac_link") 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_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_func_strptime=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_func_strptime=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5
+echo "${ECHO_T}$ac_cv_func_strptime" >&6; }
+
      if test "$ac_cv_func_strptime" = "yes"; then
          { echo "$as_me:$LINENO: checking for strptime declaration" >&5
  echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6; }
      if test "$ac_cv_func_strptime" = "yes"; then
          { echo "$as_me:$LINENO: checking for strptime declaration" >&5
  echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6; }
@@ -42228,6 +46291,78 @@ echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6; }
  #define HAVE_STRPTIME_DECL 1
  _ACEOF
  
  #define HAVE_STRPTIME_DECL 1
  _ACEOF
  
+    else
+        wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
+    fi
+    if test "$ac_cv_func_strptime" = "yes"; then
+                                        { echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5
+echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6; }
+if test "${wx_cv_func_strptime_ok+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+                  wx_cv_func_strptime_ok=no
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+
+                    #include <stdlib.h>
+                    #include <time.h>
+                    #include "confdefs.h"
+
+                    $wx_strptime_decl
+
+                    int main()
+                    {
+                        struct tm t;
+                        return !!strptime("", "%x", &t);
+                    }
+
+_ACEOF
+rm -f 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
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (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_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  wx_cv_func_strptime_ok=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+wx_cv_func_strptime_ok=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5
+echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; }
+
+        if test "$wx_cv_func_strptime_ok" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRPTIME 1
+_ACEOF
+
+        fi
      fi
  
              { echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
      fi
  
              { echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
@@ -42555,243 +46690,28 @@ 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
  
-                    wx_cv_struct_tm_has_gmtoff=yes
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_struct_tm_has_gmtoff=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5
-echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6; }
-    fi
-
-    if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define WX_GMTOFF_IN_TM 1
-_ACEOF
-
-    fi
-
-
-
-for ac_func in gettimeofday ftime
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+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.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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
-  (eval "$ac_link") 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_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- break
-fi
-done
-
-
-    if test "$ac_cv_func_gettimeofday" = "yes"; then
-        { echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5
-echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6; }
-if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                    #include <sys/time.h>
-                    #include <unistd.h>
-
-int
-main ()
-{
-
-                    struct timeval tv;
-                    gettimeofday(&tv, NULL);
-
-  ;
-  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_func_gettimeofday_has_2_args=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                        #include <sys/time.h>
-                        #include <unistd.h>
-
-int
-main ()
-{
-
-                        struct timeval tv;
-                        gettimeofday(&tv);
+                    wx_cv_struct_tm_has_gmtoff=yes
  
  
-  ;
-  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_func_gettimeofday_has_2_args=no
  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: WARNING: failed to determine number of gettimeofday() arguments" >&5
-echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
-                        wx_cv_func_gettimeofday_has_2_args=unknown
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       wx_cv_struct_tm_has_gmtoff=no
  
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
  
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5
-echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5
+echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6; }
+    fi
  
  
-        if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define WX_GETTIMEOFDAY_NO_TZ 1
+    if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define WX_GMTOFF_IN_TM 1
  _ACEOF
  
  _ACEOF
  
-        fi
      fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
      fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
@@ -43489,9 +47409,13 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; }
  
          else
                  if test "$wxUSE_MGL" != "1"; then
  
          else
                  if test "$wxUSE_MGL" != "1"; then
-                                                                                    { echo "$as_me:$LINENO: checking for linux/joystick.h" >&5
-echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_joystick_h+set}" = set; then
+
+for ac_header in linux/joystick.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -43502,7 +47426,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
  
  /* end confdefs.h.  */
  $ac_includes_default
  
-#include <linux/joystick.h>
+#include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
  _ACEOF
  rm -f conftest.$ac_objext
  if { (ac_try="$ac_compile"
@@ -43521,22 +47445,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
-  ac_cv_header_linux_joystick_h=yes
+  eval "$as_ac_Header=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
  
-       ac_cv_header_linux_joystick_h=no
+       eval "$as_ac_Header=no"
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; }
-if test $ac_cv_header_linux_joystick_h = yes; then
-  wxUSE_JOYSTICK=yes
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ wxUSE_JOYSTICK=yes
  fi
  
  fi
  
+done
  
          fi
      fi
  
          fi
      fi
@@ -43653,33 +47582,22 @@ if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then
  #define wxUSE_UNICODE_UTF8 1
  _ACEOF
  
  #define wxUSE_UNICODE_UTF8 1
  _ACEOF
  
-fi
  
  
-if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_EXPERIMENTAL_PRINTF 1
+    if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_UTF8_LOCALE_ONLY 1
  _ACEOF
  
  _ACEOF
  
+    fi
  fi
  
  fi
  
-
-if test "$wxUSE_POSTSCRIPT" = "yes" ; then
+if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
    cat >>confdefs.h <<\_ACEOF
    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_POSTSCRIPT 1
+#define wxUSE_EXPERIMENTAL_PRINTF 1
  _ACEOF
  
  fi
  
  _ACEOF
  
  fi
  
-cat >>confdefs.h <<\_ACEOF
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define wxUSE_NORMALIZED_PS_FONTS 1
-_ACEOF
-
-
  
  if test "$wxUSE_CONSTRAINTS" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  
  if test "$wxUSE_CONSTRAINTS" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
@@ -43758,6 +47676,29 @@ _ACEOF
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
  fi
  
+if test "$wxUSE_POSTSCRIPT" = "yes" ; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_POSTSCRIPT 1
+_ACEOF
+
+fi
+
+cat >>confdefs.h <<\_ACEOF
+#define wxUSE_AFM_FOR_POSTSCRIPT 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define wxUSE_NORMALIZED_PS_FONTS 1
+_ACEOF
+
+
+if test "$wxUSE_SVG" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_SVG 1
+_ACEOF
+
+fi
  
  
  if test "$wxUSE_METAFILE" = "yes"; then
  
  
  if test "$wxUSE_METAFILE" = "yes"; then
@@ -44264,6 +48205,15 @@ echo "$as_me: WARNING: wxListCtrl requires wxImageList and won't be compiled wit
      fi
  fi
  
      fi
  fi
  
+if test "$wxUSE_EDITABLELISTBOX" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_EDITABLELISTBOX 1
+_ACEOF
+
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox"
+fi
+
  if test "$wxUSE_NOTEBOOK" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_NOTEBOOK 1
  if test "$wxUSE_NOTEBOOK" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_NOTEBOOK 1
@@ -44562,13 +48512,6 @@ _ACEOF
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
  fi
  
-if test "$wxUSE_DC_CACHEING" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DC_CACHEING 1
-_ACEOF
-
-fi
-
  if test "$wxUSE_DRAGIMAGE" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_DRAGIMAGE 1
  if test "$wxUSE_DRAGIMAGE" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_DRAGIMAGE 1
@@ -44752,10 +48695,14 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
  #define wxUSE_SYSTEM_OPTIONS 1
  _ACEOF
  
  #define wxUSE_SYSTEM_OPTIONS 1
  _ACEOF
  
-    if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
-        "$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-    fi
+fi
+
+if test "$wxUSE_TASKBARICON" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_TASKBARICON 1
+_ACEOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
  fi
  
  
  fi
  
  
@@ -44968,6 +48915,25 @@ _ACEOF
  fi
  
  
  fi
  
  
+if test "$wxUSE_MSW" = 1 ; then
+
+if test "$wxUSE_DC_CACHEING" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_DC_CACHEING 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_UXTHEME" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_UXTHEME 1
+_ACEOF
+
+fi
+
+fi
+
+
  if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
        cat >>confdefs.h <<\_ACEOF
  if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
        cat >>confdefs.h <<\_ACEOF
@@ -45240,14 +49206,6 @@ fi
  
  
          if test "$wxUSE_GSTREAMER" = "yes"; then
  
  
          if test "$wxUSE_GSTREAMER" = "yes"; then
-                                    case "${host}" in
-                *-*-solaris2* )
-                    if "$GCC" = yes; then
-                        GST_CFLAGS=`echo $GST_CFLAGS | sed 's/-mt//'`
-                        GST_LIBS=`echo $GST_LIBS | sed 's/-mt//'`
-                    fi
-            esac
-
              CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
              LIBS="$GST_LIBS $LIBS"
  
              CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
              LIBS="$GST_LIBS $LIBS"
  
@@ -45296,34 +49254,54 @@ _ACEOF
  
  
  
  
  
  
-CORE_BASE_LIBS="net base"
-CORE_GUI_LIBS="adv core"
+STD_BASE_LIBS="base"
+STD_GUI_LIBS=""
+BUILT_WX_LIBS="base"
+ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base"
  
  
-if test "$wxUSE_XML" = "yes" ; then
-    CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
+if test "$wxUSE_SOCKETS" = "yes" ; then
+    STD_BASE_LIBS="net $STD_BASE_LIBS"
+    BUILT_WX_LIBS="net $BUILT_WX_LIBS"
  fi
  if test "$wxUSE_ODBC" != "no" ; then
  fi
  if test "$wxUSE_ODBC" != "no" ; then
-    CORE_BASE_LIBS="odbc $CORE_BASE_LIBS"
-    CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS"
-fi
-if test "$wxUSE_HTML" = "yes" ; then
-    CORE_GUI_LIBS="html $CORE_GUI_LIBS"
-fi
-if test "$wxUSE_DEBUGREPORT" = "yes" ; then
-    CORE_GUI_LIBS="qa $CORE_GUI_LIBS"
+    BUILT_WX_LIBS="odbc $BUILT_WX_LIBS"
  fi
  fi
-if test "$wxUSE_XRC" = "yes" ; then
-    CORE_GUI_LIBS="xrc $CORE_GUI_LIBS"
-fi
-if test "$wxUSE_AUI" = "yes" ; then
-    CORE_GUI_LIBS="aui $CORE_GUI_LIBS"
-fi
-if test "$wxUSE_STC" = "yes" ; then
-    CORE_GUI_LIBS="stc $CORE_GUI_LIBS"
+if test "$wxUSE_XML" = "yes" ; then
+    STD_BASE_LIBS="xml $STD_BASE_LIBS"
+    BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
  fi
  
  fi
  
-if test "$wxUSE_GUI" != "yes"; then
-    CORE_GUI_LIBS=""
+if test "$wxUSE_GUI" = "yes"; then
+    STD_GUI_LIBS="adv core"
+    BUILT_WX_LIBS="$STD_GUI_LIBS $BUILT_WX_LIBS"
+
+    if test "$wxUSE_DEBUGREPORT" = "yes" ; then
+        STD_GUI_LIBS="qa $STD_GUI_LIBS"
+        BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_ODBC" != "no" ; then
+        BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_HTML" = "yes" ; then
+        STD_GUI_LIBS="html $STD_GUI_LIBS"
+        BUILT_WX_LIBS="html $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_MEDIACTRL" = "yes" ; then
+        BUILT_WX_LIBS="media $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_OPENGL" = "yes" ; then
+        BUILT_WX_LIBS="gl $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_AUI" = "yes" ; then
+        BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_STC" = "yes" ; then
+        BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_XRC" = "yes" ; then
+        STD_GUI_LIBS="xrc $STD_GUI_LIBS"
+        BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"
+    fi
  fi
  
  
  fi
  
  
@@ -45331,6 +49309,8 @@ fi
  
  
  
  
  
  
+
+
  if test "$wxUSE_MAC" = 1 ; then
      if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
          if test "$USE_DARWIN" = 1; then
  if test "$wxUSE_MAC" = 1 ; then
      if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
          if test "$USE_DARWIN" = 1; then
@@ -46293,10 +50273,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
                  PLATFORM_BEOS=1
              ;;
              * )
                  PLATFORM_BEOS=1
              ;;
              * )
-                { { echo "$as_me:$LINENO: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&5
-echo "$as_me: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&2;}
-   { (exit 1); exit 1; }; }
-            ;;
+                                            ;;
          esac
      fi
  
          esac
      fi
  
@@ -46439,71 +50416,17 @@ fi
        ;;
  
        *-*-linux* )
        ;;
  
        *-*-linux* )
-        if test "x$GCC" != "xyes"; then
-            { echo "$as_me:$LINENO: checking for Intel compiler" >&5
-echo $ECHO_N "checking for Intel compiler... $ECHO_C" >&6; }
-if test "${bakefile_cv_prog_icc+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.  */
-
-int
-main ()
-{
-
-                        #ifndef __INTEL_COMPILER
-                        This is not ICC
-                        #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
-  bakefile_cv_prog_icc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       bakefile_cv_prog_icc=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_prog_icc" >&5
-echo "${ECHO_T}$bakefile_cv_prog_icc" >&6; }
-            if test "$bakefile_cv_prog_icc" = "yes"; then
-                PIC_FLAG="-KPIC"
-            fi
+        if test "$INTELCC" = "yes"; then
+            PIC_FLAG="-KPIC"
+        elif test "x$SUNCXX" = "xyes"; then
+            SHARED_LD_CC="${CC} -G -o"
+            SHARED_LD_CXX="${CXX} -G -o"
+            PIC_FLAG="-KPIC"
          fi
        ;;
  
        *-*-solaris2* )
          fi
        ;;
  
        *-*-solaris2* )
-        if test "x$GCC" != xyes ; then
+        if test "x$SUNCXX" = xyes ; then
              SHARED_LD_CC="${CC} -G -o"
              SHARED_LD_CXX="${CXX} -G -o"
              PIC_FLAG="-KPIC"
              SHARED_LD_CC="${CC} -G -o"
              SHARED_LD_CXX="${CXX} -G -o"
              PIC_FLAG="-KPIC"
@@ -47293,7 +51216,11 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
  
      case "${BAKEFILE_HOST}" in
        *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
  
      case "${BAKEFILE_HOST}" in
        *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
-        SONAME_FLAG="-Wl,-soname,"
+        if test "x$SUNCXX" = "xyes"; then
+            SONAME_FLAG="-h "
+        else
+            SONAME_FLAG="-Wl,-soname,"
+        fi
          USE_SOVERSION=1
          USE_SOVERLINUX=1
          USE_SOSYMLINKS=1
          USE_SOVERSION=1
          USE_SOVERLINUX=1
          USE_SOSYMLINKS=1
@@ -48818,6 +52745,28 @@ fi
  
  WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
  
  
  WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
  
+
+case "${host}" in
+    *-*-solaris2* )
+                        if "$GCC" = yes; then
+            CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'`
+            LIBS=`echo $LIBS | sed 's/-mt//'`
+            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'`
+        fi
+        ;;
+
+    *-*-linux* )
+                        if test "x$SUNCXX" = xyes; then
+            CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//'`
+            LIBS=`echo $LIBS | sed 's/-pthread//'`
+            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//'`
+        fi
+        ;;
+esac
+
+CFLAGS="$CFLAGS $CFLAGS_VISIBILITY"
+CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+
  SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
  
  
  SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
  
  
@@ -49040,21 +52989,10 @@ echo "${ECHO_T}no" >&6; }
  
      cppunit_major_min=`echo $cppunit_version_min | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
  
      cppunit_major_min=`echo $cppunit_version_min | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-    if test "x${cppunit_major_min}" = "x" ; then
-       cppunit_major_min=0
-    fi
-
      cppunit_minor_min=`echo $cppunit_version_min | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
      cppunit_minor_min=`echo $cppunit_version_min | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-    if test "x${cppunit_minor_min}" = "x" ; then
-       cppunit_minor_min=0
-    fi
-
      cppunit_micro_min=`echo $cppunit_version_min | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
      cppunit_micro_min=`echo $cppunit_version_min | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-    if test "x${cppunit_micro_min}" = "x" ; then
-       cppunit_micro_min=0
-    fi
  
      cppunit_version_proper=`expr \
          $cppunit_major_version \> $cppunit_major_min \| \
  
      cppunit_version_proper=`expr \
          $cppunit_major_version \> $cppunit_major_min \| \
@@ -49858,12 +53796,12 @@ PANGOFT2_CFLAGS!$PANGOFT2_CFLAGS$ac_delim
  PANGOFT2_LIBS!$PANGOFT2_LIBS$ac_delim
  PANGOXFT_CFLAGS!$PANGOXFT_CFLAGS$ac_delim
  PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim
  PANGOFT2_LIBS!$PANGOFT2_LIBS$ac_delim
  PANGOXFT_CFLAGS!$PANGOXFT_CFLAGS$ac_delim
  PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim
+CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim
+CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim
  REZ!$REZ$ac_delim
  DEREZ!$DEREZ$ac_delim
  SETFILE!$SETFILE$ac_delim
  LIBICONV!$LIBICONV$ac_delim
  REZ!$REZ$ac_delim
  DEREZ!$DEREZ$ac_delim
  SETFILE!$SETFILE$ac_delim
  LIBICONV!$LIBICONV$ac_delim
-SDL_CONFIG!$SDL_CONFIG$ac_delim
-SDL_CFLAGS!$SDL_CFLAGS$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
@@ -49905,6 +53843,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
+SDL_CONFIG!$SDL_CONFIG$ac_delim
+SDL_CFLAGS!$SDL_CFLAGS$ac_delim
  SDL_LIBS!$SDL_LIBS$ac_delim
  LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim
  LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim
  SDL_LIBS!$SDL_LIBS$ac_delim
  LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim
  LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim
@@ -49916,8 +53856,10 @@ CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
  CAIRO_LIBS!$CAIRO_LIBS$ac_delim
  GST_CFLAGS!$GST_CFLAGS$ac_delim
  GST_LIBS!$GST_LIBS$ac_delim
  CAIRO_LIBS!$CAIRO_LIBS$ac_delim
  GST_CFLAGS!$GST_CFLAGS$ac_delim
  GST_LIBS!$GST_LIBS$ac_delim
-CORE_BASE_LIBS!$CORE_BASE_LIBS$ac_delim
-CORE_GUI_LIBS!$CORE_GUI_LIBS$ac_delim
+ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim
+BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim
+STD_BASE_LIBS!$STD_BASE_LIBS$ac_delim
+STD_GUI_LIBS!$STD_GUI_LIBS$ac_delim
  wxUSE_ZLIB!$wxUSE_ZLIB$ac_delim
  wxUSE_REGEX!$wxUSE_REGEX$ac_delim
  wxUSE_EXPAT!$wxUSE_EXPAT$ac_delim
  wxUSE_ZLIB!$wxUSE_ZLIB$ac_delim
  wxUSE_REGEX!$wxUSE_REGEX$ac_delim
  wxUSE_EXPAT!$wxUSE_EXPAT$ac_delim
@@ -49998,10 +53940,6 @@ 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
  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
-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
  _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
@@ -50043,6 +53981,10 @@ _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_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_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
  COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim
  COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$ac_delim
  COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
  COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim
  COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$ac_delim
@@ -50136,10 +54078,6 @@ COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_de
  COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim
  COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
  COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
  COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim
  COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
  COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
-COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$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
@@ -50181,6 +54119,10 @@ _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_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$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!$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
@@ -50274,10 +54216,6 @@ WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
  EXE_LINKER!$EXE_LINKER$ac_delim
  GUIDIST!$GUIDIST$ac_delim
  DISTDIR!$DISTDIR$ac_delim
  EXE_LINKER!$EXE_LINKER$ac_delim
  GUIDIST!$GUIDIST$ac_delim
  DISTDIR!$DISTDIR$ac_delim
-SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
-LDFLAGS_GL!$LDFLAGS_GL$ac_delim
-OPENGL_LIBS!$OPENGL_LIBS$ac_delim
-DMALLOC_LIBS!$DMALLOC_LIBS$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
@@ -50319,6 +54257,10 @@ _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
+SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
+LDFLAGS_GL!$LDFLAGS_GL$ac_delim
+OPENGL_LIBS!$OPENGL_LIBS$ac_delim
+DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
  WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
  RESCOMP!$RESCOMP$ac_delim
  RESFLAGS!$RESFLAGS$ac_delim
  WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
  RESCOMP!$RESCOMP$ac_delim
  RESFLAGS!$RESFLAGS$ac_delim
@@ -50334,7 +54276,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` = 13; 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
@@ -50967,7 +54909,16 @@ echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITH
  
  echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
  echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
  
  echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
  echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
-echo "  Should wxWidgets be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
+echo -n "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}"
+if test "$wxUSE_UNICODE" = "yes"; then
+    if test "$wxUSE_UNICODE_UTF8" = "yes"; then
+        echo " (using UTF-8)"
+    else
+        echo " (using wchar_t)"
+    fi
+else
+    echo
+fi
  
  echo "  What level of wxWidgets compatibility should be enabled?"
  echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-no}"
  
  echo "  What level of wxWidgets compatibility should be enabled?"
  echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-no}"