Patch from Bo to speed up FindNode() in internal data tree structure (GTK)

[wxWidgets.git] / configure

diff --git a/configure b/configure
index eb9130508966074e11b5d8cf31a6fe35c885b582..f5af2c1380e04fdd0a65508eaea49c057b7028e7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 47617 2007-07-21 13:01:28Z VZ .
+# From configure.in Id: configure.in 47631 2007-07-21 23:22:56Z VZ .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -1848,6 +1848,7 @@ Optional Features:
   --enable-icocur         use Windows ICO and CUR formats
   --enable-dccache        cache temporary wxDC objects (Win32 only)
   --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)
+  --enable-ownerdrawn     use owner drawn controls (Win32 only)
   --enable-regkey         use wxRegKey class (Win32 only)
   --enable-uxtheme        enable support for Windows XP themed look (Win32 only)
   --enable-wxdib          use wxDIB class (Win32 only)
@@ -2990,6 +2991,7 @@ if test "${enable_gui+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -3043,6 +3045,7 @@ if test "${enable_monolithic+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -3096,6 +3099,7 @@ if test "${enable_plugins+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -3149,6 +3153,7 @@ if test "${with_subdirs+set}" = set; then
 
 else
 
+                        cache=no
                         LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -3160,7 +3165,7 @@ fi
 
 
           eval "$wx_cv_use_subdirs"
-          if test "x$cache" != xyes; then
+          if test "x$cache" = xyes; then
             echo "wxWITH_SUBDIRS=$wxWITH_SUBDIRS" >> ${wx_arg_cache_file}.tmp
           fi
 
@@ -3208,6 +3213,7 @@ if test "${enable_official_build+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -3270,6 +3276,7 @@ if test "${enable_all_features+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -3327,6 +3334,7 @@ if test "${enable_universal+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -3455,6 +3463,7 @@ if test "${enable_nanox+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -3514,6 +3523,7 @@ if test "${enable_gpe+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -3568,6 +3578,7 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -3625,6 +3636,7 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -3682,6 +3694,7 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -3739,6 +3752,7 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -3797,6 +3811,7 @@ if test "${with_libmspack+set}" = set; then
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -3808,7 +3823,7 @@ fi
 
 
           eval "$wx_cv_use_libmspack"
-          if test "x$cache" != xyes; then
+          if test "x$cache" = xyes; then
             echo "wxUSE_LIBMSPACK=$wxUSE_LIBMSPACK" >> ${wx_arg_cache_file}.tmp
           fi
 
@@ -3850,6 +3865,7 @@ if test "${with_gnomeprint+set}" = set; then
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -3861,7 +3877,7 @@ fi
 
 
           eval "$wx_cv_use_gnomeprint"
-          if test "x$cache" != xyes; then
+          if test "x$cache" = xyes; then
             echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${wx_arg_cache_file}.tmp
           fi
 
@@ -3903,6 +3919,7 @@ if test "${with_gnomevfs+set}" = set; then
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -3914,7 +3931,7 @@ fi
 
 
           eval "$wx_cv_use_gnomevfs"
-          if test "x$cache" != xyes; then
+          if test "x$cache" = xyes; then
             echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${wx_arg_cache_file}.tmp
           fi
 
@@ -3956,6 +3973,7 @@ if test "${with_hildon+set}" = set; then
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -3967,7 +3985,7 @@ fi
 
 
           eval "$wx_cv_use_hildon"
-          if test "x$cache" != xyes; then
+          if test "x$cache" = xyes; then
             echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${wx_arg_cache_file}.tmp
           fi
 
@@ -4009,6 +4027,7 @@ if test "${with_opengl+set}" = set; then
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -4020,7 +4039,7 @@ fi
 
 
           eval "$wx_cv_use_opengl"
-          if test "x$cache" != xyes; then
+          if test "x$cache" = xyes; then
             echo "wxUSE_OPENGL=$wxUSE_OPENGL" >> ${wx_arg_cache_file}.tmp
           fi
 
@@ -4065,6 +4084,7 @@ if test "${with_dmalloc+set}" = set; then
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -4076,7 +4096,7 @@ fi
 
 
           eval "$wx_cv_use_dmalloc"
-          if test "x$cache" != xyes; then
+          if test "x$cache" = xyes; then
             echo "wxUSE_DMALLOC=$wxUSE_DMALLOC" >> ${wx_arg_cache_file}.tmp
           fi
 
@@ -4118,6 +4138,7 @@ if test "${with_sdl+set}" = set; then
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -4129,7 +4150,7 @@ fi
 
 
           eval "$wx_cv_use_sdl"
-          if test "x$cache" != xyes; then
+          if test "x$cache" = xyes; then
             echo "wxUSE_LIBSDL=$wxUSE_LIBSDL" >> ${wx_arg_cache_file}.tmp
           fi
 
@@ -4170,6 +4191,7 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -4227,6 +4249,7 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -4284,6 +4307,7 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -4341,6 +4365,7 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
@@ -4401,6 +4426,7 @@ if test "${enable_shared+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4454,6 +4480,7 @@ if test "${enable_optimise+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4507,6 +4534,7 @@ if test "${enable_debug+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4560,6 +4588,7 @@ if test "${enable_stl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4613,6 +4642,7 @@ if test "${enable_std_iostreams+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4666,6 +4696,7 @@ if test "${enable_std_string+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4719,6 +4750,7 @@ if test "${enable_unicode+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4772,6 +4804,7 @@ if test "${enable_mslu+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4812,6 +4845,7 @@ if test "${enable_utf8+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4855,6 +4889,7 @@ if test "${enable_utf8only+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4908,6 +4943,7 @@ if test "${enable_extended_rtti+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -4963,6 +4999,7 @@ if test "${enable_omf+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5028,6 +5065,7 @@ if test "${enable_debug_flag+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5081,6 +5119,7 @@ if test "${enable_debug_info+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5134,6 +5173,7 @@ if test "${enable_debug_gdb+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5187,6 +5227,7 @@ if test "${enable_debug_cntxt+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5240,6 +5281,7 @@ if test "${enable_mem_tracing+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5293,6 +5335,7 @@ if test "${enable_profile+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5346,6 +5389,7 @@ if test "${enable_no_rtti+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5399,6 +5443,7 @@ if test "${enable_no_exceptions+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5452,6 +5497,7 @@ if test "${enable_permissive+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5505,6 +5551,7 @@ if test "${enable_no_deps+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5558,6 +5605,7 @@ if test "${enable_vararg_macros+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5598,6 +5646,7 @@ if test "${enable_universal_binary+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5642,6 +5691,7 @@ if test "${enable_compat26+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5695,6 +5745,7 @@ if test "${enable_compat28+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5749,6 +5800,7 @@ if test "${enable_rpath+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5803,6 +5855,7 @@ if test "${enable_objc_uniquifying+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5857,6 +5910,7 @@ if test "${enable_visibility+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5912,6 +5966,7 @@ if test "${enable_intl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -5965,6 +6020,7 @@ if test "${enable_config+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6019,6 +6075,7 @@ if test "${enable_protocols+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6072,6 +6129,7 @@ if test "${enable_ftp+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6125,6 +6183,7 @@ if test "${enable_http+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6178,6 +6237,7 @@ if test "${enable_fileproto+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6231,6 +6291,7 @@ if test "${enable_sockets+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6284,6 +6345,7 @@ if test "${enable_ole+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6337,6 +6399,7 @@ if test "${enable_dataobj+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6391,6 +6454,7 @@ if test "${enable_ipc+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6445,6 +6509,7 @@ if test "${enable_baseevtloop+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6498,6 +6563,7 @@ if test "${enable_epoolloop+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6551,6 +6617,7 @@ if test "${enable_selectloop+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6605,6 +6672,7 @@ if test "${enable_apple_ieee+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6658,6 +6726,7 @@ if test "${enable_arcstream+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6711,6 +6780,7 @@ if test "${enable_base64+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6764,6 +6834,7 @@ if test "${enable_backtrace+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6817,6 +6888,7 @@ if test "${enable_catch_segvs+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6870,6 +6942,7 @@ if test "${enable_cmdline+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6923,6 +6996,7 @@ if test "${enable_datetime+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -6976,6 +7050,7 @@ if test "${enable_debugreport+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7029,6 +7104,7 @@ if test "${enable_dialupman+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7082,6 +7158,7 @@ if test "${enable_dynlib+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7135,6 +7212,7 @@ if test "${enable_dynamicloader+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7188,6 +7266,7 @@ if test "${enable_exceptions+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7241,6 +7320,7 @@ if test "${enable_ffile+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7294,6 +7374,7 @@ if test "${enable_file+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7347,6 +7428,7 @@ if test "${enable_filesystem+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7400,6 +7482,7 @@ if test "${enable_fontenum+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7453,6 +7536,7 @@ if test "${enable_fontmap+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7506,6 +7590,7 @@ if test "${enable_fs_archive+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7559,6 +7644,7 @@ if test "${enable_fs_inet+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7612,6 +7698,7 @@ if test "${enable_fs_zip+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7665,6 +7752,7 @@ if test "${enable_geometry+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7718,6 +7806,7 @@ if test "${enable_log+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7771,6 +7860,7 @@ if test "${enable_longlong+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7824,6 +7914,7 @@ if test "${enable_mimetype+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7877,6 +7968,7 @@ if test "${enable_snglinst+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7930,6 +8022,7 @@ if test "${enable_stdpaths+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -7983,6 +8076,7 @@ if test "${enable_stopwatch+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8036,6 +8130,7 @@ if test "${enable_streams+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8089,6 +8184,7 @@ if test "${enable_system_options+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8142,6 +8238,7 @@ if test "${enable_tarstream+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8195,6 +8292,7 @@ if test "${enable_textbuf+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8248,6 +8346,7 @@ if test "${enable_textfile+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8301,6 +8400,7 @@ if test "${enable_timer+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8354,6 +8454,7 @@ if test "${enable_sound+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8407,6 +8508,7 @@ if test "${enable_mediactrl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8460,6 +8562,7 @@ if test "${enable_gstreamer8+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8513,6 +8616,7 @@ if test "${enable_printfposparam+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8566,6 +8670,7 @@ if test "${enable_zipstream+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8620,6 +8725,7 @@ if test "${enable_url+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8673,6 +8779,7 @@ if test "${enable_variant+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8726,6 +8833,7 @@ if test "${enable_protocol+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8779,6 +8887,7 @@ if test "${enable_protocol_http+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8832,6 +8941,7 @@ if test "${enable_protocol_ftp+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8885,6 +8995,7 @@ if test "${enable_protocol_file+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8939,6 +9050,7 @@ if test "${enable_threads+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -8996,6 +9108,7 @@ if test "${enable_docview+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9049,6 +9162,7 @@ if test "${enable_help+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9102,6 +9216,7 @@ if test "${enable_mshtmlhelp+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9155,6 +9270,7 @@ if test "${enable_html+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9208,6 +9324,7 @@ if test "${enable_htmlhelp+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9261,6 +9378,7 @@ if test "${enable_xrc+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9314,6 +9432,7 @@ if test "${enable_aui+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9367,6 +9486,7 @@ if test "${enable_stc+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9420,6 +9540,7 @@ if test "${enable_constraints+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9473,6 +9594,7 @@ if test "${enable_printarch+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9526,6 +9648,7 @@ if test "${enable_mdi+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9579,6 +9702,7 @@ if test "${enable_mdidoc+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9632,6 +9756,7 @@ if test "${enable_loggui+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9685,6 +9810,7 @@ if test "${enable_logwin+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9738,6 +9864,7 @@ if test "${enable_logdialog+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9791,6 +9918,7 @@ if test "${enable_webkit+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9844,6 +9972,7 @@ if test "${enable_richtext+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9897,6 +10026,7 @@ if test "${enable_graphics_ctx+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -9950,6 +10080,7 @@ if test "${enable_postscript+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10003,6 +10134,7 @@ if test "${enable_svg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10058,6 +10190,7 @@ if test "${enable_clipboard+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10111,6 +10244,7 @@ if test "${enable_dnd+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10164,6 +10298,7 @@ if test "${enable_metafile+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10220,6 +10355,7 @@ if test "${enable_controls+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10382,6 +10518,7 @@ if test "${enable_accel+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10435,6 +10572,7 @@ if test "${enable_animatectrl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10488,6 +10626,7 @@ if test "${enable_button+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10541,6 +10680,7 @@ if test "${enable_bmpbutton+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10594,6 +10734,7 @@ if test "${enable_bmpcombobox+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10647,6 +10788,7 @@ if test "${enable_calendar+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10700,6 +10842,7 @@ if test "${enable_caret+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10753,6 +10896,7 @@ if test "${enable_checkbox+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10806,6 +10950,7 @@ if test "${enable_checklst+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10859,6 +11004,7 @@ if test "${enable_choice+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10912,6 +11058,7 @@ if test "${enable_choicebook+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -10965,6 +11112,7 @@ if test "${enable_collpane+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11018,6 +11166,7 @@ if test "${enable_colourpicker+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11071,6 +11220,7 @@ if test "${enable_combobox+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11124,6 +11274,7 @@ if test "${enable_comboctrl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11177,6 +11328,7 @@ if test "${enable_datepick+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11230,6 +11382,7 @@ if test "${enable_dirpicker+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11283,6 +11436,7 @@ if test "${enable_display+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11336,6 +11490,7 @@ if test "${enable_detect_sm+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11389,6 +11544,7 @@ if test "${enable_editablebox+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11442,6 +11598,7 @@ if test "${enable_filepicker+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11495,6 +11652,7 @@ if test "${enable_fontpicker+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11548,6 +11706,7 @@ if test "${enable_gauge+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11601,6 +11760,7 @@ if test "${enable_grid+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11654,6 +11814,7 @@ if test "${enable_dataviewctrl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11707,6 +11868,7 @@ if test "${enable_hyperlink+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11760,6 +11922,7 @@ if test "${enable_imaglist+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11813,6 +11976,7 @@ if test "${enable_listbook+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11866,6 +12030,7 @@ if test "${enable_listbox+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11919,6 +12084,7 @@ if test "${enable_listctrl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -11972,6 +12138,7 @@ if test "${enable_notebook+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12025,6 +12192,7 @@ if test "${enable_odcombobox+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12078,6 +12246,7 @@ if test "${enable_radiobox+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12131,6 +12300,7 @@ if test "${enable_radiobtn+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12184,6 +12354,7 @@ if test "${enable_sash+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12237,6 +12408,7 @@ if test "${enable_scrollbar+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12290,6 +12462,7 @@ if test "${enable_searchctrl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12343,6 +12516,7 @@ if test "${enable_slider+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12396,6 +12570,7 @@ if test "${enable_spinbtn+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12449,6 +12624,7 @@ if test "${enable_spinctrl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12502,6 +12678,7 @@ if test "${enable_splitter+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12555,6 +12732,7 @@ if test "${enable_statbmp+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12608,6 +12786,7 @@ if test "${enable_statbox+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12661,6 +12840,7 @@ if test "${enable_statline+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12714,6 +12894,7 @@ if test "${enable_stattext+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12767,6 +12948,7 @@ if test "${enable_statusbar+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12820,6 +13002,7 @@ if test "${enable_tabdialog+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12873,6 +13056,7 @@ if test "${enable_taskbaricon+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12926,6 +13110,7 @@ if test "${enable_textctrl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -12979,6 +13164,7 @@ if test "${enable_togglebtn+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13032,6 +13218,7 @@ if test "${enable_toolbar+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13085,6 +13272,7 @@ if test "${enable_tbarnative+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13138,6 +13326,7 @@ if test "${enable_treebook+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13191,6 +13380,7 @@ if test "${enable_toolbook+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13244,6 +13434,7 @@ if test "${enable_treectrl+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13297,6 +13488,7 @@ if test "${enable_tipwindow+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13350,6 +13542,7 @@ if test "${enable_popupwin+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13405,6 +13598,7 @@ if test "${enable_commondlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13458,6 +13652,7 @@ if test "${enable_aboutdlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13511,6 +13706,7 @@ if test "${enable_choicedlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13564,6 +13760,7 @@ if test "${enable_coldlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13617,6 +13814,7 @@ if test "${enable_filedlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13670,6 +13868,7 @@ if test "${enable_finddlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13723,6 +13922,7 @@ if test "${enable_fontdlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13776,6 +13976,7 @@ if test "${enable_dirdlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13829,6 +14030,7 @@ if test "${enable_msgdlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13882,6 +14084,7 @@ if test "${enable_numberdlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13935,6 +14138,7 @@ if test "${enable_splash+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -13988,6 +14192,7 @@ if test "${enable_textdlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14041,6 +14246,7 @@ if test "${enable_tipdlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14094,6 +14300,7 @@ if test "${enable_progressdlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14147,6 +14354,7 @@ if test "${enable_wizarddlg+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14202,6 +14410,7 @@ if test "${enable_menus+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14255,6 +14464,7 @@ if test "${enable_miniframe+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14308,6 +14518,7 @@ if test "${enable_tooltips+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14361,6 +14572,7 @@ if test "${enable_splines+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14414,6 +14626,7 @@ if test "${enable_mousewheel+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14467,6 +14680,7 @@ if test "${enable_validators+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14520,6 +14734,7 @@ if test "${enable_busyinfo+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14573,6 +14788,7 @@ if test "${enable_joystick+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14626,6 +14842,7 @@ if test "${enable_metafile+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14679,6 +14896,7 @@ if test "${enable_dragimage+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14732,6 +14950,7 @@ if test "${enable_accessibility+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14787,6 +15006,7 @@ if test "${enable_palette+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14840,6 +15060,7 @@ if test "${enable_image+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14893,6 +15114,7 @@ if test "${enable_gif+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14946,6 +15168,7 @@ if test "${enable_pcx+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -14999,6 +15222,7 @@ if test "${enable_tga+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -15052,6 +15276,7 @@ if test "${enable_iff+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -15105,6 +15330,7 @@ if test "${enable_pnm+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -15158,6 +15384,7 @@ if test "${enable_xpm+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -15211,6 +15438,7 @@ if test "${enable_ico_cur+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -15266,6 +15494,7 @@ if test "${enable_dccache+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -15319,6 +15548,7 @@ if test "${enable_ps_in_msw+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -15348,6 +15578,60 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ownerdrawn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ownerdrawn... $ECHO_C" >&6; }
+          # Check whether --enable-ownerdrawn was given.
+if test "${enable_ownerdrawn+set}" = set; then
+  enableval=$enable_ownerdrawn;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes'
+                          else
+                            wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no'
+                          fi
+                          cache=yes
+
+else
+
+                          cache=no
+                          LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          fi
+
+                          wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ownerdrawn"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_OWNER_DRAWN=$wxUSE_OWNER_DRAWN" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_OWNER_DRAWN = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_OWNER_DRAWN
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -15372,6 +15656,7 @@ if test "${enable_regkey+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -15425,6 +15710,7 @@ if test "${enable_uxtheme+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -15478,6 +15764,7 @@ if test "${enable_wxdib+set}" = set; then
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
@@ -33755,12 +34042,6 @@ done
     fi
 
     if test "$wxUSE_MOTIF" = 1; then
-        if test "$wxUSE_UNICODE" = "yes"; then
-            { { echo "$as_me:$LINENO: error: Unicode configuration not supported with Motif" >&5
-echo "$as_me: error: Unicode configuration not supported with Motif" >&2;}
-   { (exit 1); exit 1; }; }
-        fi
-
         { echo "$as_me:$LINENO: checking for Motif/Lesstif headers" >&5
 echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; }
 
@@ -35871,6 +36152,86 @@ echo "${ECHO_T}$wx_cv_cc_visibility" >&6; }
 #define HAVE_VISIBILITY 1
 _ACEOF
 
+
+                  { echo "$as_me:$LINENO: checking for broken libstdc++ visibility" >&5
+echo $ECHO_N "checking for broken libstdc++ visibility... $ECHO_C" >&6; }
+      if test "${wx_cv_cc_broken_libstdcxx_visibility+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+        wx_save_CXXFLAGS="$CXXFLAGS"
+        CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+        ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+            #include <string>
+
+int
+main ()
+{
+
+            std::string x;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  wx_cv_cc_broken_libstdcxx_visibility=no
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_cc_broken_libstdcxx_visibility=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+        ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+        CXXFLAGS="$wx_save_CXXFLAGS"
+fi
+
+      { echo "$as_me:$LINENO: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5
+echo "${ECHO_T}$wx_cv_cc_broken_libstdcxx_visibility" >&6; }
+      if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1
+_ACEOF
+
+      fi
+
     else
       CFLAGS_VISIBILITY=""
       CXXFLAGS_VISIBILITY=""
@@ -48698,6 +49059,13 @@ _ACEOF
 
 fi
 
+if test "$wxUSE_OWNER_DRAWN" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_OWNER_DRAWN 1
+_ACEOF
+
+fi
+
 if test "$wxUSE_REGKEY" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_REGKEY 1