Make sure all Bakefile formats that use CRLF line feeds are set to use CRLF in SVN.

[wxWidgets.git] / configure

diff --git a/configure b/configure
index c194d90ab8b5a0b6df710ba617bbf677c80027f2..aecc77a4104b4207216fa37f9c389dafe338a651 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 #! /bin/sh

-# From configure.in Id: configure.in 60470 2009-05-02 12:52:54Z 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,8 @@ GNOMEVFS_CFLAGS
 GNOMEVFS_LIBS
 HILDON_CFLAGS
 HILDON_LIBS
 GNOMEVFS_LIBS
 HILDON_CFLAGS
 HILDON_LIBS

+HILDON2_CFLAGS
+HILDON2_LIBS

 PYTHON
 COND_PYTHON
 CAIRO_CFLAGS
 PYTHON
 COND_PYTHON
 CAIRO_CFLAGS


@@ -747,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


@@ -800,7 +801,7 @@ USE_SOVERLINUX
 USE_SOVERSOLARIS
 USE_SOVERCYGWIN
 USE_MACVERSION
 USE_SOVERSOLARIS
 USE_SOVERCYGWIN
 USE_MACVERSION

-USE_SOSYMLINKS
+USE_SOTWOSYMLINKS

 SONAME_FLAG
 DEPS_TRACKING
 BK_DEPS
 SONAME_FLAG
 DEPS_TRACKING
 BK_DEPS


@@ -831,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


@@ -846,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


@@ -856,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


@@ -866,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


@@ -970,10 +975,11 @@ COND_USE_PCH_1
 COND_USE_PLUGINS_0
 COND_USE_RTTI_0
 COND_USE_RTTI_1
 COND_USE_PLUGINS_0
 COND_USE_RTTI_0
 COND_USE_RTTI_1

-COND_USE_SOSYMLINKS_1
+COND_USE_SOTWOSYMLINKS_1

 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1
 COND_USE_SOVERLINUX_1
 COND_USE_SOVERSION_0
 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1
 COND_USE_SOVERLINUX_1
 COND_USE_SOVERSION_0

+COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1

 COND_USE_SOVERSOLARIS_1
 COND_USE_STC_1
 COND_USE_THREADS_0
 COND_USE_SOVERSOLARIS_1
 COND_USE_STC_1
 COND_USE_THREADS_0


@@ -1012,7 +1018,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 +1076,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 +1585,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 +1654,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 +1671,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 +1687,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 +1700,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 +1716,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 +1770,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 +1819,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 +1931,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 +1992,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 +2066,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 +2080,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 +2562,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 +2897,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 +2927,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 +2939,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 +2986,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 +3030,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 +3074,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 +3168,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 +3221,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 +3273,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 +3404,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 +3454,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 +4333,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 +4387,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 +4521,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 +4676,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 +4720,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 +4764,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 +4808,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 +4852,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 +4917,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 +4961,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 +5007,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 +5053,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 +5098,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 +5142,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 +5186,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 +5230,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 +5274,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 +5318,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 +5384,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 +5428,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


@@ -5480,10 +5473,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


@@ -5525,10 +5518,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


@@ -5570,10 +5563,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


@@ -5583,6 +5576,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=


@@ -5616,10 +5653,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


@@ -5660,10 +5697,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


@@ -5704,10 +5741,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


@@ -5749,10 +5786,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


@@ -5793,10 +5830,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


@@ -5837,10 +5874,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


@@ -5881,10 +5918,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


@@ -5925,10 +5962,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


@@ -5969,10 +6006,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


@@ -6013,10 +6050,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


@@ -6057,10 +6094,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


@@ -6102,10 +6139,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


@@ -6147,10 +6184,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


@@ -6191,10 +6228,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


@@ -6235,10 +6272,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


@@ -6249,6 +6286,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


@@ -6280,10 +6361,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


@@ -6324,10 +6405,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


@@ -6368,10 +6449,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


@@ -6412,10 +6493,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


@@ -6456,10 +6537,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


@@ -6500,10 +6581,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


@@ -6544,10 +6625,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


@@ -6588,10 +6669,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


@@ -6632,10 +6713,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


@@ -6676,10 +6757,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


@@ -6720,10 +6801,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


@@ -6764,10 +6845,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


@@ -6808,10 +6889,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


@@ -6852,10 +6933,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


@@ -6896,10 +6977,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


@@ -6940,10 +7021,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


@@ -6984,10 +7065,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


@@ -7028,10 +7109,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


@@ -7072,10 +7153,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


@@ -7116,10 +7197,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


@@ -7160,10 +7241,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


@@ -7204,10 +7285,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


@@ -7248,10 +7329,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


@@ -7292,10 +7373,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


@@ -7336,10 +7417,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


@@ -7380,10 +7461,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


@@ -7424,10 +7505,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


@@ -7468,10 +7549,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


@@ -7512,10 +7593,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


@@ -7556,10 +7637,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


@@ -7600,10 +7681,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


@@ -7644,10 +7725,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


@@ -7688,10 +7769,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


@@ -7732,10 +7813,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


@@ -7776,10 +7857,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


@@ -7820,10 +7901,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


@@ -7864,10 +7945,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


@@ -7909,10 +7990,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


@@ -7953,10 +8034,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


@@ -7997,10 +8078,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


@@ -8041,10 +8122,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


@@ -8085,10 +8166,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


@@ -8130,10 +8211,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


@@ -8175,10 +8256,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


@@ -8219,10 +8300,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


@@ -8267,10 +8348,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


@@ -8311,10 +8392,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


@@ -8355,10 +8436,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


@@ -8399,10 +8480,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


@@ -8443,10 +8524,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


@@ -8487,10 +8568,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


@@ -8531,10 +8612,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


@@ -8575,10 +8656,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


@@ -8588,6 +8669,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


@@ -8619,10 +8744,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


@@ -8663,10 +8788,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


@@ -8707,10 +8832,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


@@ -8751,10 +8876,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


@@ -8795,10 +8920,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


@@ -8839,10 +8964,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


@@ -8883,10 +9008,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


@@ -8927,10 +9052,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


@@ -8971,10 +9096,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


@@ -9015,10 +9140,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


@@ -9059,10 +9184,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


@@ -9103,10 +9228,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


@@ -9147,10 +9272,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


@@ -9191,10 +9316,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


@@ -9235,10 +9360,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


@@ -9281,10 +9406,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


@@ -9325,10 +9450,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


@@ -9369,10 +9494,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


@@ -9416,10 +9541,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


@@ -9518,10 +9643,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


@@ -9562,10 +9687,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


@@ -9606,10 +9731,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


@@ -9650,10 +9775,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


@@ -9694,10 +9819,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


@@ -9738,10 +9863,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


@@ -9782,10 +9907,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


@@ -9826,10 +9951,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


@@ -9870,10 +9995,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


@@ -9914,10 +10039,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


@@ -9958,10 +10083,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


@@ -10002,10 +10127,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


@@ -10046,10 +10171,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


@@ -10090,10 +10215,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


@@ -10134,10 +10259,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


@@ -10178,10 +10303,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


@@ -10222,10 +10347,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


@@ -10266,10 +10391,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


@@ -10310,10 +10435,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


@@ -10354,10 +10479,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


@@ -10398,10 +10523,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


@@ -10442,10 +10567,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


@@ -10486,10 +10611,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


@@ -10530,10 +10655,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


@@ -10574,10 +10699,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


@@ -10618,10 +10743,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


@@ -10662,10 +10787,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


@@ -10706,10 +10831,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


@@ -10750,10 +10875,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


@@ -10763,6 +10888,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


@@ -10794,10 +10963,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


@@ -10838,10 +11007,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


@@ -10882,10 +11051,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


@@ -10926,10 +11095,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


@@ -10970,10 +11139,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


@@ -11014,10 +11183,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


@@ -11058,10 +11227,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


@@ -11102,10 +11271,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


@@ -11146,10 +11315,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


@@ -11190,10 +11359,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


@@ -11234,10 +11403,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


@@ -11278,10 +11447,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


@@ -11322,10 +11491,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


@@ -11366,10 +11535,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


@@ -11410,10 +11579,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


@@ -11454,10 +11623,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


@@ -11498,10 +11667,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


@@ -11542,10 +11711,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


@@ -11586,10 +11755,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


@@ -11630,10 +11799,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


@@ -11674,10 +11843,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


@@ -11718,10 +11887,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


@@ -11762,10 +11931,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


@@ -11806,10 +11975,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


@@ -11850,10 +12019,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


@@ -11894,10 +12063,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


@@ -11938,10 +12107,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


@@ -11982,10 +12151,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


@@ -12026,10 +12195,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


@@ -12070,10 +12239,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


@@ -12114,10 +12283,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


@@ -12160,10 +12329,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


@@ -12204,10 +12373,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


@@ -12248,10 +12417,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


@@ -12292,10 +12461,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


@@ -12336,10 +12505,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


@@ -12380,10 +12549,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


@@ -12424,10 +12593,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


@@ -12468,10 +12637,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


@@ -12512,10 +12681,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


@@ -12556,10 +12725,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


@@ -12600,10 +12769,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


@@ -12644,10 +12813,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


@@ -12688,10 +12857,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


@@ -12732,10 +12901,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


@@ -12776,10 +12945,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


@@ -12822,10 +12991,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


@@ -12866,10 +13035,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


@@ -12910,10 +13079,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


@@ -12954,10 +13123,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


@@ -12998,10 +13167,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


@@ -13042,10 +13211,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


@@ -13086,10 +13255,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


@@ -13130,10 +13299,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


@@ -13174,10 +13343,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


@@ -13218,10 +13387,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


@@ -13262,10 +13431,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


@@ -13308,10 +13477,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


@@ -13352,10 +13521,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


@@ -13396,10 +13565,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


@@ -13440,10 +13609,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


@@ -13484,10 +13653,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


@@ -13528,10 +13697,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


@@ -13572,10 +13741,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


@@ -13616,10 +13785,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


@@ -13660,10 +13829,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


@@ -13706,10 +13875,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


@@ -13750,10 +13919,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


@@ -13794,10 +13963,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


@@ -13838,10 +14007,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


@@ -13882,10 +14051,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


@@ -13931,10 +14100,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


@@ -18068,9 +18237,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


@@ -18114,7 +18285,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=


@@ -18173,9 +18343,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
 


@@ -18315,7 +18518,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
 
 
 fi
 

-
+fi

 case "${host}" in
 
                 *-*-darwin* )
 case "${host}" in
 
                 *-*-darwin* )


@@ -25327,7 +25530,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    \


@@ -25339,9 +25544,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          \


@@ -33361,8 +33568,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


@@ -33370,6 +33575,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


@@ -33945,15 +34154,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 '-' '_'`
 


@@ -33962,22 +34162,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
 
 


@@ -40239,13 +40439,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


@@ -40256,8 +40467,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;


@@ -40296,7 +40507,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=""
 


@@ -40396,29 +40607,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


@@ -41429,13 +41641,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"


@@ -42154,6 +42360,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


@@ -43094,6 +43307,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


@@ -43101,6 +43315,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


@@ -43116,8 +43331,99 @@ 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
+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
 fi
 
     fi
 fi
 


@@ -45688,6 +45994,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


@@ -46187,6 +46500,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


@@ -46923,6 +47246,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


@@ -46943,13 +47269,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


@@ -47093,6 +47414,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
 
 


@@ -47126,7 +47451,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


@@ -47158,7 +47483,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
 
 


@@ -47240,7 +47565,6 @@ fi
 
 
 
 
 
 

-

 
 
 TOOLKIT_LOWERCASE=xxx
 
 
 TOOLKIT_LOWERCASE=xxx


@@ -47283,6 +47607,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 ' '`"


@@ -48946,7 +49273,7 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
     USE_SOVERLINUX=0
     USE_SOVERSOLARIS=0
     USE_SOVERCYGWIN=0
     USE_SOVERLINUX=0
     USE_SOVERSOLARIS=0
     USE_SOVERCYGWIN=0

-    USE_SOSYMLINKS=0
+    USE_SOTWOSYMLINKS=0

     USE_MACVERSION=0
     SONAME_FLAG=
 
     USE_MACVERSION=0
     SONAME_FLAG=
 


@@ -48960,20 +49287,19 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
         fi
         USE_SOVERSION=1
         USE_SOVERLINUX=1
         fi
         USE_SOVERSION=1
         USE_SOVERLINUX=1

-        USE_SOSYMLINKS=1
+        USE_SOTWOSYMLINKS=1

       ;;
 
       *-*-solaris2* )
         SONAME_FLAG="-h "
         USE_SOVERSION=1
         USE_SOVERSOLARIS=1
       ;;
 
       *-*-solaris2* )
         SONAME_FLAG="-h "
         USE_SOVERSION=1
         USE_SOVERSOLARIS=1

-        USE_SOSYMLINKS=1

       ;;
 
       *-*-darwin* )
         USE_MACVERSION=1
         USE_SOVERSION=1
       ;;
 
       *-*-darwin* )
         USE_MACVERSION=1
         USE_SOVERSION=1

-        USE_SOSYMLINKS=1
+        USE_SOTWOSYMLINKS=1

       ;;
 
       *-*-cygwin* )
       ;;
 
       *-*-cygwin* )


@@ -49651,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=""


@@ -49726,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=""


@@ -49776,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=""


@@ -49826,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=""


@@ -50346,9 +50692,9 @@ EOF
         COND_USE_RTTI_1=""
     fi
 
         COND_USE_RTTI_1=""
     fi
 

-    COND_USE_SOSYMLINKS_1="#"
-    if test "x$USE_SOSYMLINKS" = "x1" ; then
-        COND_USE_SOSYMLINKS_1=""
+    COND_USE_SOTWOSYMLINKS_1="#"
+    if test "x$USE_SOTWOSYMLINKS" = "x1" ; then
+        COND_USE_SOTWOSYMLINKS_1=""

     fi
 
     COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#"
     fi
 
     COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#"


@@ -50366,6 +50712,11 @@ EOF
         COND_USE_SOVERSION_0=""
     fi
 
         COND_USE_SOVERSION_0=""
     fi
 

+    COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1="#"
+    if test "x$USE_SOVERSION" = "x1" -a "x$USE_SOVERSOLARIS" = "x1" ; then
+        COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1=""
+    fi
+

     COND_USE_SOVERSOLARIS_1="#"
     if test "x$USE_SOVERSOLARIS" = "x1" ; then
         COND_USE_SOVERSOLARIS_1=""
     COND_USE_SOVERSOLARIS_1="#"
     if test "x$USE_SOVERSOLARIS" = "x1" ; then
         COND_USE_SOVERSOLARIS_1=""


@@ -50711,7 +51062,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


@@ -51352,7 +51702,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


@@ -51405,7 +51755,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'`\\"
 


@@ -51692,10 +52042,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

+HILDON2_CFLAGS!$HILDON2_CFLAGS$ac_delim
+HILDON2_LIBS!$HILDON2_LIBS$ac_delim

 PYTHON!$PYTHON$ac_delim
 COND_PYTHON!$COND_PYTHON$ac_delim
 PYTHON!$PYTHON$ac_delim
 COND_PYTHON!$COND_PYTHON$ac_delim

-CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
-CAIRO_LIBS!$CAIRO_LIBS$ac_delim

 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then


@@ -51737,6 +52087,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF

+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
 GST_CFLAGS!$GST_CFLAGS$ac_delim
 GST_LIBS!$GST_LIBS$ac_delim
 ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim


@@ -51771,7 +52123,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


@@ -51824,7 +52175,7 @@ USE_SOVERLINUX!$USE_SOVERLINUX$ac_delim
 USE_SOVERSOLARIS!$USE_SOVERSOLARIS$ac_delim
 USE_SOVERCYGWIN!$USE_SOVERCYGWIN$ac_delim
 USE_MACVERSION!$USE_MACVERSION$ac_delim
 USE_SOVERSOLARIS!$USE_SOVERSOLARIS$ac_delim
 USE_SOVERCYGWIN!$USE_SOVERCYGWIN$ac_delim
 USE_MACVERSION!$USE_MACVERSION$ac_delim

-USE_SOSYMLINKS!$USE_SOSYMLINKS$ac_delim
+USE_SOTWOSYMLINKS!$USE_SOTWOSYMLINKS$ac_delim

 SONAME_FLAG!$SONAME_FLAG$ac_delim
 DEPS_TRACKING!$DEPS_TRACKING$ac_delim
 BK_DEPS!$BK_DEPS$ac_delim
 SONAME_FLAG!$SONAME_FLAG$ac_delim
 DEPS_TRACKING!$DEPS_TRACKING$ac_delim
 BK_DEPS!$BK_DEPS$ac_delim


@@ -51833,7 +52184,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

 _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


@@ -51875,6 +52225,7 @@ _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
 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


@@ -51896,6 +52247,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


@@ -51911,6 +52263,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


@@ -51921,6 +52274,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


@@ -51931,6 +52285,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


@@ -51967,11 +52322,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

 _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


@@ -52013,6 +52363,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

+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_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


@@ -52076,10 +52431,11 @@ COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
 COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
 COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
 COND_USE_RTTI_1!$COND_USE_RTTI_1$ac_delim
 COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
 COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
 COND_USE_RTTI_1!$COND_USE_RTTI_1$ac_delim

-COND_USE_SOSYMLINKS_1!$COND_USE_SOSYMLINKS_1$ac_delim
+COND_USE_SOTWOSYMLINKS_1!$COND_USE_SOTWOSYMLINKS_1$ac_delim

 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim
 COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
 COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim
 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim
 COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
 COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim

+COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1!$COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1$ac_delim

 COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
 COND_USE_STC_1!$COND_USE_STC_1$ac_delim
 COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim
 COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
 COND_USE_STC_1!$COND_USE_STC_1$ac_delim
 COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim


@@ -52104,12 +52460,6 @@ COND_wxUSE_ZLIB_builtin!$COND_wxUSE_ZLIB_builtin$ac_delim
 DEREZ!$DEREZ$ac_delim
 SHARED!$SHARED$ac_delim
 WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
 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
-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


@@ -52151,6 +52501,12 @@ _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

+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

 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


@@ -52159,7 +52515,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


@@ -52189,7 +52544,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` = 41; 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


@@ -52820,8 +53175,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