Add demonstration of a few more wxRenderer methods.

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

index 2211d8942fb40f68c708a18481dfcbe90efd6386..ec55083a72bd5175cb9b76c875921b6cf3e7353a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
  #! /bin/sh
  #! /bin/sh
-# From configure.in Id: configure.in 59914 2009-03-29 17:15:43Z VZ .
+# From configure.in Id.
  # Guess values for system-dependent variables and create Makefiles.
  # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
+# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.1.
  #
  # Report bugs to <wx-dev@lists.wxwidgets.org>.
  #
  #
  # Report bugs to <wx-dev@lists.wxwidgets.org>.
  #
@@ -575,8 +575,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
  # Identity of this package.
  PACKAGE_NAME='wxWidgets'
  PACKAGE_TARNAME='wxwidgets'
  # Identity of this package.
  PACKAGE_NAME='wxWidgets'
  PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.9.0'
-PACKAGE_STRING='wxWidgets 2.9.0'
+PACKAGE_VERSION='2.9.1'
+PACKAGE_STRING='wxWidgets 2.9.1'
  PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
  
  ac_unique_file="wx-config.in"
  PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
  
  ac_unique_file="wx-config.in"
@@ -709,6 +709,10 @@ GNOMEVFS_CFLAGS
  GNOMEVFS_LIBS
  HILDON_CFLAGS
  HILDON_LIBS
  GNOMEVFS_LIBS
  HILDON_CFLAGS
  HILDON_LIBS
+HILDON2_CFLAGS
+HILDON2_LIBS
+PYTHON
+COND_PYTHON
  CAIRO_CFLAGS
  CAIRO_LIBS
  GST_CFLAGS
  CAIRO_CFLAGS
  CAIRO_LIBS
  GST_CFLAGS
@@ -745,7 +749,6 @@ EXTRALIBS_GNOMEPRINT
  EXTRALIBS_GNOMEVFS
  EXTRALIBS_HILDON
  UNICODE
  EXTRALIBS_GNOMEVFS
  EXTRALIBS_HILDON
  UNICODE
-BUILD
  DEBUG_INFO
  DEBUG_FLAG
  TOOLKIT_LOWERCASE
  DEBUG_INFO
  DEBUG_FLAG
  TOOLKIT_LOWERCASE
@@ -829,6 +832,7 @@ COND_BUILD_release
  COND_BUILD_release_DEBUG_INFO_default
  COND_BUILD_release_UNICODE_0
  COND_BUILD_release_UNICODE_1
  COND_BUILD_release_DEBUG_INFO_default
  COND_BUILD_release_UNICODE_0
  COND_BUILD_release_UNICODE_1
+COND_DEBUG_FLAG_0
  COND_DEBUG_FLAG_1
  COND_DEBUG_INFO_0
  COND_DEBUG_INFO_1
  COND_DEBUG_FLAG_1
  COND_DEBUG_INFO_0
  COND_DEBUG_INFO_1
@@ -844,6 +848,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
  COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
  COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
+COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1
  COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
  COND_MONOLITHIC_0_SHARED_0_USE_STC_1
  COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
  COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
  COND_MONOLITHIC_0_SHARED_0_USE_STC_1
  COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
@@ -854,6 +859,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
  COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
  COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
+COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
  COND_MONOLITHIC_0_SHARED_1_USE_STC_1
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
  COND_MONOLITHIC_0_SHARED_1_USE_STC_1
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
@@ -864,6 +870,7 @@ COND_MONOLITHIC_0_USE_HTML_1
  COND_MONOLITHIC_0_USE_MEDIA_1
  COND_MONOLITHIC_0_USE_PROPGRID_1
  COND_MONOLITHIC_0_USE_QA_1
  COND_MONOLITHIC_0_USE_MEDIA_1
  COND_MONOLITHIC_0_USE_PROPGRID_1
  COND_MONOLITHIC_0_USE_QA_1
+COND_MONOLITHIC_0_USE_RIBBON_1
  COND_MONOLITHIC_0_USE_RICHTEXT_1
  COND_MONOLITHIC_0_USE_STC_1
  COND_MONOLITHIC_0_USE_XRC_1
  COND_MONOLITHIC_0_USE_RICHTEXT_1
  COND_MONOLITHIC_0_USE_STC_1
  COND_MONOLITHIC_0_USE_XRC_1
@@ -937,10 +944,8 @@ COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
  COND_TOOLKIT_MSW_WXUNIV_0
  COND_TOOLKIT_OSX_CARBON
  COND_TOOLKIT_OSX_CARBON_USE_GUI_1
  COND_TOOLKIT_MSW_WXUNIV_0
  COND_TOOLKIT_OSX_CARBON
  COND_TOOLKIT_OSX_CARBON_USE_GUI_1
-COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
  COND_TOOLKIT_OSX_COCOA
  COND_TOOLKIT_OSX_COCOA_USE_GUI_1
  COND_TOOLKIT_OSX_COCOA
  COND_TOOLKIT_OSX_COCOA_USE_GUI_1
-COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
  COND_TOOLKIT_OSX_IPHONE
  COND_TOOLKIT_PM
  COND_TOOLKIT_PM_USE_GUI_1
  COND_TOOLKIT_OSX_IPHONE
  COND_TOOLKIT_PM
  COND_TOOLKIT_PM_USE_GUI_1
@@ -1012,7 +1017,6 @@ WX_RELEASE
  WX_VERSION
  WX_SUBVERSION
  WX_CHARTYPE
  WX_VERSION
  WX_SUBVERSION
  WX_CHARTYPE
-WX_DEBUGTYPE
  WXCONFIG_CPPFLAGS
  WXCONFIG_CFLAGS
  WXCONFIG_CXXFLAGS
  WXCONFIG_CPPFLAGS
  WXCONFIG_CFLAGS
  WXCONFIG_CXXFLAGS
@@ -1071,6 +1075,8 @@ GNOMEVFS_CFLAGS
  GNOMEVFS_LIBS
  HILDON_CFLAGS
  HILDON_LIBS
  GNOMEVFS_LIBS
  HILDON_CFLAGS
  HILDON_LIBS
+HILDON2_CFLAGS
+HILDON2_LIBS
  CAIRO_CFLAGS
  CAIRO_LIBS
  GST_CFLAGS
  CAIRO_CFLAGS
  CAIRO_LIBS
  GST_CFLAGS
@@ -1578,7 +1584,7 @@ if test "$ac_init_help" = "long"; then
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
    # Omit some internal or obsolete options to make the list less imposing.
    # This message is too long to be a string in the A/UX 3.1 sh.
    cat <<_ACEOF
-\`configure' configures wxWidgets 2.9.0 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.9.1 to adapt to many kinds of systems.
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
  
  Usage: $0 [OPTION]... [VAR=VALUE]...
  
@@ -1647,7 +1653,7 @@ fi
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
  
  if test -n "$ac_init_help"; then
    case $ac_init_help in
-     short | recursive ) echo "Configuration of wxWidgets 2.9.0:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.9.1:";;
     esac
    cat <<\_ACEOF
  
     esac
    cat <<\_ACEOF
  
@@ -1664,8 +1670,13 @@ Optional Features:
    --enable-nanox          use NanoX
    --disable-gtk2          use GTK+ 1.2 instead of 2.0
    --enable-gpe            use GNOME PDA Environment features if possible
    --enable-nanox          use NanoX
    --disable-gtk2          use GTK+ 1.2 instead of 2.0
    --enable-gpe            use GNOME PDA Environment features if possible
+  --enable-debug          build library for debugging
+  --disable-debug_flag    disable all debugging support
+  --enable-debug_info     generate debug information
+  --enable-debug_gdb      create code with extra GDB debugging information
+  --enable-debug_cntxt    obsolete, don't use: use wxDebugContext
+  --enable-mem_tracing    obsolete, don't use: create code with memory tracing
    --disable-shared        create static library instead of shared
    --disable-shared        create static library instead of shared
-  --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
    --enable-stl            use STL for containers
    --enable-std_iostreams  use standard C++ stream classes
    --enable-std_string     use standard C++ string classes
@@ -1675,12 +1686,7 @@ Optional Features:
    --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-utf8only       only support UTF-8 locales in UTF-8 build (Unix only)
    --enable-extended_rtti  use extended RTTI (XTI)
    --enable-omf            use OMF object format
-  --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)
-  --enable-debug_info     create code with debugging information
    --disable-optimise      compile without optimisations
    --disable-optimise      compile without optimisations
-  --enable-debug_gdb      create code with extra GDB debugging information
-  --enable-debug_cntxt    use wxDebugContext
-  --enable-mem_tracing    create code with memory tracing
    --enable-profile        create code with profiling information
    --enable-no_rtti        create code without RTTI information
    --enable-no_exceptions  create code without C++ exceptions handling
    --enable-profile        create code with profiling information
    --enable-no_rtti        create code without RTTI information
    --enable-no_exceptions  create code without C++ exceptions handling
@@ -1693,6 +1699,7 @@ Optional Features:
    --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
    --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
+  --disable-tls           disable use of compiler TLS support
    --enable-intl           use internationalization system
    --enable-xlocale        use x-locale support (requires wxLocale)
    --enable-config         use wxConfig (and derived) classes
    --enable-intl           use internationalization system
    --enable-xlocale        use x-locale support (requires wxLocale)
    --enable-config         use wxConfig (and derived) classes
@@ -1708,6 +1715,7 @@ Optional Features:
    --enable-baseevtloop    use event loop in console programs too
    --enable-epollloop      use wxEpollDispatcher class (Linux only)
    --enable-selectloop     use wxSelectDispatcher class
    --enable-baseevtloop    use event loop in console programs too
    --enable-epollloop      use wxEpollDispatcher class (Linux only)
    --enable-selectloop     use wxSelectDispatcher class
+  --enable-any            use wxAny class
    --enable-apple_ieee     use the Apple IEEE codec
    --enable-arcstream      use wxArchive streams
    --enable-base64         use base64 encoding/decoding functions
    --enable-apple_ieee     use the Apple IEEE codec
    --enable-arcstream      use wxArchive streams
    --enable-base64         use base64 encoding/decoding functions
@@ -1761,6 +1769,7 @@ Optional Features:
    --enable-xrc            use XRC resources sub-library
    --enable-aui            use AUI docking library
    --enable-propgrid       use wxPropertyGrid library
    --enable-xrc            use XRC resources sub-library
    --enable-aui            use AUI docking library
    --enable-propgrid       use wxPropertyGrid library
+  --enable-ribbon         use wxRibbon library
    --enable-stc            use wxStyledTextCtrl library
    --enable-constraints    use layout-constraints system
    --enable-loggui         use standard GUI logger
    --enable-stc            use wxStyledTextCtrl library
    --enable-constraints    use layout-constraints system
    --enable-loggui         use standard GUI logger
@@ -1809,6 +1818,7 @@ Optional Features:
    --enable-headerctrl     use wxHeaderCtrl class
    --enable-hyperlink      use wxHyperlinkCtrl class
    --enable-imaglist       use wxImageList class
    --enable-headerctrl     use wxHeaderCtrl class
    --enable-hyperlink      use wxHyperlinkCtrl class
    --enable-imaglist       use wxImageList class
+  --enable-infobar        use wxInfoBar class
    --enable-listbook       use wxListbook class
    --enable-listbox        use wxListBox class
    --enable-listctrl       use wxListCtrl class
    --enable-listbook       use wxListbook class
    --enable-listbox        use wxListBox class
    --enable-listctrl       use wxListCtrl class
@@ -1920,7 +1930,7 @@ Optional Packages:
    --without-gtkprint      don't use GTK printing support
    --without-gnomeprint    don't use GNOME printing libraries
    --with-gnomevfs         use GNOME VFS for associating MIME types
    --without-gtkprint      don't use GTK printing support
    --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-hildon           use Hildon framework for Nokia 770/800/810
    --with-opengl           use OpenGL (or Mesa)
    --with-dmalloc          use dmalloc library (http://dmalloc.com/)
    --with-sdl              use SDL for audio on Unix
    --with-opengl           use OpenGL (or Mesa)
    --with-dmalloc          use dmalloc library (http://dmalloc.com/)
    --with-sdl              use SDL for audio on Unix
@@ -1981,6 +1991,10 @@ Some influential environment variables:
    HILDON_CFLAGS
                C compiler flags for HILDON, overriding pkg-config
    HILDON_LIBS linker flags for HILDON, overriding pkg-config
    HILDON_CFLAGS
                C compiler flags for HILDON, overriding pkg-config
    HILDON_LIBS linker flags for HILDON, overriding pkg-config
+  HILDON2_CFLAGS
+              C compiler flags for HILDON2, overriding pkg-config
+  HILDON2_LIBS
+              linker flags for HILDON2, overriding pkg-config
    CAIRO_CFLAGS
                C compiler flags for CAIRO, overriding pkg-config
    CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
    CAIRO_CFLAGS
                C compiler flags for CAIRO, overriding pkg-config
    CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
@@ -2051,7 +2065,7 @@ fi
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
-wxWidgets configure 2.9.0
+wxWidgets configure 2.9.1
  generated by GNU Autoconf 2.61
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
  generated by GNU Autoconf 2.61
  
  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2065,7 +2079,7 @@ cat >config.log <<_ACEOF
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
-It was created by wxWidgets $as_me 2.9.0, which was
+It was created by wxWidgets $as_me 2.9.1, which was
  generated by GNU Autoconf 2.61.  Invocation command line was
  
    $ $0 $@
  generated by GNU Autoconf 2.61.  Invocation command line was
  
    $ $0 $@
@@ -2547,7 +2561,7 @@ fi
  
  wx_major_version_number=2
  wx_minor_version_number=9
  
  wx_major_version_number=2
  wx_minor_version_number=9
-wx_release_number=0
+wx_release_number=1
  wx_subrelease_number=0
  
  WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
  wx_subrelease_number=0
  
  WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -2882,13 +2896,6 @@ _ACEOF
  _ACEOF
  
      DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
  _ACEOF
  
      DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
-    DEFAULT_STD_FLAG=no
-  ;;
-  powerpc-apple-macos* )
-        USE_UNIX=0
-            ac_cv_c_bigendian=yes
-            DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
-    DEFAULT_STD_FLAG=no
    ;;
  
    *-*-beos* )
    ;;
  
    *-*-beos* )
@@ -2919,6 +2926,7 @@ DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
  DEFAULT_wxUSE_DMALLOC=no
  DEFAULT_wxUSE_LIBGNOMEVFS=no
  DEFAULT_wxUSE_LIBHILDON=no
  DEFAULT_wxUSE_DMALLOC=no
  DEFAULT_wxUSE_LIBGNOMEVFS=no
  DEFAULT_wxUSE_LIBHILDON=no
+DEFAULT_wxUSE_LIBHILDON2=no
  DEFAULT_wxUSE_LIBMSPACK=no
  DEFAULT_wxUSE_LIBSDL=no
  
  DEFAULT_wxUSE_LIBMSPACK=no
  DEFAULT_wxUSE_LIBSDL=no
  
@@ -2930,6 +2938,7 @@ DEFAULT_wxUSE_GSTREAMER8=no
  DEFAULT_wxUSE_UNICODE_UTF8=auto
  DEFAULT_wxUSE_OPENGL=auto
  DEFAULT_wxUSE_MEDIACTRL=auto
  DEFAULT_wxUSE_UNICODE_UTF8=auto
  DEFAULT_wxUSE_OPENGL=auto
  DEFAULT_wxUSE_MEDIACTRL=auto
+DEFAULT_wxUSE_COMPILER_TLS=auto
  
  DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
  
  
  DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
  
@@ -2976,10 +2985,10 @@ fi
            eval "$wx_cv_use_gui"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_gui"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GUI = yes; then
-              result=no
-            else
+            if test $wxUSE_GUI = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_GUI
              fi
            else
              result=$wxUSE_GUI
@@ -3020,10 +3029,10 @@ fi
            eval "$wx_cv_use_monolithic"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_monolithic"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MONOLITHIC = yes; then
-              result=no
-            else
+            if test $wxUSE_MONOLITHIC = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MONOLITHIC
              fi
            else
              result=$wxUSE_MONOLITHIC
@@ -3064,10 +3073,10 @@ fi
            eval "$wx_cv_use_plugins"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_plugins"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PLUGINS = yes; then
-              result=no
-            else
+            if test $wxUSE_PLUGINS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PLUGINS
              fi
            else
              result=$wxUSE_PLUGINS
@@ -3158,10 +3167,10 @@ fi
            eval "$wx_cv_use_official_build"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_official_build"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OFFICIAL_BUILD = yes; then
-              result=no
-            else
+            if test $wxUSE_OFFICIAL_BUILD = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_OFFICIAL_BUILD
              fi
            else
              result=$wxUSE_OFFICIAL_BUILD
@@ -3211,10 +3220,10 @@ fi
            eval "$wx_cv_use_all_features"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_all_features"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ALL_FEATURES = yes; then
-              result=no
-            else
+            if test $wxUSE_ALL_FEATURES = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_ALL_FEATURES
              fi
            else
              result=$wxUSE_ALL_FEATURES
@@ -3263,10 +3272,10 @@ fi
            eval "$wx_cv_use_universal"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_universal"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_UNIVERSAL = yes; then
-              result=no
-            else
+            if test $wxUSE_UNIVERSAL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_UNIVERSAL
              fi
            else
              result=$wxUSE_UNIVERSAL
@@ -3394,10 +3403,10 @@ fi
            eval "$wx_cv_use_nanox"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_nanox"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NANOX = yes; then
-              result=no
-            else
+            if test $wxUSE_NANOX = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_NANOX
              fi
            else
              result=$wxUSE_NANOX
@@ -3444,10 +3453,10 @@ fi
            eval "$wx_cv_use_gpe"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_gpe"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GPE = yes; then
-              result=no
-            else
+            if test $wxUSE_GPE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_GPE
              fi
            else
              result=$wxUSE_GPE
@@ -4323,6 +4332,49 @@ fi
  echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
  
  
  echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
  
  
+{ echo "$as_me:$LINENO: checking for --enable-debug" >&5
+echo $ECHO_N "checking for --enable-debug... $ECHO_C" >&6; }
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval=$enable_debug;
+        if test "$enableval" = yes; then
+            wxUSE_DEBUG=yes
+        elif test "$enableval" = no; then
+            wxUSE_DEBUG=no
+        elif test "$enableval" = max; then
+            wxUSE_DEBUG=yes
+            WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=2"
+        else
+            { { echo "$as_me:$LINENO: error: Invalid --enable-debug value, must be yes, no or max" >&5
+echo "$as_me: error: Invalid --enable-debug value, must be yes, no or max" >&2;}
+   { (exit 1); exit 1; }; }
+        fi
+
+else
+  wxUSE_DEBUG=default
+
+fi
+
+
+case "$wxUSE_DEBUG" in
+    yes)
+                        DEFAULT_wxUSE_DEBUG_FLAG=yes
+        DEFAULT_wxUSE_DEBUG_INFO=yes
+
+                        DEFAULT_wxUSE_OPTIMISE=no
+        ;;
+
+    no)
+                        DEFAULT_wxUSE_DEBUG_FLAG=no
+        DEFAULT_wxUSE_DEBUG_INFO=no
+        ;;
+
+    default)
+                        DEFAULT_wxUSE_DEBUG_FLAG=yes
+        DEFAULT_wxUSE_DEBUG_INFO=no
+        ;;
+esac
+
  
            enablestring=disable
            defaultval=
  
            enablestring=disable
            defaultval=
@@ -4334,34 +4386,124 @@ echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
-          # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval=$enable_shared;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
+          # Check whether --enable-debug_flag was given.
+if test "${enable_debug_flag+set}" = set; then
+  enableval=$enable_debug_flag;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_shared='wxUSE_SHARED=yes'
+                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
                            else
                            else
-                            wx_cv_use_shared='wxUSE_SHARED=no'
+                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
+                          wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_shared"
+          eval "$wx_cv_use_debug_flag"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SHARED = yes; then
+            if test $wxUSE_DEBUG_FLAG = no; then
+              result=yes
+            else
                result=no
                result=no
+            fi
+          else
+            result=$wxUSE_DEBUG_FLAG
+          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}-debug_info" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
+          # Check whether --enable-debug_info was given.
+if test "${enable_debug_info+set}" = set; then
+  enableval=$enable_debug_info;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
+                          else
+                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
+                          fi
+
+else
+
+                          wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_debug_info"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DEBUG_INFO = no; then
+              result=yes
              else
              else
+              result=no
+            fi
+          else
+            result=$wxUSE_DEBUG_INFO
+          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}-debug_gdb" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
+          # Check whether --enable-debug_gdb was given.
+if test "${enable_debug_gdb+set}" = set; then
+  enableval=$enable_debug_gdb;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
+                          else
+                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
+                          fi
+
+else
+
+                          wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_debug_gdb"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DEBUG_GDB = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              fi
            else
-            result=$wxUSE_SHARED
+            result=$wxUSE_DEBUG_GDB
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -4378,34 +4520,124 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; }
-          # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
+          # Check whether --enable-debug_cntxt was given.
+if test "${enable_debug_cntxt+set}" = set; then
+  enableval=$enable_debug_cntxt;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_debug='wxUSE_DEBUG=yes'
+                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
                            else
                            else
-                            wx_cv_use_debug='wxUSE_DEBUG=no'
+                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
+                          wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_debug"
+          eval "$wx_cv_use_debug_cntxt"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG = yes; then
+            if test $wxUSE_DEBUG_CONTEXT = no; then
+              result=yes
+            else
                result=no
                result=no
+            fi
+          else
+            result=$wxUSE_DEBUG_CONTEXT
+          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}-mem_tracing" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
+          # Check whether --enable-mem_tracing was given.
+if test "${enable_mem_tracing+set}" = set; then
+  enableval=$enable_mem_tracing;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
+                          else
+                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
+                          fi
+
+else
+
+                          wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_mem_tracing"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MEM_TRACING = no; then
+              result=yes
              else
              else
+              result=no
+            fi
+          else
+            result=$wxUSE_MEM_TRACING
+          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}-shared" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
+          # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval=$enable_shared;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_shared='wxUSE_SHARED=yes'
+                          else
+                            wx_cv_use_shared='wxUSE_SHARED=no'
+                          fi
+
+else
+
+                          wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_shared"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SHARED = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              fi
            else
-            result=$wxUSE_DEBUG
+            result=$wxUSE_SHARED
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -4443,10 +4675,10 @@ fi
            eval "$wx_cv_use_stl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_stl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STL = yes; then
-              result=no
-            else
+            if test $wxUSE_STL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STL
              fi
            else
              result=$wxUSE_STL
@@ -4487,10 +4719,10 @@ fi
            eval "$wx_cv_use_std_iostreams"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_std_iostreams"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STD_IOSTREAM = yes; then
-              result=no
-            else
+            if test $wxUSE_STD_IOSTREAM = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STD_IOSTREAM
              fi
            else
              result=$wxUSE_STD_IOSTREAM
@@ -4531,10 +4763,10 @@ fi
            eval "$wx_cv_use_std_string"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_std_string"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STD_STRING = yes; then
-              result=no
-            else
+            if test $wxUSE_STD_STRING = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STD_STRING
              fi
            else
              result=$wxUSE_STD_STRING
@@ -4575,10 +4807,10 @@ fi
            eval "$wx_cv_use_unicode"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_unicode"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_UNICODE = yes; then
-              result=no
-            else
+            if test $wxUSE_UNICODE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_UNICODE
              fi
            else
              result=$wxUSE_UNICODE
@@ -4619,10 +4851,10 @@ fi
            eval "$wx_cv_use_mslu"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_mslu"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_UNICODE_MSLU = yes; then
-              result=no
-            else
+            if test $wxUSE_UNICODE_MSLU = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_UNICODE_MSLU
              fi
            else
              result=$wxUSE_UNICODE_MSLU
@@ -4684,10 +4916,10 @@ fi
            eval "$wx_cv_use_utf8only"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_utf8only"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then
-              result=no
-            else
+            if test $wxUSE_UNICODE_UTF8_LOCALE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_UNICODE_UTF8_LOCALE
              fi
            else
              result=$wxUSE_UNICODE_UTF8_LOCALE
@@ -4728,10 +4960,10 @@ fi
            eval "$wx_cv_use_extended_rtti"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_extended_rtti"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_EXTENDED_RTTI = yes; then
-              result=no
-            else
+            if test $wxUSE_EXTENDED_RTTI = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_EXTENDED_RTTI
              fi
            else
              result=$wxUSE_EXTENDED_RTTI
@@ -4774,126 +5006,18 @@ fi
            eval "$wx_cv_use_omf"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_omf"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OMF = yes; then
-              result=no
-            else
+            if test $wxUSE_OMF = no; then
                result=yes
                result=yes
-            fi
-          else
-            result=$wxUSE_OMF
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-fi
-
-if test "$wxUSE_DEBUG" = "yes"; then
-    DEFAULT_wxUSE_DEBUG_FLAG=yes
-    DEFAULT_wxUSE_DEBUG_INFO=yes
-    BUILD=debug
-elif test "$wxUSE_DEBUG" = "no"; then
-    DEFAULT_wxUSE_DEBUG_FLAG=no
-    DEFAULT_wxUSE_DEBUG_INFO=no
-    BUILD=release
-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}-debug_flag" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
-          # Check whether --enable-debug_flag was given.
-if test "${enable_debug_flag+set}" = set; then
-  enableval=$enable_debug_flag;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
-                          else
-                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
-                          fi
-
-else
-
-                          wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_debug_flag"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_FLAG = yes; then
-              result=no
              else
              else
-              result=yes
-            fi
-          else
-            result=$wxUSE_DEBUG_FLAG
-          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}-debug_info" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
-          # Check whether --enable-debug_info was given.
-if test "${enable_debug_info+set}" = set; then
-  enableval=$enable_debug_info;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
-                          else
-                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
-                          fi
-
-else
-
-                          wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_debug_info"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_INFO = yes; then
                result=no
                result=no
-            else
-              result=yes
              fi
            else
              fi
            else
-            result=$wxUSE_DEBUG_INFO
+            result=$wxUSE_OMF
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
  echo "${ECHO_T}$result" >&6; }
  
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
  echo "${ECHO_T}$result" >&6; }
  
-
-if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
-    wxUSE_DEBUG=yes
-    BUILD=debug
-fi
-
-if test "$wxUSE_DEBUG" = "yes"; then
-    DEFAULT_wxUSE_OPTIMISE=no
  fi
  
  
  fi
  
  
@@ -4928,151 +5052,19 @@ fi
            eval "$wx_cv_use_optimise"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_optimise"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OPTIMISE = yes; then
-              result=no
-            else
+            if test $wxUSE_OPTIMISE = no; then
                result=yes
                result=yes
-            fi
-          else
-            result=$wxUSE_OPTIMISE
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-
-          enablestring=
-          defaultval=
-          if test -z "$defaultval"; then
-              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; }
-          # Check whether --enable-debug_gdb was given.
-if test "${enable_debug_gdb+set}" = set; then
-  enableval=$enable_debug_gdb;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
-                          else
-                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
-                          fi
-
-else
-
-                          wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_debug_gdb"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_GDB = yes; then
-              result=no
              else
              else
-              result=yes
-            fi
-          else
-            result=$wxUSE_DEBUG_GDB
-          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}-debug_cntxt" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
-          # Check whether --enable-debug_cntxt was given.
-if test "${enable_debug_cntxt+set}" = set; then
-  enableval=$enable_debug_cntxt;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
-                          else
-                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
-                          fi
-
-else
-
-                          wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_debug_cntxt"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_CONTEXT = yes; then
                result=no
                result=no
-            else
-              result=yes
              fi
            else
              fi
            else
-            result=$wxUSE_DEBUG_CONTEXT
+            result=$wxUSE_OPTIMISE
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
  echo "${ECHO_T}$result" >&6; }
  
  
            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}-mem_tracing" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
-          # Check whether --enable-mem_tracing was given.
-if test "${enable_mem_tracing+set}" = set; then
-  enableval=$enable_mem_tracing;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
-                          else
-                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
-                          fi
-
-else
-
-                          wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_mem_tracing"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MEM_TRACING = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_MEM_TRACING
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
  
            enablestring=
            defaultval=
  
            enablestring=
            defaultval=
@@ -5105,10 +5097,10 @@ fi
            eval "$wx_cv_use_profile"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_profile"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROFILE = yes; then
-              result=no
-            else
+            if test $wxUSE_PROFILE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROFILE
              fi
            else
              result=$wxUSE_PROFILE
@@ -5149,10 +5141,10 @@ fi
            eval "$wx_cv_use_no_rtti"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_no_rtti"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NO_RTTI = yes; then
-              result=no
-            else
+            if test $wxUSE_NO_RTTI = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_NO_RTTI
              fi
            else
              result=$wxUSE_NO_RTTI
@@ -5193,10 +5185,10 @@ fi
            eval "$wx_cv_use_no_exceptions"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_no_exceptions"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NO_EXCEPTIONS = yes; then
-              result=no
-            else
+            if test $wxUSE_NO_EXCEPTIONS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_NO_EXCEPTIONS
              fi
            else
              result=$wxUSE_NO_EXCEPTIONS
@@ -5237,10 +5229,10 @@ fi
            eval "$wx_cv_use_permissive"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_permissive"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PERMISSIVE = yes; then
-              result=no
-            else
+            if test $wxUSE_PERMISSIVE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PERMISSIVE
              fi
            else
              result=$wxUSE_PERMISSIVE
@@ -5281,10 +5273,10 @@ fi
            eval "$wx_cv_use_no_deps"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_no_deps"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NO_DEPS = yes; then
-              result=no
-            else
+            if test $wxUSE_NO_DEPS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_NO_DEPS
              fi
            else
              result=$wxUSE_NO_DEPS
@@ -5325,10 +5317,10 @@ fi
            eval "$wx_cv_use_vararg_macros"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_vararg_macros"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_VARARG_MACROS = yes; then
-              result=no
-            else
+            if test $wxUSE_VARARG_MACROS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_VARARG_MACROS
              fi
            else
              result=$wxUSE_VARARG_MACROS
@@ -5391,10 +5383,10 @@ fi
            eval "$wx_cv_use_compat26"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_compat26"
  
            if test x"$enablestring" = xdisable; then
-            if test $WXWIN_COMPATIBILITY_2_6 = yes; then
-              result=no
-            else
+            if test $WXWIN_COMPATIBILITY_2_6 = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$WXWIN_COMPATIBILITY_2_6
              fi
            else
              result=$WXWIN_COMPATIBILITY_2_6
@@ -5435,10 +5427,10 @@ fi
            eval "$wx_cv_use_compat28"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_compat28"
  
            if test x"$enablestring" = xdisable; then
-            if test $WXWIN_COMPATIBILITY_2_8 = yes; then
-              result=no
-            else
+            if test $WXWIN_COMPATIBILITY_2_8 = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$WXWIN_COMPATIBILITY_2_8
              fi
            else
              result=$WXWIN_COMPATIBILITY_2_8
@@ -5448,11 +5440,6 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  echo "${ECHO_T}$result" >&6; }
  
  
-cat >>confdefs.h <<\_ACEOF
-#define wxEVENTS_COMPATIBILITY_2_8 0
-_ACEOF
-
-
  
            enablestring=disable
            defaultval=
  
            enablestring=disable
            defaultval=
@@ -5485,10 +5472,10 @@ fi
            eval "$wx_cv_use_rpath"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_rpath"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_RPATH = yes; then
-              result=no
-            else
+            if test $wxUSE_RPATH = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_RPATH
              fi
            else
              result=$wxUSE_RPATH
@@ -5530,10 +5517,10 @@ fi
            eval "$wx_cv_use_objc_uniquifying"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_objc_uniquifying"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OBJC_UNIQUIFYING = yes; then
-              result=no
-            else
+            if test $wxUSE_OBJC_UNIQUIFYING = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_OBJC_UNIQUIFYING
              fi
            else
              result=$wxUSE_OBJC_UNIQUIFYING
@@ -5575,10 +5562,10 @@ fi
            eval "$wx_cv_use_visibility"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_visibility"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_VISIBILITY = yes; then
-              result=no
-            else
+            if test $wxUSE_VISIBILITY = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_VISIBILITY
              fi
            else
              result=$wxUSE_VISIBILITY
@@ -5588,6 +5575,50 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  echo "${ECHO_T}$result" >&6; }
  
  
+          enablestring=disable
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tls" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tls... $ECHO_C" >&6; }
+          # Check whether --enable-tls was given.
+if test "${enable_tls+set}" = set; then
+  enableval=$enable_tls;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_tls='wxUSE_COMPILER_TLS=yes'
+                          else
+                            wx_cv_use_tls='wxUSE_COMPILER_TLS=no'
+                          fi
+
+else
+
+                          wx_cv_use_tls='wxUSE_COMPILER_TLS=${'DEFAULT_wxUSE_COMPILER_TLS":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_tls"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_COMPILER_TLS = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_COMPILER_TLS
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
  
  
            enablestring=
  
  
            enablestring=
@@ -5621,10 +5652,10 @@ fi
            eval "$wx_cv_use_intl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_intl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_INTL = yes; then
-              result=no
-            else
+            if test $wxUSE_INTL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_INTL
              fi
            else
              result=$wxUSE_INTL
@@ -5665,10 +5696,10 @@ fi
            eval "$wx_cv_use_xlocale"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_xlocale"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_XLOCALE = yes; then
-              result=no
-            else
+            if test $wxUSE_XLOCALE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_XLOCALE
              fi
            else
              result=$wxUSE_XLOCALE
@@ -5709,10 +5740,10 @@ fi
            eval "$wx_cv_use_config"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_config"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CONFIG = yes; then
-              result=no
-            else
+            if test $wxUSE_CONFIG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CONFIG
              fi
            else
              result=$wxUSE_CONFIG
@@ -5754,10 +5785,10 @@ fi
            eval "$wx_cv_use_protocols"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_protocols"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROTOCOL
              fi
            else
              result=$wxUSE_PROTOCOL
@@ -5798,10 +5829,10 @@ fi
            eval "$wx_cv_use_ftp"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_ftp"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_FTP = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_FTP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROTOCOL_FTP
              fi
            else
              result=$wxUSE_PROTOCOL_FTP
@@ -5842,10 +5873,10 @@ fi
            eval "$wx_cv_use_http"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_http"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_HTTP = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_HTTP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROTOCOL_HTTP
              fi
            else
              result=$wxUSE_PROTOCOL_HTTP
@@ -5886,10 +5917,10 @@ fi
            eval "$wx_cv_use_fileproto"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_fileproto"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_FILE = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_FILE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROTOCOL_FILE
              fi
            else
              result=$wxUSE_PROTOCOL_FILE
@@ -5930,10 +5961,10 @@ fi
            eval "$wx_cv_use_sockets"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_sockets"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SOCKETS = yes; then
-              result=no
-            else
+            if test $wxUSE_SOCKETS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SOCKETS
              fi
            else
              result=$wxUSE_SOCKETS
@@ -5974,10 +6005,10 @@ fi
            eval "$wx_cv_use_ipv6"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_ipv6"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_IPV6 = yes; then
-              result=no
-            else
+            if test $wxUSE_IPV6 = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_IPV6
              fi
            else
              result=$wxUSE_IPV6
@@ -6018,10 +6049,10 @@ fi
            eval "$wx_cv_use_ole"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_ole"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OLE = yes; then
-              result=no
-            else
+            if test $wxUSE_OLE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_OLE
              fi
            else
              result=$wxUSE_OLE
@@ -6062,10 +6093,10 @@ fi
            eval "$wx_cv_use_dataobj"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_dataobj"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DATAOBJ = yes; then
-              result=no
-            else
+            if test $wxUSE_DATAOBJ = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DATAOBJ
              fi
            else
              result=$wxUSE_DATAOBJ
@@ -6107,10 +6138,10 @@ fi
            eval "$wx_cv_use_ipc"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_ipc"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_IPC = yes; then
-              result=no
-            else
+            if test $wxUSE_IPC = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_IPC
              fi
            else
              result=$wxUSE_IPC
@@ -6152,10 +6183,10 @@ fi
            eval "$wx_cv_use_baseevtloop"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_baseevtloop"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CONSOLE_EVENTLOOP = yes; then
-              result=no
-            else
+            if test $wxUSE_CONSOLE_EVENTLOOP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CONSOLE_EVENTLOOP
              fi
            else
              result=$wxUSE_CONSOLE_EVENTLOOP
@@ -6196,10 +6227,10 @@ fi
            eval "$wx_cv_use_epollloop"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_epollloop"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_EPOLL_DISPATCHER = yes; then
-              result=no
-            else
+            if test $wxUSE_EPOLL_DISPATCHER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_EPOLL_DISPATCHER
              fi
            else
              result=$wxUSE_EPOLL_DISPATCHER
@@ -6240,10 +6271,10 @@ fi
            eval "$wx_cv_use_selectloop"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_selectloop"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SELECT_DISPATCHER = yes; then
-              result=no
-            else
+            if test $wxUSE_SELECT_DISPATCHER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SELECT_DISPATCHER
              fi
            else
              result=$wxUSE_SELECT_DISPATCHER
@@ -6254,6 +6285,50 @@ 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}-any" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-any... $ECHO_C" >&6; }
+          # Check whether --enable-any was given.
+if test "${enable_any+set}" = set; then
+  enableval=$enable_any;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_any='wxUSE_ANY=yes'
+                          else
+                            wx_cv_use_any='wxUSE_ANY=no'
+                          fi
+
+else
+
+                          wx_cv_use_any='wxUSE_ANY=${'DEFAULT_wxUSE_ANY":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_any"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ANY = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_ANY
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
@@ -6285,10 +6360,10 @@ fi
            eval "$wx_cv_use_apple_ieee"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_apple_ieee"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_APPLE_IEEE = yes; then
-              result=no
-            else
+            if test $wxUSE_APPLE_IEEE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_APPLE_IEEE
              fi
            else
              result=$wxUSE_APPLE_IEEE
@@ -6329,10 +6404,10 @@ fi
            eval "$wx_cv_use_arcstream"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_arcstream"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ARCHIVE_STREAMS = yes; then
-              result=no
-            else
+            if test $wxUSE_ARCHIVE_STREAMS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_ARCHIVE_STREAMS
              fi
            else
              result=$wxUSE_ARCHIVE_STREAMS
@@ -6373,10 +6448,10 @@ fi
            eval "$wx_cv_use_base64"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_base64"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BASE64 = yes; then
-              result=no
-            else
+            if test $wxUSE_BASE64 = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_BASE64
              fi
            else
              result=$wxUSE_BASE64
@@ -6417,10 +6492,10 @@ fi
            eval "$wx_cv_use_backtrace"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_backtrace"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STACKWALKER = yes; then
-              result=no
-            else
+            if test $wxUSE_STACKWALKER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STACKWALKER
              fi
            else
              result=$wxUSE_STACKWALKER
@@ -6461,10 +6536,10 @@ fi
            eval "$wx_cv_use_catch_segvs"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_catch_segvs"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ON_FATAL_EXCEPTION = yes; then
-              result=no
-            else
+            if test $wxUSE_ON_FATAL_EXCEPTION = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_ON_FATAL_EXCEPTION
              fi
            else
              result=$wxUSE_ON_FATAL_EXCEPTION
@@ -6505,10 +6580,10 @@ fi
            eval "$wx_cv_use_cmdline"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_cmdline"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CMDLINE_PARSER = yes; then
-              result=no
-            else
+            if test $wxUSE_CMDLINE_PARSER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CMDLINE_PARSER
              fi
            else
              result=$wxUSE_CMDLINE_PARSER
@@ -6549,10 +6624,10 @@ fi
            eval "$wx_cv_use_datetime"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_datetime"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DATETIME = yes; then
-              result=no
-            else
+            if test $wxUSE_DATETIME = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DATETIME
              fi
            else
              result=$wxUSE_DATETIME
@@ -6593,10 +6668,10 @@ fi
            eval "$wx_cv_use_debugreport"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_debugreport"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUGREPORT = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUGREPORT = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DEBUGREPORT
              fi
            else
              result=$wxUSE_DEBUGREPORT
@@ -6637,10 +6712,10 @@ fi
            eval "$wx_cv_use_dialupman"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_dialupman"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DIALUP_MANAGER = yes; then
-              result=no
-            else
+            if test $wxUSE_DIALUP_MANAGER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DIALUP_MANAGER
              fi
            else
              result=$wxUSE_DIALUP_MANAGER
@@ -6681,10 +6756,10 @@ fi
            eval "$wx_cv_use_dynlib"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_dynlib"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DYNLIB_CLASS = yes; then
-              result=no
-            else
+            if test $wxUSE_DYNLIB_CLASS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DYNLIB_CLASS
              fi
            else
              result=$wxUSE_DYNLIB_CLASS
@@ -6725,10 +6800,10 @@ fi
            eval "$wx_cv_use_dynamicloader"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_dynamicloader"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DYNAMIC_LOADER = yes; then
-              result=no
-            else
+            if test $wxUSE_DYNAMIC_LOADER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DYNAMIC_LOADER
              fi
            else
              result=$wxUSE_DYNAMIC_LOADER
@@ -6769,10 +6844,10 @@ fi
            eval "$wx_cv_use_exceptions"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_exceptions"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_EXCEPTIONS = yes; then
-              result=no
-            else
+            if test $wxUSE_EXCEPTIONS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_EXCEPTIONS
              fi
            else
              result=$wxUSE_EXCEPTIONS
@@ -6813,10 +6888,10 @@ fi
            eval "$wx_cv_use_ffile"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_ffile"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FFILE = yes; then
-              result=no
-            else
+            if test $wxUSE_FFILE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FFILE
              fi
            else
              result=$wxUSE_FFILE
@@ -6857,10 +6932,10 @@ fi
            eval "$wx_cv_use_file"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_file"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILE = yes; then
-              result=no
-            else
+            if test $wxUSE_FILE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FILE
              fi
            else
              result=$wxUSE_FILE
@@ -6901,10 +6976,10 @@ fi
            eval "$wx_cv_use_filesystem"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_filesystem"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILESYSTEM = yes; then
-              result=no
-            else
+            if test $wxUSE_FILESYSTEM = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FILESYSTEM
              fi
            else
              result=$wxUSE_FILESYSTEM
@@ -6945,10 +7020,10 @@ fi
            eval "$wx_cv_use_fontenum"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_fontenum"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FONTENUM = yes; then
-              result=no
-            else
+            if test $wxUSE_FONTENUM = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FONTENUM
              fi
            else
              result=$wxUSE_FONTENUM
@@ -6989,10 +7064,10 @@ fi
            eval "$wx_cv_use_fontmap"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_fontmap"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FONTMAP = yes; then
-              result=no
-            else
+            if test $wxUSE_FONTMAP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FONTMAP
              fi
            else
              result=$wxUSE_FONTMAP
@@ -7033,10 +7108,10 @@ fi
            eval "$wx_cv_use_fs_archive"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_fs_archive"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FS_ARCHIVE = yes; then
-              result=no
-            else
+            if test $wxUSE_FS_ARCHIVE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FS_ARCHIVE
              fi
            else
              result=$wxUSE_FS_ARCHIVE
@@ -7077,10 +7152,10 @@ fi
            eval "$wx_cv_use_fs_inet"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_fs_inet"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FS_INET = yes; then
-              result=no
-            else
+            if test $wxUSE_FS_INET = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FS_INET
              fi
            else
              result=$wxUSE_FS_INET
@@ -7121,10 +7196,10 @@ fi
            eval "$wx_cv_use_fs_zip"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_fs_zip"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FS_ZIP = yes; then
-              result=no
-            else
+            if test $wxUSE_FS_ZIP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FS_ZIP
              fi
            else
              result=$wxUSE_FS_ZIP
@@ -7165,10 +7240,10 @@ fi
            eval "$wx_cv_use_geometry"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_geometry"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GEOMETRY = yes; then
-              result=no
-            else
+            if test $wxUSE_GEOMETRY = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_GEOMETRY
              fi
            else
              result=$wxUSE_GEOMETRY
@@ -7209,10 +7284,10 @@ fi
            eval "$wx_cv_use_log"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_log"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LOG = yes; then
-              result=no
-            else
+            if test $wxUSE_LOG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_LOG
              fi
            else
              result=$wxUSE_LOG
@@ -7253,10 +7328,10 @@ fi
            eval "$wx_cv_use_longlong"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_longlong"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LONGLONG = yes; then
-              result=no
-            else
+            if test $wxUSE_LONGLONG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_LONGLONG
              fi
            else
              result=$wxUSE_LONGLONG
@@ -7297,10 +7372,10 @@ fi
            eval "$wx_cv_use_mimetype"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_mimetype"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MIMETYPE = yes; then
-              result=no
-            else
+            if test $wxUSE_MIMETYPE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MIMETYPE
              fi
            else
              result=$wxUSE_MIMETYPE
@@ -7341,10 +7416,10 @@ fi
            eval "$wx_cv_use_printfposparam"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_printfposparam"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PRINTF_POS_PARAMS = yes; then
-              result=no
-            else
+            if test $wxUSE_PRINTF_POS_PARAMS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PRINTF_POS_PARAMS
              fi
            else
              result=$wxUSE_PRINTF_POS_PARAMS
@@ -7385,10 +7460,10 @@ fi
            eval "$wx_cv_use_snglinst"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_snglinst"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SNGLINST_CHECKER = yes; then
-              result=no
-            else
+            if test $wxUSE_SNGLINST_CHECKER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SNGLINST_CHECKER
              fi
            else
              result=$wxUSE_SNGLINST_CHECKER
@@ -7429,10 +7504,10 @@ fi
            eval "$wx_cv_use_sound"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_sound"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SOUND = yes; then
-              result=no
-            else
+            if test $wxUSE_SOUND = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SOUND
              fi
            else
              result=$wxUSE_SOUND
@@ -7473,10 +7548,10 @@ fi
            eval "$wx_cv_use_stdpaths"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_stdpaths"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STDPATHS = yes; then
-              result=no
-            else
+            if test $wxUSE_STDPATHS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STDPATHS
              fi
            else
              result=$wxUSE_STDPATHS
@@ -7517,10 +7592,10 @@ fi
            eval "$wx_cv_use_stopwatch"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_stopwatch"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STOPWATCH = yes; then
-              result=no
-            else
+            if test $wxUSE_STOPWATCH = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STOPWATCH
              fi
            else
              result=$wxUSE_STOPWATCH
@@ -7561,10 +7636,10 @@ fi
            eval "$wx_cv_use_streams"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_streams"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STREAMS = yes; then
-              result=no
-            else
+            if test $wxUSE_STREAMS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STREAMS
              fi
            else
              result=$wxUSE_STREAMS
@@ -7605,10 +7680,10 @@ fi
            eval "$wx_cv_use_system_options"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_system_options"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SYSTEM_OPTIONS = yes; then
-              result=no
-            else
+            if test $wxUSE_SYSTEM_OPTIONS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SYSTEM_OPTIONS
              fi
            else
              result=$wxUSE_SYSTEM_OPTIONS
@@ -7649,10 +7724,10 @@ fi
            eval "$wx_cv_use_tarstream"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_tarstream"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TARSTREAM = yes; then
-              result=no
-            else
+            if test $wxUSE_TARSTREAM = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TARSTREAM
              fi
            else
              result=$wxUSE_TARSTREAM
@@ -7693,10 +7768,10 @@ fi
            eval "$wx_cv_use_textbuf"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_textbuf"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TEXTBUFFER = yes; then
-              result=no
-            else
+            if test $wxUSE_TEXTBUFFER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TEXTBUFFER
              fi
            else
              result=$wxUSE_TEXTBUFFER
@@ -7737,10 +7812,10 @@ fi
            eval "$wx_cv_use_textfile"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_textfile"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TEXTFILE = yes; then
-              result=no
-            else
+            if test $wxUSE_TEXTFILE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TEXTFILE
              fi
            else
              result=$wxUSE_TEXTFILE
@@ -7781,10 +7856,10 @@ fi
            eval "$wx_cv_use_timer"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_timer"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TIMER = yes; then
-              result=no
-            else
+            if test $wxUSE_TIMER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TIMER
              fi
            else
              result=$wxUSE_TIMER
@@ -7825,10 +7900,10 @@ fi
            eval "$wx_cv_use_variant"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_variant"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_VARIANT = yes; then
-              result=no
-            else
+            if test $wxUSE_VARIANT = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_VARIANT
              fi
            else
              result=$wxUSE_VARIANT
@@ -7869,10 +7944,10 @@ fi
            eval "$wx_cv_use_zipstream"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_zipstream"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ZIPSTREAM = yes; then
-              result=no
-            else
+            if test $wxUSE_ZIPSTREAM = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_ZIPSTREAM
              fi
            else
              result=$wxUSE_ZIPSTREAM
@@ -7914,10 +7989,10 @@ fi
            eval "$wx_cv_use_url"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_url"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_URL = yes; then
-              result=no
-            else
+            if test $wxUSE_URL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_URL
              fi
            else
              result=$wxUSE_URL
@@ -7958,10 +8033,10 @@ fi
            eval "$wx_cv_use_protocol"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_protocol"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROTOCOL
              fi
            else
              result=$wxUSE_PROTOCOL
@@ -8002,10 +8077,10 @@ fi
            eval "$wx_cv_use_protocol_http"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_protocol_http"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_HTTP = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_HTTP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROTOCOL_HTTP
              fi
            else
              result=$wxUSE_PROTOCOL_HTTP
@@ -8046,10 +8121,10 @@ fi
            eval "$wx_cv_use_protocol_ftp"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_protocol_ftp"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_FTP = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_FTP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROTOCOL_FTP
              fi
            else
              result=$wxUSE_PROTOCOL_FTP
@@ -8090,10 +8165,10 @@ fi
            eval "$wx_cv_use_protocol_file"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_protocol_file"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROTOCOL_FILE = yes; then
-              result=no
-            else
+            if test $wxUSE_PROTOCOL_FILE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROTOCOL_FILE
              fi
            else
              result=$wxUSE_PROTOCOL_FILE
@@ -8135,10 +8210,10 @@ fi
            eval "$wx_cv_use_threads"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_threads"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_THREADS = yes; then
-              result=no
-            else
+            if test $wxUSE_THREADS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_THREADS
              fi
            else
              result=$wxUSE_THREADS
@@ -8180,10 +8255,10 @@ fi
            eval "$wx_cv_use_iniconf"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_iniconf"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_INICONF = yes; then
-              result=no
-            else
+            if test $wxUSE_INICONF = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_INICONF
              fi
            else
              result=$wxUSE_INICONF
@@ -8224,10 +8299,10 @@ fi
            eval "$wx_cv_use_regkey"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_regkey"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_REGKEY = yes; then
-              result=no
-            else
+            if test $wxUSE_REGKEY = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_REGKEY
              fi
            else
              result=$wxUSE_REGKEY
@@ -8272,10 +8347,10 @@ fi
            eval "$wx_cv_use_docview"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_docview"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then
-              result=no
-            else
+            if test $wxUSE_DOC_VIEW_ARCHITECTURE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DOC_VIEW_ARCHITECTURE
              fi
            else
              result=$wxUSE_DOC_VIEW_ARCHITECTURE
@@ -8316,10 +8391,10 @@ fi
            eval "$wx_cv_use_help"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_help"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_HELP = yes; then
-              result=no
-            else
+            if test $wxUSE_HELP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_HELP
              fi
            else
              result=$wxUSE_HELP
@@ -8360,10 +8435,10 @@ fi
            eval "$wx_cv_use_mshtmlhelp"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_mshtmlhelp"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MS_HTML_HELP = yes; then
-              result=no
-            else
+            if test $wxUSE_MS_HTML_HELP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MS_HTML_HELP
              fi
            else
              result=$wxUSE_MS_HTML_HELP
@@ -8404,10 +8479,10 @@ fi
            eval "$wx_cv_use_html"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_html"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_HTML = yes; then
-              result=no
-            else
+            if test $wxUSE_HTML = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_HTML
              fi
            else
              result=$wxUSE_HTML
@@ -8448,10 +8523,10 @@ fi
            eval "$wx_cv_use_htmlhelp"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_htmlhelp"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_WXHTML_HELP = yes; then
-              result=no
-            else
+            if test $wxUSE_WXHTML_HELP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_WXHTML_HELP
              fi
            else
              result=$wxUSE_WXHTML_HELP
@@ -8492,10 +8567,10 @@ fi
            eval "$wx_cv_use_xrc"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_xrc"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_XRC = yes; then
-              result=no
-            else
+            if test $wxUSE_XRC = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_XRC
              fi
            else
              result=$wxUSE_XRC
@@ -8536,10 +8611,10 @@ fi
            eval "$wx_cv_use_aui"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_aui"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_AUI = yes; then
-              result=no
-            else
+            if test $wxUSE_AUI = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_AUI
              fi
            else
              result=$wxUSE_AUI
@@ -8580,10 +8655,10 @@ fi
            eval "$wx_cv_use_propgrid"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_propgrid"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROPGRID = yes; then
-              result=no
-            else
+            if test $wxUSE_PROPGRID = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROPGRID
              fi
            else
              result=$wxUSE_PROPGRID
@@ -8593,6 +8668,50 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  echo "${ECHO_T}$result" >&6; }
  
  
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ribbon" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ribbon... $ECHO_C" >&6; }
+          # Check whether --enable-ribbon was given.
+if test "${enable_ribbon+set}" = set; then
+  enableval=$enable_ribbon;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ribbon='wxUSE_RIBBON=yes'
+                          else
+                            wx_cv_use_ribbon='wxUSE_RIBBON=no'
+                          fi
+
+else
+
+                          wx_cv_use_ribbon='wxUSE_RIBBON=${'DEFAULT_wxUSE_RIBBON":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ribbon"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RIBBON = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_RIBBON
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
@@ -8624,10 +8743,10 @@ fi
            eval "$wx_cv_use_stc"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_stc"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STC = yes; then
-              result=no
-            else
+            if test $wxUSE_STC = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STC
              fi
            else
              result=$wxUSE_STC
@@ -8668,10 +8787,10 @@ fi
            eval "$wx_cv_use_constraints"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_constraints"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CONSTRAINTS = yes; then
-              result=no
-            else
+            if test $wxUSE_CONSTRAINTS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CONSTRAINTS
              fi
            else
              result=$wxUSE_CONSTRAINTS
@@ -8712,10 +8831,10 @@ fi
            eval "$wx_cv_use_loggui"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_loggui"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LOGGUI = yes; then
-              result=no
-            else
+            if test $wxUSE_LOGGUI = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_LOGGUI
              fi
            else
              result=$wxUSE_LOGGUI
@@ -8756,10 +8875,10 @@ fi
            eval "$wx_cv_use_logwin"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_logwin"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LOGWINDOW = yes; then
-              result=no
-            else
+            if test $wxUSE_LOGWINDOW = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_LOGWINDOW
              fi
            else
              result=$wxUSE_LOGWINDOW
@@ -8800,10 +8919,10 @@ fi
            eval "$wx_cv_use_logdialog"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_logdialog"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LOGDIALOG = yes; then
-              result=no
-            else
+            if test $wxUSE_LOGDIALOG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_LOGDIALOG
              fi
            else
              result=$wxUSE_LOGDIALOG
@@ -8844,10 +8963,10 @@ fi
            eval "$wx_cv_use_mdi"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_mdi"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MDI = yes; then
-              result=no
-            else
+            if test $wxUSE_MDI = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MDI
              fi
            else
              result=$wxUSE_MDI
@@ -8888,10 +9007,10 @@ fi
            eval "$wx_cv_use_mdidoc"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_mdidoc"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MDI_ARCHITECTURE = yes; then
-              result=no
-            else
+            if test $wxUSE_MDI_ARCHITECTURE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MDI_ARCHITECTURE
              fi
            else
              result=$wxUSE_MDI_ARCHITECTURE
@@ -8932,10 +9051,10 @@ fi
            eval "$wx_cv_use_mediactrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_mediactrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MEDIACTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_MEDIACTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MEDIACTRL
              fi
            else
              result=$wxUSE_MEDIACTRL
@@ -8976,10 +9095,10 @@ fi
            eval "$wx_cv_use_gstreamer8"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_gstreamer8"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GSTREAMER8 = yes; then
-              result=no
-            else
+            if test $wxUSE_GSTREAMER8 = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_GSTREAMER8
              fi
            else
              result=$wxUSE_GSTREAMER8
@@ -9020,10 +9139,10 @@ fi
            eval "$wx_cv_use_webkit"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_webkit"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_WEBKIT = yes; then
-              result=no
-            else
+            if test $wxUSE_WEBKIT = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_WEBKIT
              fi
            else
              result=$wxUSE_WEBKIT
@@ -9064,10 +9183,10 @@ fi
            eval "$wx_cv_use_richtext"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_richtext"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_RICHTEXT = yes; then
-              result=no
-            else
+            if test $wxUSE_RICHTEXT = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_RICHTEXT
              fi
            else
              result=$wxUSE_RICHTEXT
@@ -9108,10 +9227,10 @@ fi
            eval "$wx_cv_use_graphics_ctx"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_graphics_ctx"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GRAPHICS_CONTEXT = yes; then
-              result=no
-            else
+            if test $wxUSE_GRAPHICS_CONTEXT = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_GRAPHICS_CONTEXT
              fi
            else
              result=$wxUSE_GRAPHICS_CONTEXT
@@ -9152,10 +9271,10 @@ fi
            eval "$wx_cv_use_postscript"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_postscript"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_POSTSCRIPT = yes; then
-              result=no
-            else
+            if test $wxUSE_POSTSCRIPT = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_POSTSCRIPT
              fi
            else
              result=$wxUSE_POSTSCRIPT
@@ -9196,10 +9315,10 @@ fi
            eval "$wx_cv_use_printarch"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_printarch"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PRINTING_ARCHITECTURE = yes; then
-              result=no
-            else
+            if test $wxUSE_PRINTING_ARCHITECTURE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PRINTING_ARCHITECTURE
              fi
            else
              result=$wxUSE_PRINTING_ARCHITECTURE
@@ -9240,10 +9359,10 @@ fi
            eval "$wx_cv_use_svg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_svg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SVG = yes; then
-              result=no
-            else
+            if test $wxUSE_SVG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SVG
              fi
            else
              result=$wxUSE_SVG
@@ -9286,10 +9405,10 @@ fi
            eval "$wx_cv_use_clipboard"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_clipboard"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CLIPBOARD = yes; then
-              result=no
-            else
+            if test $wxUSE_CLIPBOARD = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CLIPBOARD
              fi
            else
              result=$wxUSE_CLIPBOARD
@@ -9330,10 +9449,10 @@ fi
            eval "$wx_cv_use_dnd"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_dnd"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DRAG_AND_DROP = yes; then
-              result=no
-            else
+            if test $wxUSE_DRAG_AND_DROP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DRAG_AND_DROP
              fi
            else
              result=$wxUSE_DRAG_AND_DROP
@@ -9374,10 +9493,10 @@ fi
            eval "$wx_cv_use_metafile"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_metafile"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_METAFILE = yes; then
-              result=no
-            else
+            if test $wxUSE_METAFILE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_METAFILE
              fi
            else
              result=$wxUSE_METAFILE
@@ -9421,10 +9540,10 @@ fi
            eval "$wx_cv_use_controls"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_controls"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CONTROLS = yes; then
-              result=no
-            else
+            if test $wxUSE_CONTROLS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CONTROLS
              fi
            else
              result=$wxUSE_CONTROLS
@@ -9523,10 +9642,10 @@ fi
            eval "$wx_cv_use_accel"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_accel"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ACCEL = yes; then
-              result=no
-            else
+            if test $wxUSE_ACCEL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_ACCEL
              fi
            else
              result=$wxUSE_ACCEL
@@ -9567,10 +9686,10 @@ fi
            eval "$wx_cv_use_animatectrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_animatectrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ANIMATIONCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_ANIMATIONCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_ANIMATIONCTRL
              fi
            else
              result=$wxUSE_ANIMATIONCTRL
@@ -9611,10 +9730,10 @@ fi
            eval "$wx_cv_use_bmpbutton"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_bmpbutton"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BMPBUTTON = yes; then
-              result=no
-            else
+            if test $wxUSE_BMPBUTTON = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_BMPBUTTON
              fi
            else
              result=$wxUSE_BMPBUTTON
@@ -9655,10 +9774,10 @@ fi
            eval "$wx_cv_use_bmpcombobox"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_bmpcombobox"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BITMAPCOMBOBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_BITMAPCOMBOBOX = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_BITMAPCOMBOBOX
              fi
            else
              result=$wxUSE_BITMAPCOMBOBOX
@@ -9699,10 +9818,10 @@ fi
            eval "$wx_cv_use_button"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_button"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BUTTON = yes; then
-              result=no
-            else
+            if test $wxUSE_BUTTON = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_BUTTON
              fi
            else
              result=$wxUSE_BUTTON
@@ -9743,10 +9862,10 @@ fi
            eval "$wx_cv_use_calendar"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_calendar"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CALCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_CALCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CALCTRL
              fi
            else
              result=$wxUSE_CALCTRL
@@ -9787,10 +9906,10 @@ fi
            eval "$wx_cv_use_caret"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_caret"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CARET = yes; then
-              result=no
-            else
+            if test $wxUSE_CARET = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CARET
              fi
            else
              result=$wxUSE_CARET
@@ -9831,10 +9950,10 @@ fi
            eval "$wx_cv_use_checkbox"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_checkbox"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CHECKBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_CHECKBOX = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CHECKBOX
              fi
            else
              result=$wxUSE_CHECKBOX
@@ -9875,10 +9994,10 @@ fi
            eval "$wx_cv_use_checklst"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_checklst"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CHECKLST = yes; then
-              result=no
-            else
+            if test $wxUSE_CHECKLST = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CHECKLST
              fi
            else
              result=$wxUSE_CHECKLST
@@ -9919,10 +10038,10 @@ fi
            eval "$wx_cv_use_choice"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_choice"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CHOICE = yes; then
-              result=no
-            else
+            if test $wxUSE_CHOICE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CHOICE
              fi
            else
              result=$wxUSE_CHOICE
@@ -9963,10 +10082,10 @@ fi
            eval "$wx_cv_use_choicebook"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_choicebook"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CHOICEBOOK = yes; then
-              result=no
-            else
+            if test $wxUSE_CHOICEBOOK = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CHOICEBOOK
              fi
            else
              result=$wxUSE_CHOICEBOOK
@@ -10007,10 +10126,10 @@ fi
            eval "$wx_cv_use_collpane"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_collpane"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COLLPANE = yes; then
-              result=no
-            else
+            if test $wxUSE_COLLPANE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_COLLPANE
              fi
            else
              result=$wxUSE_COLLPANE
@@ -10051,10 +10170,10 @@ fi
            eval "$wx_cv_use_colourpicker"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_colourpicker"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COLOURPICKERCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_COLOURPICKERCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_COLOURPICKERCTRL
              fi
            else
              result=$wxUSE_COLOURPICKERCTRL
@@ -10095,10 +10214,10 @@ fi
            eval "$wx_cv_use_combobox"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_combobox"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COMBOBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_COMBOBOX = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_COMBOBOX
              fi
            else
              result=$wxUSE_COMBOBOX
@@ -10139,10 +10258,10 @@ fi
            eval "$wx_cv_use_comboctrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_comboctrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COMBOCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_COMBOCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_COMBOCTRL
              fi
            else
              result=$wxUSE_COMBOCTRL
@@ -10183,10 +10302,10 @@ fi
            eval "$wx_cv_use_dataviewctrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_dataviewctrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DATAVIEWCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_DATAVIEWCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DATAVIEWCTRL
              fi
            else
              result=$wxUSE_DATAVIEWCTRL
@@ -10227,10 +10346,10 @@ fi
            eval "$wx_cv_use_datepick"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_datepick"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DATEPICKCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_DATEPICKCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DATEPICKCTRL
              fi
            else
              result=$wxUSE_DATEPICKCTRL
@@ -10271,10 +10390,10 @@ fi
            eval "$wx_cv_use_detect_sm"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_detect_sm"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DETECT_SM = yes; then
-              result=no
-            else
+            if test $wxUSE_DETECT_SM = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DETECT_SM
              fi
            else
              result=$wxUSE_DETECT_SM
@@ -10315,10 +10434,10 @@ fi
            eval "$wx_cv_use_dirpicker"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_dirpicker"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DIRPICKERCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_DIRPICKERCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DIRPICKERCTRL
              fi
            else
              result=$wxUSE_DIRPICKERCTRL
@@ -10359,10 +10478,10 @@ fi
            eval "$wx_cv_use_display"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_display"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DISPLAY = yes; then
-              result=no
-            else
+            if test $wxUSE_DISPLAY = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DISPLAY
              fi
            else
              result=$wxUSE_DISPLAY
@@ -10403,10 +10522,10 @@ fi
            eval "$wx_cv_use_editablebox"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_editablebox"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_EDITABLELISTBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_EDITABLELISTBOX = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_EDITABLELISTBOX
              fi
            else
              result=$wxUSE_EDITABLELISTBOX
@@ -10447,10 +10566,10 @@ fi
            eval "$wx_cv_use_filectrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_filectrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILECTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_FILECTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FILECTRL
              fi
            else
              result=$wxUSE_FILECTRL
@@ -10491,10 +10610,10 @@ fi
            eval "$wx_cv_use_filepicker"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_filepicker"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILEPICKERCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_FILEPICKERCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FILEPICKERCTRL
              fi
            else
              result=$wxUSE_FILEPICKERCTRL
@@ -10535,10 +10654,10 @@ fi
            eval "$wx_cv_use_fontpicker"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_fontpicker"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FONTPICKERCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_FONTPICKERCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FONTPICKERCTRL
              fi
            else
              result=$wxUSE_FONTPICKERCTRL
@@ -10579,10 +10698,10 @@ fi
            eval "$wx_cv_use_gauge"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_gauge"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GAUGE = yes; then
-              result=no
-            else
+            if test $wxUSE_GAUGE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_GAUGE
              fi
            else
              result=$wxUSE_GAUGE
@@ -10623,10 +10742,10 @@ fi
            eval "$wx_cv_use_grid"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_grid"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GRID = yes; then
-              result=no
-            else
+            if test $wxUSE_GRID = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_GRID
              fi
            else
              result=$wxUSE_GRID
@@ -10667,10 +10786,10 @@ fi
            eval "$wx_cv_use_headerctrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_headerctrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_HEADERCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_HEADERCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_HEADERCTRL
              fi
            else
              result=$wxUSE_HEADERCTRL
@@ -10711,10 +10830,10 @@ fi
            eval "$wx_cv_use_hyperlink"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_hyperlink"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_HYPERLINKCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_HYPERLINKCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_HYPERLINKCTRL
              fi
            else
              result=$wxUSE_HYPERLINKCTRL
@@ -10755,10 +10874,10 @@ fi
            eval "$wx_cv_use_imaglist"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_imaglist"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_IMAGLIST = yes; then
-              result=no
-            else
+            if test $wxUSE_IMAGLIST = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_IMAGLIST
              fi
            else
              result=$wxUSE_IMAGLIST
@@ -10768,6 +10887,50 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  echo "${ECHO_T}$result" >&6; }
  
  
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-infobar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-infobar... $ECHO_C" >&6; }
+          # Check whether --enable-infobar was given.
+if test "${enable_infobar+set}" = set; then
+  enableval=$enable_infobar;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_infobar='wxUSE_INFOBAR=yes'
+                          else
+                            wx_cv_use_infobar='wxUSE_INFOBAR=no'
+                          fi
+
+else
+
+                          wx_cv_use_infobar='wxUSE_INFOBAR=${'DEFAULT_wxUSE_INFOBAR":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_infobar"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_INFOBAR = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_INFOBAR
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
@@ -10799,10 +10962,10 @@ fi
            eval "$wx_cv_use_listbook"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_listbook"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LISTBOOK = yes; then
-              result=no
-            else
+            if test $wxUSE_LISTBOOK = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_LISTBOOK
              fi
            else
              result=$wxUSE_LISTBOOK
@@ -10843,10 +11006,10 @@ fi
            eval "$wx_cv_use_listbox"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_listbox"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LISTBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_LISTBOX = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_LISTBOX
              fi
            else
              result=$wxUSE_LISTBOX
@@ -10887,10 +11050,10 @@ fi
            eval "$wx_cv_use_listctrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_listctrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_LISTCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_LISTCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_LISTCTRL
              fi
            else
              result=$wxUSE_LISTCTRL
@@ -10931,10 +11094,10 @@ fi
            eval "$wx_cv_use_notebook"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_notebook"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NOTEBOOK = yes; then
-              result=no
-            else
+            if test $wxUSE_NOTEBOOK = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_NOTEBOOK
              fi
            else
              result=$wxUSE_NOTEBOOK
@@ -10975,10 +11138,10 @@ fi
            eval "$wx_cv_use_notifmsg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_notifmsg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NOTIFICATION_MESSAGE = yes; then
-              result=no
-            else
+            if test $wxUSE_NOTIFICATION_MESSAGE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_NOTIFICATION_MESSAGE
              fi
            else
              result=$wxUSE_NOTIFICATION_MESSAGE
@@ -11019,10 +11182,10 @@ fi
            eval "$wx_cv_use_odcombobox"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_odcombobox"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ODCOMBOBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_ODCOMBOBOX = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_ODCOMBOBOX
              fi
            else
              result=$wxUSE_ODCOMBOBOX
@@ -11063,10 +11226,10 @@ fi
            eval "$wx_cv_use_popupwin"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_popupwin"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_POPUPWIN = yes; then
-              result=no
-            else
+            if test $wxUSE_POPUPWIN = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_POPUPWIN
              fi
            else
              result=$wxUSE_POPUPWIN
@@ -11107,10 +11270,10 @@ fi
            eval "$wx_cv_use_radiobox"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_radiobox"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_RADIOBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_RADIOBOX = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_RADIOBOX
              fi
            else
              result=$wxUSE_RADIOBOX
@@ -11151,10 +11314,10 @@ fi
            eval "$wx_cv_use_radiobtn"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_radiobtn"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_RADIOBTN = yes; then
-              result=no
-            else
+            if test $wxUSE_RADIOBTN = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_RADIOBTN
              fi
            else
              result=$wxUSE_RADIOBTN
@@ -11195,10 +11358,10 @@ fi
            eval "$wx_cv_use_rearrangectrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_rearrangectrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_REARRANGECTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_REARRANGECTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_REARRANGECTRL
              fi
            else
              result=$wxUSE_REARRANGECTRL
@@ -11239,10 +11402,10 @@ fi
            eval "$wx_cv_use_sash"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_sash"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SASH = yes; then
-              result=no
-            else
+            if test $wxUSE_SASH = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SASH
              fi
            else
              result=$wxUSE_SASH
@@ -11283,10 +11446,10 @@ fi
            eval "$wx_cv_use_scrollbar"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_scrollbar"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SCROLLBAR = yes; then
-              result=no
-            else
+            if test $wxUSE_SCROLLBAR = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SCROLLBAR
              fi
            else
              result=$wxUSE_SCROLLBAR
@@ -11327,10 +11490,10 @@ fi
            eval "$wx_cv_use_searchctrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_searchctrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SEARCHCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_SEARCHCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SEARCHCTRL
              fi
            else
              result=$wxUSE_SEARCHCTRL
@@ -11371,10 +11534,10 @@ fi
            eval "$wx_cv_use_slider"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_slider"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SLIDER = yes; then
-              result=no
-            else
+            if test $wxUSE_SLIDER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SLIDER
              fi
            else
              result=$wxUSE_SLIDER
@@ -11415,10 +11578,10 @@ fi
            eval "$wx_cv_use_spinbtn"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_spinbtn"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SPINBTN = yes; then
-              result=no
-            else
+            if test $wxUSE_SPINBTN = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SPINBTN
              fi
            else
              result=$wxUSE_SPINBTN
@@ -11459,10 +11622,10 @@ fi
            eval "$wx_cv_use_spinctrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_spinctrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SPINCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_SPINCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SPINCTRL
              fi
            else
              result=$wxUSE_SPINCTRL
@@ -11503,10 +11666,10 @@ fi
            eval "$wx_cv_use_splitter"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_splitter"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SPLITTER = yes; then
-              result=no
-            else
+            if test $wxUSE_SPLITTER = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SPLITTER
              fi
            else
              result=$wxUSE_SPLITTER
@@ -11547,10 +11710,10 @@ fi
            eval "$wx_cv_use_statbmp"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_statbmp"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STATBMP = yes; then
-              result=no
-            else
+            if test $wxUSE_STATBMP = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STATBMP
              fi
            else
              result=$wxUSE_STATBMP
@@ -11591,10 +11754,10 @@ fi
            eval "$wx_cv_use_statbox"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_statbox"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STATBOX = yes; then
-              result=no
-            else
+            if test $wxUSE_STATBOX = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STATBOX
              fi
            else
              result=$wxUSE_STATBOX
@@ -11635,10 +11798,10 @@ fi
            eval "$wx_cv_use_statline"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_statline"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STATLINE = yes; then
-              result=no
-            else
+            if test $wxUSE_STATLINE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STATLINE
              fi
            else
              result=$wxUSE_STATLINE
@@ -11679,10 +11842,10 @@ fi
            eval "$wx_cv_use_stattext"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_stattext"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STATTEXT = yes; then
-              result=no
-            else
+            if test $wxUSE_STATTEXT = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STATTEXT
              fi
            else
              result=$wxUSE_STATTEXT
@@ -11723,10 +11886,10 @@ fi
            eval "$wx_cv_use_statusbar"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_statusbar"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STATUSBAR = yes; then
-              result=no
-            else
+            if test $wxUSE_STATUSBAR = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STATUSBAR
              fi
            else
              result=$wxUSE_STATUSBAR
@@ -11767,10 +11930,10 @@ fi
            eval "$wx_cv_use_taskbaricon"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_taskbaricon"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TASKBARICON = yes; then
-              result=no
-            else
+            if test $wxUSE_TASKBARICON = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TASKBARICON
              fi
            else
              result=$wxUSE_TASKBARICON
@@ -11811,10 +11974,10 @@ fi
            eval "$wx_cv_use_tbarnative"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_tbarnative"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOOLBAR_NATIVE = yes; then
-              result=no
-            else
+            if test $wxUSE_TOOLBAR_NATIVE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TOOLBAR_NATIVE
              fi
            else
              result=$wxUSE_TOOLBAR_NATIVE
@@ -11855,10 +12018,10 @@ fi
            eval "$wx_cv_use_textctrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_textctrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TEXTCTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_TEXTCTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TEXTCTRL
              fi
            else
              result=$wxUSE_TEXTCTRL
@@ -11899,10 +12062,10 @@ fi
            eval "$wx_cv_use_tipwindow"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_tipwindow"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TIPWINDOW = yes; then
-              result=no
-            else
+            if test $wxUSE_TIPWINDOW = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TIPWINDOW
              fi
            else
              result=$wxUSE_TIPWINDOW
@@ -11943,10 +12106,10 @@ fi
            eval "$wx_cv_use_togglebtn"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_togglebtn"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOGGLEBTN = yes; then
-              result=no
-            else
+            if test $wxUSE_TOGGLEBTN = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TOGGLEBTN
              fi
            else
              result=$wxUSE_TOGGLEBTN
@@ -11987,10 +12150,10 @@ fi
            eval "$wx_cv_use_toolbar"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_toolbar"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOOLBAR = yes; then
-              result=no
-            else
+            if test $wxUSE_TOOLBAR = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TOOLBAR
              fi
            else
              result=$wxUSE_TOOLBAR
@@ -12031,10 +12194,10 @@ fi
            eval "$wx_cv_use_toolbook"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_toolbook"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOOLBOOK = yes; then
-              result=no
-            else
+            if test $wxUSE_TOOLBOOK = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TOOLBOOK
              fi
            else
              result=$wxUSE_TOOLBOOK
@@ -12075,10 +12238,10 @@ fi
            eval "$wx_cv_use_treebook"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_treebook"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TREEBOOK = yes; then
-              result=no
-            else
+            if test $wxUSE_TREEBOOK = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TREEBOOK
              fi
            else
              result=$wxUSE_TREEBOOK
@@ -12119,10 +12282,10 @@ fi
            eval "$wx_cv_use_treectrl"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_treectrl"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TREECTRL = yes; then
-              result=no
-            else
+            if test $wxUSE_TREECTRL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TREECTRL
              fi
            else
              result=$wxUSE_TREECTRL
@@ -12165,10 +12328,10 @@ fi
            eval "$wx_cv_use_commondlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_commondlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COMMONDLGS = yes; then
-              result=no
-            else
+            if test $wxUSE_COMMONDLGS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_COMMONDLGS
              fi
            else
              result=$wxUSE_COMMONDLGS
@@ -12209,10 +12372,10 @@ fi
            eval "$wx_cv_use_aboutdlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_aboutdlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ABOUTDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_ABOUTDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_ABOUTDLG
              fi
            else
              result=$wxUSE_ABOUTDLG
@@ -12253,10 +12416,10 @@ fi
            eval "$wx_cv_use_choicedlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_choicedlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_CHOICEDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_CHOICEDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_CHOICEDLG
              fi
            else
              result=$wxUSE_CHOICEDLG
@@ -12297,10 +12460,10 @@ fi
            eval "$wx_cv_use_coldlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_coldlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_COLOURDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_COLOURDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_COLOURDLG
              fi
            else
              result=$wxUSE_COLOURDLG
@@ -12341,10 +12504,10 @@ fi
            eval "$wx_cv_use_filedlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_filedlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILEDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_FILEDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FILEDLG
              fi
            else
              result=$wxUSE_FILEDLG
@@ -12385,10 +12548,10 @@ fi
            eval "$wx_cv_use_finddlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_finddlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FINDREPLDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_FINDREPLDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FINDREPLDLG
              fi
            else
              result=$wxUSE_FINDREPLDLG
@@ -12429,10 +12592,10 @@ fi
            eval "$wx_cv_use_fontdlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_fontdlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FONTDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_FONTDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_FONTDLG
              fi
            else
              result=$wxUSE_FONTDLG
@@ -12473,10 +12636,10 @@ fi
            eval "$wx_cv_use_dirdlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_dirdlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DIRDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_DIRDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DIRDLG
              fi
            else
              result=$wxUSE_DIRDLG
@@ -12517,10 +12680,10 @@ fi
            eval "$wx_cv_use_msgdlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_msgdlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MSGDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_MSGDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MSGDLG
              fi
            else
              result=$wxUSE_MSGDLG
@@ -12561,10 +12724,10 @@ fi
            eval "$wx_cv_use_numberdlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_numberdlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_NUMBERDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_NUMBERDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_NUMBERDLG
              fi
            else
              result=$wxUSE_NUMBERDLG
@@ -12605,10 +12768,10 @@ fi
            eval "$wx_cv_use_splash"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_splash"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SPLASH = yes; then
-              result=no
-            else
+            if test $wxUSE_SPLASH = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SPLASH
              fi
            else
              result=$wxUSE_SPLASH
@@ -12649,10 +12812,10 @@ fi
            eval "$wx_cv_use_textdlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_textdlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TEXTDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_TEXTDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TEXTDLG
              fi
            else
              result=$wxUSE_TEXTDLG
@@ -12693,10 +12856,10 @@ fi
            eval "$wx_cv_use_tipdlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_tipdlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_STARTUP_TIPS = yes; then
-              result=no
-            else
+            if test $wxUSE_STARTUP_TIPS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_STARTUP_TIPS
              fi
            else
              result=$wxUSE_STARTUP_TIPS
@@ -12737,10 +12900,10 @@ fi
            eval "$wx_cv_use_progressdlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_progressdlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PROGRESSDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_PROGRESSDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PROGRESSDLG
              fi
            else
              result=$wxUSE_PROGRESSDLG
@@ -12781,10 +12944,10 @@ fi
            eval "$wx_cv_use_wizarddlg"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_wizarddlg"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_WIZARDDLG = yes; then
-              result=no
-            else
+            if test $wxUSE_WIZARDDLG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_WIZARDDLG
              fi
            else
              result=$wxUSE_WIZARDDLG
@@ -12827,10 +12990,10 @@ fi
            eval "$wx_cv_use_menus"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_menus"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MENUS = yes; then
-              result=no
-            else
+            if test $wxUSE_MENUS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MENUS
              fi
            else
              result=$wxUSE_MENUS
@@ -12871,10 +13034,10 @@ fi
            eval "$wx_cv_use_miniframe"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_miniframe"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MINIFRAME = yes; then
-              result=no
-            else
+            if test $wxUSE_MINIFRAME = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MINIFRAME
              fi
            else
              result=$wxUSE_MINIFRAME
@@ -12915,10 +13078,10 @@ fi
            eval "$wx_cv_use_tooltips"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_tooltips"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOOLTIPS = yes; then
-              result=no
-            else
+            if test $wxUSE_TOOLTIPS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TOOLTIPS
              fi
            else
              result=$wxUSE_TOOLTIPS
@@ -12959,10 +13122,10 @@ fi
            eval "$wx_cv_use_splines"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_splines"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SPLINES = yes; then
-              result=no
-            else
+            if test $wxUSE_SPLINES = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SPLINES
              fi
            else
              result=$wxUSE_SPLINES
@@ -13003,10 +13166,10 @@ fi
            eval "$wx_cv_use_mousewheel"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_mousewheel"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MOUSEWHEEL = yes; then
-              result=no
-            else
+            if test $wxUSE_MOUSEWHEEL = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MOUSEWHEEL
              fi
            else
              result=$wxUSE_MOUSEWHEEL
@@ -13047,10 +13210,10 @@ fi
            eval "$wx_cv_use_validators"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_validators"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_VALIDATORS = yes; then
-              result=no
-            else
+            if test $wxUSE_VALIDATORS = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_VALIDATORS
              fi
            else
              result=$wxUSE_VALIDATORS
@@ -13091,10 +13254,10 @@ fi
            eval "$wx_cv_use_busyinfo"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_busyinfo"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BUSYINFO = yes; then
-              result=no
-            else
+            if test $wxUSE_BUSYINFO = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_BUSYINFO
              fi
            else
              result=$wxUSE_BUSYINFO
@@ -13135,10 +13298,10 @@ fi
            eval "$wx_cv_use_joystick"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_joystick"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_JOYSTICK = yes; then
-              result=no
-            else
+            if test $wxUSE_JOYSTICK = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_JOYSTICK
              fi
            else
              result=$wxUSE_JOYSTICK
@@ -13179,10 +13342,10 @@ fi
            eval "$wx_cv_use_metafile"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_metafile"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_METAFILE = yes; then
-              result=no
-            else
+            if test $wxUSE_METAFILE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_METAFILE
              fi
            else
              result=$wxUSE_METAFILE
@@ -13223,10 +13386,10 @@ fi
            eval "$wx_cv_use_dragimage"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_dragimage"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DRAGIMAGE = yes; then
-              result=no
-            else
+            if test $wxUSE_DRAGIMAGE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DRAGIMAGE
              fi
            else
              result=$wxUSE_DRAGIMAGE
@@ -13267,10 +13430,10 @@ fi
            eval "$wx_cv_use_accessibility"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_accessibility"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ACCESSIBILITY = yes; then
-              result=no
-            else
+            if test $wxUSE_ACCESSIBILITY = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_ACCESSIBILITY
              fi
            else
              result=$wxUSE_ACCESSIBILITY
@@ -13313,10 +13476,10 @@ fi
            eval "$wx_cv_use_palette"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_palette"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PALETTE = yes; then
-              result=no
-            else
+            if test $wxUSE_PALETTE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PALETTE
              fi
            else
              result=$wxUSE_PALETTE
@@ -13357,10 +13520,10 @@ fi
            eval "$wx_cv_use_image"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_image"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_IMAGE = yes; then
-              result=no
-            else
+            if test $wxUSE_IMAGE = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_IMAGE
              fi
            else
              result=$wxUSE_IMAGE
@@ -13401,10 +13564,10 @@ fi
            eval "$wx_cv_use_gif"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_gif"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GIF = yes; then
-              result=no
-            else
+            if test $wxUSE_GIF = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_GIF
              fi
            else
              result=$wxUSE_GIF
@@ -13445,10 +13608,10 @@ fi
            eval "$wx_cv_use_pcx"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_pcx"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PCX = yes; then
-              result=no
-            else
+            if test $wxUSE_PCX = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PCX
              fi
            else
              result=$wxUSE_PCX
@@ -13489,10 +13652,10 @@ fi
            eval "$wx_cv_use_tga"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_tga"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TGA = yes; then
-              result=no
-            else
+            if test $wxUSE_TGA = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_TGA
              fi
            else
              result=$wxUSE_TGA
@@ -13533,10 +13696,10 @@ fi
            eval "$wx_cv_use_iff"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_iff"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_IFF = yes; then
-              result=no
-            else
+            if test $wxUSE_IFF = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_IFF
              fi
            else
              result=$wxUSE_IFF
@@ -13577,10 +13740,10 @@ fi
            eval "$wx_cv_use_pnm"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_pnm"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_PNM = yes; then
-              result=no
-            else
+            if test $wxUSE_PNM = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_PNM
              fi
            else
              result=$wxUSE_PNM
@@ -13621,10 +13784,10 @@ fi
            eval "$wx_cv_use_xpm"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_xpm"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_XPM = yes; then
-              result=no
-            else
+            if test $wxUSE_XPM = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_XPM
              fi
            else
              result=$wxUSE_XPM
@@ -13665,10 +13828,10 @@ fi
            eval "$wx_cv_use_ico_cur"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_ico_cur"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_ICO_CUR = yes; then
-              result=no
-            else
+            if test $wxUSE_ICO_CUR = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_ICO_CUR
              fi
            else
              result=$wxUSE_ICO_CUR
@@ -13711,10 +13874,10 @@ fi
            eval "$wx_cv_use_dccache"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_dccache"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DC_CACHEING = yes; then
-              result=no
-            else
+            if test $wxUSE_DC_CACHEING = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DC_CACHEING
              fi
            else
              result=$wxUSE_DC_CACHEING
@@ -13755,10 +13918,10 @@ fi
            eval "$wx_cv_use_ps_in_msw"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_ps_in_msw"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then
-              result=no
-            else
+            if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
              fi
            else
              result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
@@ -13799,10 +13962,10 @@ fi
            eval "$wx_cv_use_ownerdrawn"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_ownerdrawn"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_OWNER_DRAWN = yes; then
-              result=no
-            else
+            if test $wxUSE_OWNER_DRAWN = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_OWNER_DRAWN
              fi
            else
              result=$wxUSE_OWNER_DRAWN
@@ -13843,10 +14006,10 @@ fi
            eval "$wx_cv_use_uxtheme"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_uxtheme"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_UXTHEME = yes; then
-              result=no
-            else
+            if test $wxUSE_UXTHEME = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_UXTHEME
              fi
            else
              result=$wxUSE_UXTHEME
@@ -13887,10 +14050,10 @@ fi
            eval "$wx_cv_use_wxdib"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_wxdib"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DIB = yes; then
-              result=no
-            else
+            if test $wxUSE_DIB = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DIB
              fi
            else
              result=$wxUSE_DIB
@@ -13936,10 +14099,10 @@ fi
            eval "$wx_cv_use_autoidman"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_autoidman"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_AUTOID_MANAGEMENT = yes; then
-              result=no
-            else
+            if test $wxUSE_AUTOID_MANAGEMENT = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_AUTOID_MANAGEMENT
              fi
            else
              result=$wxUSE_AUTOID_MANAGEMENT
@@ -18073,9 +18236,11 @@ echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
      fi
  fi
  
      fi
  fi
  
+
+if test "$wxUSE_MAC" = 1; then
+
  retest_macosx_linking=no
  
  retest_macosx_linking=no
  
-#if test "$wxUSE_MAC" = 1; then
      if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
                          if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
              # Implicitly turn on the new --with-macosx-sdk using the default
      if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
                          if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
              # Implicitly turn on the new --with-macosx-sdk using the default
@@ -18119,7 +18284,6 @@ echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_
  echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;}
          bk_use_pch=no
      fi
  echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;}
          bk_use_pch=no
      fi
-#fi
  
  if test "x$wxUSE_MACOSX_SDK" = "xno"; then
      wxUSE_MACOSX_SDK=
  
  if test "x$wxUSE_MACOSX_SDK" = "xno"; then
      wxUSE_MACOSX_SDK=
@@ -18178,9 +18342,42 @@ echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.pl
          wxUSE_MACOSX_VERSION_MIN=
      fi
  elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
          wxUSE_MACOSX_VERSION_MIN=
      fi
  elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
-    if test "$wxUSE_MAC" = 1; then
+    OSX_VERSION=`sw_vers -productVersion | grep 10.[0-9]`
+    if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then
          # otherwise configure stops on leopard for universal_binary
          wxUSE_MACOSX_VERSION_MIN=10.4
          # otherwise configure stops on leopard for universal_binary
          wxUSE_MACOSX_VERSION_MIN=10.4
+    else
+        # for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard
+        wxUSE_MACOSX_VERSION_MIN=10.5
+    fi
+fi
+
+NEEDS_GCC40="no"
+if test "x$wxUSE_MACOSX_VERSION_MIN" == "x10.4"; then
+    NEEDS_GCC40="yes"
+fi
+
+if test "$wxUSE_OSX_CARBON" = 1; then
+    NEEDS_GCC40="yes"
+fi
+
+if test "x$NEEDS_GCC40" == "xyes"; then
+    # gcc 4.2 cannot compile 10.4 compatible code, so if the user is using it
+    # and wants 10.4 compatible code, then 'downgrade' to 4.0
+    # This is also the simplest way to get 32-bit binaries on Snow Leopard.
+    if test "x$CC" = "xgcc"; then
+        CCVERSION=`$CC --version | grep 4.[2-9].`
+        if test "x$CCVERSION" != "x"; then
+            echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead."
+            CC="/usr/bin/gcc-4.0"
+        fi
+    fi
+
+    if test "x$CXX" = "xg++"; then
+        CCVERSION=`$CXX --version | grep 4.[2-9].`
+        if test "x$CCVERSION" != "x"; then
+            CXX="/usr/bin/g++-4.0"
+        fi
      fi
  fi
  
      fi
  fi
  
@@ -18320,7 +18517,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
  
  
  fi
  
-
+fi
  case "${host}" in
  
                  *-*-darwin* )
  case "${host}" in
  
                  *-*-darwin* )
@@ -25332,7 +25529,9 @@ SEARCH_INCLUDE="\
      /usr/local/include        \
      /usr/local/X11/include    \
      /usr/local/include/X11    \
      /usr/local/include        \
      /usr/local/X11/include    \
      /usr/local/include/X11    \
+    /usr/local/X11R7/include  \
      /usr/local/X11R6/include  \
      /usr/local/X11R6/include  \
+    /usr/local/include/X11R7  \
      /usr/local/include/X11R6  \
                                \
      /usr/Motif-2.1/include    \
      /usr/local/include/X11R6  \
                                \
      /usr/Motif-2.1/include    \
@@ -25344,9 +25543,11 @@ SEARCH_INCLUDE="\
                                \
      /usr/include/Xm           \
                                \
                                \
      /usr/include/Xm           \
                                \
+    /usr/X11R7/include        \
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
                                \
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
                                \
+    /usr/include/X11R7        \
      /usr/include/X11R6        \
                                \
      /usr/X11/include          \
      /usr/include/X11R6        \
                                \
      /usr/X11/include          \
@@ -33366,8 +33567,6 @@ echo "$as_me: WARNING: OpenGL libraries not available, disabling support for Ope
                  wxUSE_OPENGL=no
                  USE_OPENGL=0
              fi
                  wxUSE_OPENGL=no
                  USE_OPENGL=0
              fi
-        else
-                        wxUSE_OPENGL=yes
          fi
      else
          { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
          fi
      else
          { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
@@ -33375,6 +33574,10 @@ echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be
          wxUSE_OPENGL="no"
      fi
  
          wxUSE_OPENGL="no"
      fi
  
+    if test "$wxUSE_OPENGL" = "auto"; then
+                                wxUSE_OPENGL=yes
+    fi
+
      if test "$wxUSE_OPENGL" = "yes"; then
          USE_OPENGL=1
          cat >>confdefs.h <<\_ACEOF
      if test "$wxUSE_OPENGL" = "yes"; then
          USE_OPENGL=1
          cat >>confdefs.h <<\_ACEOF
@@ -33950,15 +34153,6 @@ if test "$wxUSE_UNICODE" = "yes"; then
      UNICODE=1
  fi
  
      UNICODE=1
  fi
  
-lib_debug_suffix=
-WX_DEBUGTYPE="release"
-DEBUG_FLAG=0
-if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-    lib_debug_suffix=d
-    WX_DEBUGTYPE="debug"
-    DEBUG_FLAG=1
-fi
-
  WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
  WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
  
  WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
  WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
  
@@ -33967,22 +34161,22 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then
      DEBUG_INFO=1
  fi
  
      DEBUG_INFO=1
  fi
  
-WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
  
  
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
  
  
-TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
+TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
  
  
  if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
  
  
  if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
-    WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
  else
  else
-    WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
  fi
  if test "${TOOLKIT_DIR}" = "os2"; then
  fi
  if test "${TOOLKIT_DIR}" = "os2"; then
-    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
  else
  else
-    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
  fi
  
  
  fi
  
  
@@ -40244,13 +40438,24 @@ echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
          fi
        fi
  
          fi
        fi
  
-            { echo "$as_me:$LINENO: checking for __thread keyword" >&5
+      if test "$wxUSE_COMPILER_TLS" = "auto"; then
+          if test "$USE_NETBSD" = 1; then
+              { echo "$as_me:$LINENO: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&5
+echo "$as_me: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&2;}
+              wxUSE_COMPILER_TLS=no
+          else
+              wxUSE_COMPILER_TLS=yes
+          fi
+      fi
+
+      if test "$wxUSE_COMPILER_TLS" = "yes"; then
+                    { echo "$as_me:$LINENO: checking for __thread keyword" >&5
  echo $ECHO_N "checking for __thread keyword... $ECHO_C" >&6; }
  if test "${wx_cv_cc___thread+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  echo $ECHO_N "checking for __thread keyword... $ECHO_C" >&6; }
  if test "${wx_cv_cc___thread+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-              cat >conftest.$ac_ext <<_ACEOF
+                  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -40261,8 +40466,8 @@ int
  main ()
  {
  
  main ()
  {
  
-                      static __thread int n = 0;
-                      static __thread int *p = 0;
+                          static __thread int n = 0;
+                          static __thread int *p = 0;
  
    ;
    return 0;
  
    ;
    return 0;
@@ -40301,7 +40506,7 @@ fi
  { echo "$as_me:$LINENO: result: $wx_cv_cc___thread" >&5
  echo "${ECHO_T}$wx_cv_cc___thread" >&6; }
  
  { echo "$as_me:$LINENO: result: $wx_cv_cc___thread" >&5
  echo "${ECHO_T}$wx_cv_cc___thread" >&6; }
  
-      if test "$wx_cv_cc___thread" = "yes"; then
+          if test "$wx_cv_cc___thread" = "yes"; then
  
    GXX_VERSION=""
  
  
    GXX_VERSION=""
  
@@ -40401,29 +40606,30 @@ fi
  
  
  
  
  
  
-          if test -n "$ax_cv_gxx_version"; then
-                                                                                                                              { echo "$as_me:$LINENO: checking whether __thread support in g++ is usable" >&5
+              if test -n "$ax_cv_gxx_version"; then
+                                                                                                                                                                  { echo "$as_me:$LINENO: checking whether __thread support in g++ is usable" >&5
  echo $ECHO_N "checking whether __thread support in g++ is usable... $ECHO_C" >&6; }
  echo $ECHO_N "checking whether __thread support in g++ is usable... $ECHO_C" >&6; }
-              case "$ax_cv_gxx_version" in
-                1.* | 2.* | 3.* )
-                    { echo "$as_me:$LINENO: result: no, it's broken" >&5
+                  case "$ax_cv_gxx_version" in
+                    1.* | 2.* | 3.* )
+                        { echo "$as_me:$LINENO: result: no, it's broken" >&5
  echo "${ECHO_T}no, it's broken" >&6; }
  echo "${ECHO_T}no, it's broken" >&6; }
-                    wx_cv_cc___thread=no
-                    ;;
-                *)
-                    { echo "$as_me:$LINENO: result: yes, it works" >&5
+                        wx_cv_cc___thread=no
+                        ;;
+                    *)
+                        { echo "$as_me:$LINENO: result: yes, it works" >&5
  echo "${ECHO_T}yes, it works" >&6; }
  echo "${ECHO_T}yes, it works" >&6; }
-                    ;;
-              esac
+                        ;;
+                  esac
+              fi
            fi
            fi
-      fi
  
  
-      if test "$wx_cv_cc___thread" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
+          if test "$wx_cv_cc___thread" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
  #define HAVE___THREAD_KEYWORD 1
  _ACEOF
  
  #define HAVE___THREAD_KEYWORD 1
  _ACEOF
  
-      fi
+          fi
+        fi
      fi
  
  else
      fi
  
  else
@@ -41434,13 +41640,7 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then
      fi
  fi
  
      fi
  fi
  
-if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define WXDEBUG 1
-_ACEOF
-
-    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__"
-else
+if test "$wxUSE_DEBUG_FLAG" = "no" ; then
      if test "$wxUSE_GTK" = 1 ; then
          if test "x$wxGTK_VERSION" = "x1" ; then
              CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
      if test "$wxUSE_GTK" = 1 ; then
          if test "x$wxGTK_VERSION" = "x1" ; then
              CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
@@ -42159,6 +42359,13 @@ _ACEOF
  
  fi
  
  
  fi
  
+if test "$wxUSE_ANY" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ANY 1
+_ACEOF
+
+fi
+
  if test "$wxUSE_APPLE_IEEE" = "yes"; then
    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_APPLE_IEEE 1
  if test "$wxUSE_APPLE_IEEE" = "yes"; then
    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_APPLE_IEEE 1
@@ -43099,6 +43306,7 @@ fi
                  { echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5
  echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
                          wxUSE_LIBHILDON="no"
                  { echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5
  echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
                          wxUSE_LIBHILDON="no"
+                        ac_hildon_lgpl=0
  
  
  elif test $pkg_failed = untried; then
  
  
  elif test $pkg_failed = untried; then
@@ -43106,6 +43314,7 @@ elif test $pkg_failed = untried; then
                  { echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5
  echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
                          wxUSE_LIBHILDON="no"
                  { echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5
  echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
                          wxUSE_LIBHILDON="no"
+                        ac_hildon_lgpl=0
  
  
  else
  
  
  else
@@ -43121,9 +43330,100 @@ echo "${ECHO_T}yes" >&6; }
  #define wxUSE_LIBHILDON 1
  _ACEOF
  
  #define wxUSE_LIBHILDON 1
  _ACEOF
  
+                ac_hildon_lgpl=1
+
+fi
+
+        if test "$ac_hildon_lgpl" = 0 ; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for HILDON2" >&5
+echo $ECHO_N "checking for HILDON2... $ECHO_C" >&6; }
  
  
+if test -n "$PKG_CONFIG"; then
+    if test -n "$HILDON2_CFLAGS"; then
+        pkg_cv_HILDON2_CFLAGS="$HILDON2_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\"") >&5
+  ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_HILDON2_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 >= 1.99" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$HILDON2_LIBS"; then
+        pkg_cv_HILDON2_LIBS="$HILDON2_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\"") >&5
+  ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_HILDON2_LIBS=`$PKG_CONFIG --libs "hildon-1 >= 1.99" 2>/dev/null`
+else
+  pkg_failed=yes
  fi
      fi
  fi
      fi
+else
+       pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               HILDON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 >= 1.99"`
+        else
+               HILDON2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 >= 1.99"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$HILDON2_PKG_ERRORS" >&5
+
+
+                    { echo "$as_me:$LINENO: WARNING: libhildon_1 not found" >&5
+echo "$as_me: WARNING: libhildon_1 not found" >&2;}
+                            wxUSE_LIBHILDON2="no"
+
+
+elif test $pkg_failed = untried; then
+
+                    { echo "$as_me:$LINENO: WARNING: libhildon_1 not found" >&5
+echo "$as_me: WARNING: libhildon_1 not found" >&2;}
+                            wxUSE_LIBHILDON2="no"
+
+
+else
+       HILDON2_CFLAGS=$pkg_cv_HILDON2_CFLAGS
+       HILDON2_LIBS=$pkg_cv_HILDON2_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+                    EXTRALIBS_HILDON="$HILDON2_LIBS"
+                    CFLAGS="$CFLAGS $HILDON2_CFLAGS"
+                    CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS"
+                    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBHILDON2 1
+_ACEOF
+
+
+fi
+        fi
+    fi
  fi
  
  if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
  fi
  
  if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
@@ -45693,6 +45993,13 @@ _ACEOF
  
  fi
  
  
  fi
  
+if test "$wxUSE_INFOBAR" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_INFOBAR 1
+_ACEOF
+
+fi
+
  if test "$wxUSE_LISTBOOK" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_LISTBOOK 1
  if test "$wxUSE_LISTBOOK" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_LISTBOOK 1
@@ -46192,6 +46499,16 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
  fi
  
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
  fi
  
+USE_RIBBON=0
+if test "$wxUSE_RIBBON" = "yes"; then
+   cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RIBBON 1
+_ACEOF
+
+   USE_RIBBON=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon"
+fi
+
  USE_STC=0
  if test "$wxUSE_STC" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
  USE_STC=0
  if test "$wxUSE_STC" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
@@ -46200,6 +46517,51 @@ _ACEOF
  
     USE_STC=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
  
     USE_STC=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
+
+      # Extract the first word of "python", so it can be a program name with args.
+set dummy python; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PYTHON+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PYTHON in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+  { echo "$as_me:$LINENO: result: $PYTHON" >&5
+echo "${ECHO_T}$PYTHON" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+   if test "x$PYTHON" = "x"; then
+     COND_PYTHON="#"
+   fi
+
  fi
  
  if test "$wxUSE_MENUS" = "yes"; then
  fi
  
  if test "$wxUSE_MENUS" = "yes"; then
@@ -46883,6 +47245,9 @@ if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_PROPGRID" = "yes" ; then
          BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
      fi
      if test "$wxUSE_PROPGRID" = "yes" ; then
          BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
      fi
+    if test "$wxUSE_RIBBON" = "yes" ; then
+        BUILT_WX_LIBS="ribbon $BUILT_WX_LIBS"
+    fi
      if test "$wxUSE_RICHTEXT" = "yes" ; then
          BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
      fi
      if test "$wxUSE_RICHTEXT" = "yes" ; then
          BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
      fi
@@ -46903,13 +47268,8 @@ fi
  
  
  if test "$wxUSE_MAC" = 1 ; then
  
  
  if test "$wxUSE_MAC" = 1 ; then
-    if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
-        if test "$USE_DARWIN" = 1; then
-            LDFLAGS="$LDFLAGS -framework QuickTime"
-        fi
-    fi
      if test "$USE_DARWIN" = 1; then
      if test "$USE_DARWIN" = 1; then
-        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
+        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime"
      fi
  fi
  if test "$wxUSE_COCOA" = 1 ; then
      fi
  fi
  if test "$wxUSE_COCOA" = 1 ; then
@@ -47053,6 +47413,10 @@ case ".$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" in
   ;;
  esac
  
   ;;
  esac
  
+
+                    if test "$wxUSE_MAC" = 1 ; then
+        CXXWARNINGS="$CXXWARNINGS -Wno-deprecated-declarations"
+    fi
  fi
  
  
  fi
  
  
@@ -47086,7 +47450,7 @@ EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
  EXTRALIBS_XML="$EXPAT_LINK"
  EXTRALIBS_HTML="$MSPACK_LINK"
  EXTRALIBS_MEDIA="$GST_LIBS"
  EXTRALIBS_XML="$EXPAT_LINK"
  EXTRALIBS_HTML="$MSPACK_LINK"
  EXTRALIBS_MEDIA="$GST_LIBS"
-EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
+EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
  if test "$wxUSE_GUI" = "yes"; then
      EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
  fi
  if test "$wxUSE_GUI" = "yes"; then
      EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
  fi
@@ -47118,7 +47482,7 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
  fi
  
  for i in $wxconfig_3rdparty ; do
  fi
  
  for i in $wxconfig_3rdparty ; do
-    WXCONFIG_LIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
+    WXCONFIG_LIBS="-lwx${i}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
  done
  
  
  done
  
  
@@ -47200,7 +47564,6 @@ fi
  
  
  
  
  
  
-
  
  
  TOOLKIT_LOWERCASE=xxx
  
  
  TOOLKIT_LOWERCASE=xxx
@@ -47243,6 +47606,9 @@ case "$TOOLKIT" in
              if test "$wxUSE_LIBHILDON" = "yes"; then
                  TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
              fi
              if test "$wxUSE_LIBHILDON" = "yes"; then
                  TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
              fi
+            if test "$wxUSE_LIBHILDON2" = "yes"; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
+            fi
  
              if test "$TOOLKIT_EXTRA" != ""; then
                  TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`"
  
              if test "$TOOLKIT_EXTRA" != ""; then
                  TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`"
@@ -49336,10 +49702,10 @@ fi
  
  
  
  
  
  
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.5"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.6"
  
  
  
  
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.5"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6"
  
  
  
  
  
  
@@ -49611,6 +49977,11 @@ EOF
          COND_BUILD_release_UNICODE_1=""
      fi
  
          COND_BUILD_release_UNICODE_1=""
      fi
  
+    COND_DEBUG_FLAG_0="#"
+    if test "x$DEBUG_FLAG" = "x0" ; then
+        COND_DEBUG_FLAG_0=""
+    fi
+
      COND_DEBUG_FLAG_1="#"
      if test "x$DEBUG_FLAG" = "x1" ; then
          COND_DEBUG_FLAG_1=""
      COND_DEBUG_FLAG_1="#"
      if test "x$DEBUG_FLAG" = "x1" ; then
          COND_DEBUG_FLAG_1=""
@@ -49686,6 +50057,11 @@ EOF
          COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
      fi
  
          COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
      fi
  
+    COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1=""
+    fi
+
      COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
      COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
@@ -49736,6 +50112,11 @@ EOF
          COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
      fi
  
          COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
      fi
  
+    COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1=""
+    fi
+
      COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
      COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
@@ -49786,6 +50167,11 @@ EOF
          COND_MONOLITHIC_0_USE_QA_1=""
      fi
  
          COND_MONOLITHIC_0_USE_QA_1=""
      fi
  
+    COND_MONOLITHIC_0_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_USE_RIBBON_1=""
+    fi
+
      COND_MONOLITHIC_0_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_USE_RICHTEXT_1=""
      COND_MONOLITHIC_0_USE_RICHTEXT_1="#"
      if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
          COND_MONOLITHIC_0_USE_RICHTEXT_1=""
@@ -50151,11 +50537,6 @@ EOF
          COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
      fi
  
          COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
      fi
  
-    COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
-    fi
-
      COND_TOOLKIT_OSX_COCOA="#"
      if test "x$TOOLKIT" = "xOSX_COCOA" ; then
          COND_TOOLKIT_OSX_COCOA=""
      COND_TOOLKIT_OSX_COCOA="#"
      if test "x$TOOLKIT" = "xOSX_COCOA" ; then
          COND_TOOLKIT_OSX_COCOA=""
@@ -50166,11 +50547,6 @@ EOF
          COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
      fi
  
          COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
      fi
  
-    COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
-    fi
-
      COND_TOOLKIT_OSX_IPHONE="#"
      if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
          COND_TOOLKIT_OSX_IPHONE=""
      COND_TOOLKIT_OSX_IPHONE="#"
      if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
          COND_TOOLKIT_OSX_IPHONE=""
@@ -50681,7 +51057,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
  
  
  
  
  
  
-
  
  
  { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
  
  
  { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
@@ -51322,7 +51697,7 @@ exec 6>&1
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
-This file was extended by wxWidgets $as_me 2.9.0, which was
+This file was extended by wxWidgets $as_me 2.9.1, which was
  generated by GNU Autoconf 2.61.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
  generated by GNU Autoconf 2.61.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
@@ -51375,7 +51750,7 @@ Report bugs to <bug-autoconf@gnu.org>."
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
-wxWidgets config.status 2.9.0
+wxWidgets config.status 2.9.1
  configured by $0, generated by GNU Autoconf 2.61,
    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
  configured by $0, generated by GNU Autoconf 2.61,
    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
@@ -51662,10 +52037,10 @@ GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
  GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
  HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
  HILDON_LIBS!$HILDON_LIBS$ac_delim
  GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
  HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
  HILDON_LIBS!$HILDON_LIBS$ac_delim
-CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
-CAIRO_LIBS!$CAIRO_LIBS$ac_delim
-GST_CFLAGS!$GST_CFLAGS$ac_delim
-GST_LIBS!$GST_LIBS$ac_delim
+HILDON2_CFLAGS!$HILDON2_CFLAGS$ac_delim
+HILDON2_LIBS!$HILDON2_LIBS$ac_delim
+PYTHON!$PYTHON$ac_delim
+COND_PYTHON!$COND_PYTHON$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
@@ -51707,6 +52082,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
+CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
+CAIRO_LIBS!$CAIRO_LIBS$ac_delim
+GST_CFLAGS!$GST_CFLAGS$ac_delim
+GST_LIBS!$GST_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
  ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim
  BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim
  STD_BASE_LIBS!$STD_BASE_LIBS$ac_delim
@@ -51739,7 +52118,6 @@ EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
  EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim
  EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim
  UNICODE!$UNICODE$ac_delim
  EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim
  EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim
  UNICODE!$UNICODE$ac_delim
-BUILD!$BUILD$ac_delim
  DEBUG_INFO!$DEBUG_INFO$ac_delim
  DEBUG_FLAG!$DEBUG_FLAG$ac_delim
  TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
  DEBUG_INFO!$DEBUG_INFO$ac_delim
  DEBUG_FLAG!$DEBUG_FLAG$ac_delim
  TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
@@ -51801,9 +52179,6 @@ REZ!$REZ$ac_delim
  SETFILE!$SETFILE$ac_delim
  OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim
  GCC_PCH!$GCC_PCH$ac_delim
  SETFILE!$SETFILE$ac_delim
  OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim
  GCC_PCH!$GCC_PCH$ac_delim
-ICC_PCH!$ICC_PCH$ac_delim
-ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
-ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$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
@@ -51845,6 +52220,9 @@ _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
+ICC_PCH!$ICC_PCH$ac_delim
+ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
+ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$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
@@ -51864,6 +52242,7 @@ 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
+COND_DEBUG_FLAG_0!$COND_DEBUG_FLAG_0$ac_delim
  COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
  COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim
  COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim
  COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
  COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim
  COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim
@@ -51879,6 +52258,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim
+COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
@@ -51889,6 +52269,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim
+COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
@@ -51899,6 +52280,7 @@ COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
  COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim
  COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
  COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
  COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim
  COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
+COND_MONOLITHIC_0_USE_RIBBON_1!$COND_MONOLITHIC_0_USE_RIBBON_1$ac_delim
  COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim
  COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
  COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
  COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim
@@ -51935,13 +52317,6 @@ COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
  COND_SHARED_0!$COND_SHARED_0$ac_delim
  COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
  COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
  COND_SHARED_0!$COND_SHARED_0$ac_delim
  COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
  COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
-COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
-COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
-COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
-COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
-COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
-COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$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
@@ -51983,6 +52358,13 @@ _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_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
+COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
+COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
+COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
  COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
  COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim
  COND_SHARED_1!$COND_SHARED_1$ac_delim
  COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
  COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim
  COND_SHARED_1!$COND_SHARED_1$ac_delim
@@ -52013,10 +52395,8 @@ COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_deli
  COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim
  COND_TOOLKIT_OSX_CARBON!$COND_TOOLKIT_OSX_CARBON$ac_delim
  COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
  COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim
  COND_TOOLKIT_OSX_CARBON!$COND_TOOLKIT_OSX_CARBON$ac_delim
  COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
-COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
  COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim
  COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
  COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim
  COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
-COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
  COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim
  COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
  COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
  COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim
  COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
  COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
@@ -52075,11 +52455,6 @@ DEREZ!$DEREZ$ac_delim
  SHARED!$SHARED$ac_delim
  WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
  WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
  SHARED!$SHARED$ac_delim
  WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
  WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
-USE_GUI!$USE_GUI$ac_delim
-AFMINSTALL!$AFMINSTALL$ac_delim
-WIN32INSTALL!$WIN32INSTALL$ac_delim
-TOOLKIT!$TOOLKIT$ac_delim
-TOOLKIT_DIR!$TOOLKIT_DIR$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
@@ -52121,6 +52496,11 @@ _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
+USE_GUI!$USE_GUI$ac_delim
+AFMINSTALL!$AFMINSTALL$ac_delim
+WIN32INSTALL!$WIN32INSTALL$ac_delim
+TOOLKIT!$TOOLKIT$ac_delim
+TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
  TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
  TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
  cross_compiling!$cross_compiling$ac_delim
  TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
  TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
  cross_compiling!$cross_compiling$ac_delim
@@ -52129,7 +52509,6 @@ WX_RELEASE!$WX_RELEASE$ac_delim
  WX_VERSION!$WX_VERSION$ac_delim
  WX_SUBVERSION!$WX_SUBVERSION$ac_delim
  WX_CHARTYPE!$WX_CHARTYPE$ac_delim
  WX_VERSION!$WX_VERSION$ac_delim
  WX_SUBVERSION!$WX_SUBVERSION$ac_delim
  WX_CHARTYPE!$WX_CHARTYPE$ac_delim
-WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim
  WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
  WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
  WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
  WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
  WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
  WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
@@ -52159,7 +52538,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` = 36; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; 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
@@ -52790,8 +53169,6 @@ echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
  echo ""
  echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_DESC}"
  echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
  echo ""
  echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_DESC}"
  echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
-
-echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
  echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
  echo $ECHO_N "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}$ECHO_C"
  if test "$wxUSE_UNICODE" = "yes"; then
  echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
  echo $ECHO_N "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}$ECHO_C"
  if test "$wxUSE_UNICODE" = "yes"; then