No changes, just fix unused variables and parameters warnings.

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

index c194d90ab8b5a0b6df710ba617bbf677c80027f2..1f79fa0aeb8aaf0cb9636839b23fe546dd1ea879 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: configure.in 61278 2009-07-02 09:00:20Z VZ .
  # 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"
@@ -1578,7 +1578,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 +1647,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
  
@@ -1693,6 +1693,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
@@ -2051,7 +2052,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 +2066,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 +2548,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 +2883,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* )
@@ -2930,6 +2924,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 +2971,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 +3015,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 +3059,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 +3153,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 +3206,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 +3258,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 +3389,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 +3439,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
@@ -4355,10 +4350,10 @@ fi
            eval "$wx_cv_use_shared"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_shared"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SHARED = yes; then
-              result=no
-            else
+            if test $wxUSE_SHARED = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_SHARED
              fi
            else
              result=$wxUSE_SHARED
@@ -4399,10 +4394,10 @@ fi
            eval "$wx_cv_use_debug"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_debug"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DEBUG
              fi
            else
              result=$wxUSE_DEBUG
@@ -4443,10 +4438,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 +4482,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 +4526,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 +4570,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 +4614,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 +4679,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 +4723,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,10 +4769,10 @@ 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
+            else
+              result=no
              fi
            else
              result=$wxUSE_OMF
              fi
            else
              result=$wxUSE_OMF
@@ -4830,10 +4825,10 @@ fi
            eval "$wx_cv_use_debug_flag"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_debug_flag"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_FLAG = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUG_FLAG = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DEBUG_FLAG
              fi
            else
              result=$wxUSE_DEBUG_FLAG
@@ -4874,10 +4869,10 @@ fi
            eval "$wx_cv_use_debug_info"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_debug_info"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_INFO = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUG_INFO = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DEBUG_INFO
              fi
            else
              result=$wxUSE_DEBUG_INFO
@@ -4928,10 +4923,10 @@ 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
+            else
+              result=no
              fi
            else
              result=$wxUSE_OPTIMISE
              fi
            else
              result=$wxUSE_OPTIMISE
@@ -4973,10 +4968,10 @@ fi
            eval "$wx_cv_use_debug_gdb"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_debug_gdb"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_GDB = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUG_GDB = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DEBUG_GDB
              fi
            else
              result=$wxUSE_DEBUG_GDB
@@ -5017,10 +5012,10 @@ fi
            eval "$wx_cv_use_debug_cntxt"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_debug_cntxt"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_CONTEXT = yes; then
-              result=no
-            else
+            if test $wxUSE_DEBUG_CONTEXT = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_DEBUG_CONTEXT
              fi
            else
              result=$wxUSE_DEBUG_CONTEXT
@@ -5061,10 +5056,10 @@ fi
            eval "$wx_cv_use_mem_tracing"
  
            if test x"$enablestring" = xdisable; then
            eval "$wx_cv_use_mem_tracing"
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MEM_TRACING = yes; then
-              result=no
-            else
+            if test $wxUSE_MEM_TRACING = no; then
                result=yes
                result=yes
+            else
+              result=no
              fi
            else
              result=$wxUSE_MEM_TRACING
              fi
            else
              result=$wxUSE_MEM_TRACING
@@ -5105,10 +5100,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 +5144,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 +5188,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 +5232,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 +5276,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 +5320,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 +5386,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 +5430,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 +5475,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 +5520,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 +5565,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 +5578,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 +5655,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 +5699,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 +5743,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 +5788,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 +5832,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 +5876,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 +5920,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 +5964,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 +6008,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 +6052,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 +6096,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 +6141,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 +6186,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 +6230,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 +6274,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
@@ -6280,10 +6319,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 +6363,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 +6407,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 +6451,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 +6495,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 +6539,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 +6583,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 +6627,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 +6671,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 +6715,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 +6759,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 +6803,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 +6847,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 +6891,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 +6935,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 +6979,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 +7023,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 +7067,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 +7111,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 +7155,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 +7199,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 +7243,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 +7287,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 +7331,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 +7375,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 +7419,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 +7463,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 +7507,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 +7551,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 +7595,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 +7639,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 +7683,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 +7727,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 +7771,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 +7815,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 +7859,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 +7903,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 +7948,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 +7992,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 +8036,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 +8080,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 +8124,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 +8169,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 +8214,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 +8258,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 +8306,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 +8350,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 +8394,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 +8438,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 +8482,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 +8526,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 +8570,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 +8614,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
@@ -8619,10 +8658,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 +8702,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 +8746,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 +8790,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 +8834,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 +8878,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 +8922,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 +8966,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 +9010,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 +9054,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 +9098,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 +9142,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 +9186,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 +9230,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 +9274,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 +9320,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 +9364,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 +9408,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 +9455,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 +9557,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 +9601,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 +9645,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 +9689,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 +9733,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 +9777,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 +9821,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 +9865,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 +9909,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 +9953,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 +9997,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 +10041,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 +10085,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 +10129,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 +10173,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 +10217,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 +10261,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 +10305,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 +10349,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 +10393,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 +10437,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 +10481,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 +10525,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 +10569,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 +10613,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 +10657,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 +10701,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 +10745,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 +10789,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
@@ -10794,10 +10833,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 +10877,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 +10921,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 +10965,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 +11009,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 +11053,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 +11097,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 +11141,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 +11185,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 +11229,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 +11273,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 +11317,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 +11361,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 +11405,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 +11449,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 +11493,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 +11537,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 +11581,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 +11625,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 +11669,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 +11713,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 +11757,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 +11801,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 +11845,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 +11889,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 +11933,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 +11977,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 +12021,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 +12065,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 +12109,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 +12153,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 +12199,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 +12243,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 +12287,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 +12331,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 +12375,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 +12419,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 +12463,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 +12507,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 +12551,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 +12595,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 +12639,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 +12683,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 +12727,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 +12771,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 +12815,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 +12861,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 +12905,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 +12949,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 +12993,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 +13037,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 +13081,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 +13125,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 +13169,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 +13213,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 +13257,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 +13301,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 +13347,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 +13391,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 +13435,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 +13479,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 +13523,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 +13567,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 +13611,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 +13655,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 +13699,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 +13745,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 +13789,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 +13833,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 +13877,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 +13921,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 +13970,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
@@ -25327,7 +25366,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 +25380,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 +33404,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 +33411,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
@@ -40239,13 +40284,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 +40312,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 +40352,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 +40452,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
@@ -47093,6 +47150,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
  
  
@@ -51352,7 +51413,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 +51466,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'`\\"