]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
removed png and propsize samples from SAMPLES_SUBDIRS too (patch 1763216)
[wxWidgets.git] / configure
index cf6e413b3e472f52ca02474c95384cf205822a39..285c35de906dc7f94e96e6df7e31d800497f194c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 47765 2007-07-28 00:08:01Z VZ .
+# From configure.in Id: configure.in 47800 2007-07-29 00:28:07Z VZ .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -2996,10 +2996,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
@@ -3050,10 +3052,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
@@ -3104,10 +3108,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
@@ -3158,10 +3164,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
@@ -3218,10 +3226,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
@@ -3281,10 +3291,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
@@ -3339,10 +3351,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
@@ -3468,10 +3482,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
@@ -3528,10 +3544,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
@@ -3583,10 +3601,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
@@ -3641,10 +3661,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
@@ -3699,10 +3721,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
@@ -3757,10 +3781,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
@@ -3816,10 +3842,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
@@ -3870,10 +3898,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
@@ -3924,10 +3954,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
@@ -3978,10 +4010,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
@@ -4032,10 +4066,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
@@ -4089,10 +4125,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
@@ -4143,10 +4181,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
@@ -4196,10 +4236,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
@@ -4254,10 +4296,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
@@ -4312,10 +4356,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
@@ -4370,10 +4416,12 @@ 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"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
@@ -4484,10 +4532,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
@@ -4538,10 +4588,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
@@ -4592,10 +4644,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
@@ -4646,10 +4700,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
@@ -4700,10 +4756,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
@@ -4754,10 +4812,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
@@ -4808,10 +4868,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
@@ -4862,10 +4924,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
@@ -4903,10 +4967,12 @@ 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"
+                            cache=yes
+                          else
+                            cache=no
                           fi
 
                           wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
@@ -4947,10 +5013,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
@@ -5001,10 +5069,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
@@ -5057,10 +5127,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
@@ -5123,10 +5195,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
@@ -5177,10 +5251,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
@@ -5231,10 +5307,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
@@ -5285,10 +5363,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
@@ -5339,10 +5419,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
@@ -5393,10 +5475,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
@@ -5447,10 +5531,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
@@ -5501,10 +5587,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
@@ -5555,10 +5643,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
@@ -5609,10 +5699,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
@@ -5663,10 +5755,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
@@ -5704,10 +5798,12 @@ 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"
+                            cache=yes
+                          else
+                            cache=no
                           fi
 
                           wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
@@ -5749,10 +5845,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
@@ -5803,10 +5901,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
@@ -5858,10 +5958,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
@@ -5913,10 +6015,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
@@ -5968,10 +6072,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
@@ -6024,10 +6130,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
@@ -6078,10 +6186,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
@@ -6133,10 +6243,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
@@ -6187,10 +6299,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
@@ -6241,10 +6355,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
@@ -6295,10 +6411,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
@@ -6349,10 +6467,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
@@ -6403,10 +6523,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
@@ -6457,10 +6579,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
@@ -6512,10 +6636,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
@@ -6567,10 +6693,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
@@ -6621,10 +6749,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
@@ -6675,10 +6805,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
@@ -6730,10 +6862,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
@@ -6784,10 +6918,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
@@ -6838,10 +6974,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
@@ -6892,10 +7030,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
@@ -6946,10 +7086,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
@@ -7000,10 +7142,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
@@ -7054,10 +7198,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
@@ -7108,10 +7254,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
@@ -7162,10 +7310,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
@@ -7216,10 +7366,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
@@ -7270,10 +7422,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
@@ -7324,10 +7478,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
@@ -7378,10 +7534,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
@@ -7432,10 +7590,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
@@ -7486,10 +7646,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
@@ -7540,10 +7702,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}"
@@ -7594,10 +7758,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
@@ -7648,10 +7814,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
@@ -7702,10 +7870,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
@@ -7756,10 +7926,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
@@ -7810,10 +7982,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
@@ -7864,10 +8038,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
@@ -7918,10 +8094,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
@@ -7972,10 +8150,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
@@ -8026,10 +8206,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
@@ -8080,10 +8262,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
@@ -8134,10 +8318,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
@@ -8188,10 +8374,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
@@ -8242,10 +8430,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
@@ -8296,10 +8486,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
@@ -8350,10 +8542,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
@@ -8404,10 +8598,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
@@ -8458,10 +8654,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
@@ -8512,10 +8710,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
@@ -8566,10 +8766,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
@@ -8620,10 +8822,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
@@ -8674,10 +8878,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
@@ -8728,10 +8934,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
@@ -8783,10 +8991,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
@@ -8837,10 +9047,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
@@ -8891,10 +9103,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
@@ -8945,10 +9159,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
@@ -8999,10 +9215,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
@@ -9053,10 +9271,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
@@ -9108,10 +9328,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
@@ -9166,10 +9388,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
@@ -9220,10 +9444,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
@@ -9274,10 +9500,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
@@ -9328,10 +9556,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
@@ -9382,10 +9612,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
@@ -9436,10 +9668,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
@@ -9490,10 +9724,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
@@ -9544,10 +9780,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
@@ -9598,10 +9836,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
@@ -9652,10 +9892,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
@@ -9706,10 +9948,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
@@ -9760,10 +10004,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
@@ -9814,10 +10060,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
@@ -9868,10 +10116,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
@@ -9922,10 +10172,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
@@ -9976,10 +10228,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
@@ -10030,10 +10284,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
@@ -10084,10 +10340,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
@@ -10138,10 +10396,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
@@ -10192,10 +10452,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
@@ -10248,10 +10510,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
@@ -10302,10 +10566,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
@@ -10356,10 +10622,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
@@ -10413,10 +10681,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
@@ -10576,10 +10846,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
@@ -10630,10 +10902,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
@@ -10684,10 +10958,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
@@ -10738,10 +11014,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
@@ -10792,10 +11070,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
@@ -10846,10 +11126,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
@@ -10900,10 +11182,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
@@ -10954,10 +11238,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
@@ -11008,10 +11294,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
@@ -11062,10 +11350,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
@@ -11116,10 +11406,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
@@ -11170,10 +11462,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
@@ -11224,10 +11518,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
@@ -11278,10 +11574,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
@@ -11332,10 +11630,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
@@ -11386,10 +11686,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
@@ -11440,10 +11742,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
@@ -11494,10 +11798,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
@@ -11548,10 +11854,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
@@ -11602,10 +11910,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
@@ -11656,10 +11966,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
@@ -11710,10 +12022,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
@@ -11764,10 +12078,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
@@ -11818,10 +12134,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
@@ -11872,10 +12190,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
@@ -11926,10 +12246,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
@@ -11980,10 +12302,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
@@ -12034,10 +12358,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
@@ -12088,10 +12414,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
@@ -12142,10 +12470,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
@@ -12196,10 +12526,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
@@ -12250,10 +12582,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
@@ -12304,10 +12638,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
@@ -12358,10 +12694,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
@@ -12412,10 +12750,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
@@ -12466,10 +12806,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
@@ -12520,10 +12862,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
@@ -12574,10 +12918,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
@@ -12628,10 +12974,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
@@ -12682,10 +13030,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
@@ -12736,10 +13086,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
@@ -12790,10 +13142,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
@@ -12844,10 +13198,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
@@ -12898,10 +13254,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
@@ -12952,10 +13310,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
@@ -13006,10 +13366,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
@@ -13060,10 +13422,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
@@ -13114,10 +13478,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
@@ -13168,10 +13534,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
@@ -13222,10 +13590,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
@@ -13276,10 +13646,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
@@ -13330,10 +13702,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
@@ -13384,10 +13758,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
@@ -13438,10 +13814,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
@@ -13492,10 +13870,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
@@ -13546,10 +13926,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
@@ -13600,10 +13982,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
@@ -13656,10 +14040,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
@@ -13710,10 +14096,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
@@ -13764,10 +14152,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
@@ -13818,10 +14208,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
@@ -13872,10 +14264,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
@@ -13926,10 +14320,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
@@ -13980,10 +14376,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
@@ -14034,10 +14432,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
@@ -14088,10 +14488,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
@@ -14142,10 +14544,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
@@ -14196,10 +14600,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
@@ -14250,10 +14656,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
@@ -14304,10 +14712,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
@@ -14358,10 +14768,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
@@ -14412,10 +14824,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
@@ -14468,10 +14882,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
@@ -14522,10 +14938,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
@@ -14576,10 +14994,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
@@ -14630,10 +15050,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
@@ -14684,10 +15106,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
@@ -14738,10 +15162,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
@@ -14792,10 +15218,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
@@ -14846,10 +15274,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
@@ -14900,10 +15330,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
@@ -14954,10 +15386,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
@@ -15008,10 +15442,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
@@ -15064,10 +15500,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
@@ -15118,10 +15556,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
@@ -15172,10 +15612,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
@@ -15226,10 +15668,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
@@ -15280,10 +15724,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
@@ -15334,10 +15780,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
@@ -15388,10 +15836,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
@@ -15442,10 +15892,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
@@ -15496,10 +15948,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
@@ -15552,10 +16006,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
@@ -15606,10 +16062,12 @@ if test "${enable_iniconf+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}"
@@ -15660,10 +16118,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}"
@@ -15714,10 +16174,12 @@ if test "${enable_ownerdrawn+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}"
@@ -15768,10 +16230,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
@@ -15822,10 +16286,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
@@ -15876,10 +16342,12 @@ 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"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}"
@@ -29250,8 +29718,6 @@ echo "$as_me: WARNING: system png library not found or too old, will use built-i
             fi
         fi
     fi
-
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 
 
@@ -36970,8 +37436,8 @@ fi
         RESCOMP="$REZ"
         WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
     else
-        POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
-        RESCOMP="echo -n \| $REZ"
+        POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
+        RESCOMP="cat /dev/null \| $REZ"
         WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
     fi
 
@@ -48349,7 +48815,6 @@ if test "$wxUSE_CHECKLST" = "yes"; then
 _ACEOF
 
   USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
 if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then
@@ -48402,7 +48867,7 @@ echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >
 #define wxUSE_DISPLAY 1
 _ACEOF
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
     fi
 fi
 
@@ -48476,7 +48941,6 @@ if test "$wxUSE_LISTBOX" = "yes"; then
 _ACEOF
 
     USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox"
 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then
@@ -48974,7 +49438,6 @@ if test "$wxUSE_MINIFRAME" = "yes"; then
 #define wxUSE_MINIFRAME 1
 _ACEOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 
 if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
@@ -49663,9 +50126,9 @@ if test "$wxUSE_GUI" = "yes"; then
 
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
-                     dynamic erase event exec font image minimal mobile \
-                     mobile/wxedit mobile/styles propsize render \
-                     rotate shaped svg taborder vscroll widgets"
+                     erase event exec font image minimal mobile \
+                     mobile/wxedit mobile/styles render \
+                     shaped svg taborder vscroll widgets"
 
     if test "$wxUSE_MONOLITHIC" != "yes"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
@@ -55214,7 +55677,7 @@ echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITH
 
 echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
-echo -n "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}"
+echo $ECHO_N "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}$ECHO_C"
 if test "$wxUSE_UNICODE" = "yes"; then
     if test "$wxUSE_UNICODE_UTF8" = "yes"; then
         echo " (using UTF-8)"
@@ -55230,7 +55693,7 @@ echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIB
 echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
 
 echo "  Which libraries should wxWidgets use?"
-echo "                                       STL               ${wxUSE_STL}"
+echo "                                       STL                ${wxUSE_STL}"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
 echo "                                       png                ${wxUSE_LIBPNG-none}"
 echo "                                       regex              ${wxUSE_REGEX}"