]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
compilation fix
[wxWidgets.git] / configure
index dec4e288dc8cd1e9d1bf63c1b69a349f0006f1f9..f5af2c1380e04fdd0a65508eaea49c057b7028e7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 47544 2007-07-18 12:58:28Z VZ .
+# From configure.in Id: configure.in 47631 2007-07-21 23:22:56Z VZ .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -1700,6 +1700,7 @@ Optional Features:
   --enable-ffile          use wxFFile class
   --enable-file           use wxFile class
   --enable-filesystem     use virtual file systems classes
+  --enable-fontenum       use wxFontEnumerator class
   --enable-fontmap        use font encodings conversion classes
   --enable-fs_archive     use virtual archive filesystems
   --enable-fs_inet        use virtual HTTP/FTP filesystems
@@ -1836,7 +1837,6 @@ Optional Features:
   --enable-metafiles      use wxMetaFile (Win32 only)
   --enable-dragimage      use wxDragImage
   --enable-accessibility  enable accessibility support
-  --enable-dccache        cache temporary wxDC objects (Win32 only)
   --enable-palette        use wxPalette class
   --enable-image          use wxImage class
   --enable-gif            use gif images (GIF file format)
@@ -1846,6 +1846,12 @@ Optional Features:
   --enable-pnm            use pnm images (PNM file format)
   --enable-xpm            use xpm images (XPM file format)
   --enable-icocur         use Windows ICO and CUR formats
+  --enable-dccache        cache temporary wxDC objects (Win32 only)
+  --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)
+  --enable-ownerdrawn     use owner drawn controls (Win32 only)
+  --enable-regkey         use wxRegKey class (Win32 only)
+  --enable-uxtheme        enable support for Windows XP themed look (Win32 only)
+  --enable-wxdib          use wxDIB class (Win32 only)
   --disable-largefile     omit support for large files
   --disable-gtktest       do not try to compile and run a test GTK+ program
   --disable-gtktest       Do not try to compile and run a test GTK program
@@ -2973,7 +2979,6 @@ done
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gui" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-gui was given.
 if test "${enable_gui+set}" = set; then
   enableval=$enable_gui;
@@ -2982,14 +2987,14 @@ if test "${enable_gui+set}" = set; then
                           else
                             wx_cv_use_gui='wxUSE_GUI=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
@@ -2998,8 +3003,8 @@ fi
 
 
           eval "$wx_cv_use_gui"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gui >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_GUI=$wxUSE_GUI" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3028,7 +3033,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-monolithic" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-monolithic was given.
 if test "${enable_monolithic+set}" = set; then
   enableval=$enable_monolithic;
@@ -3037,14 +3041,14 @@ if test "${enable_monolithic+set}" = set; then
                           else
                             wx_cv_use_monolithic='wxUSE_MONOLITHIC=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
@@ -3053,8 +3057,8 @@ fi
 
 
           eval "$wx_cv_use_monolithic"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_monolithic >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MONOLITHIC=$wxUSE_MONOLITHIC" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3083,7 +3087,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-plugins" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-plugins was given.
 if test "${enable_plugins+set}" = set; then
   enableval=$enable_plugins;
@@ -3092,14 +3095,14 @@ if test "${enable_plugins+set}" = set; then
                           else
                             wx_cv_use_plugins='wxUSE_PLUGINS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
@@ -3108,8 +3111,8 @@ fi
 
 
           eval "$wx_cv_use_plugins"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_plugins >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PLUGINS=$wxUSE_PLUGINS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3137,7 +3140,6 @@ echo "${ECHO_T}$result" >&6; }
           fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-subdirs" >&5
 echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-subdirs was given.
 if test "${with_subdirs+set}" = set; then
@@ -3147,14 +3149,14 @@ if test "${with_subdirs+set}" = set; then
                         else
                           wx_cv_use_subdirs='wxWITH_SUBDIRS=no'
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
@@ -3163,8 +3165,8 @@ fi
 
 
           eval "$wx_cv_use_subdirs"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_subdirs >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxWITH_SUBDIRS=$wxWITH_SUBDIRS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -3199,7 +3201,6 @@ fi
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-official_build was given.
 if test "${enable_official_build+set}" = set; then
   enableval=$enable_official_build;
@@ -3208,14 +3209,14 @@ if test "${enable_official_build+set}" = set; then
                           else
                             wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
@@ -3224,8 +3225,8 @@ fi
 
 
           eval "$wx_cv_use_official_build"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_official_build >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_OFFICIAL_BUILD=$wxUSE_OFFICIAL_BUILD" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3263,7 +3264,6 @@ fi
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-all-features" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-all-features... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-all-features was given.
 if test "${enable_all_features+set}" = set; then
   enableval=$enable_all_features;
@@ -3272,14 +3272,14 @@ if test "${enable_all_features+set}" = set; then
                           else
                             wx_cv_use_all_features='wxUSE_ALL_FEATURES=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
@@ -3288,8 +3288,8 @@ fi
 
 
           eval "$wx_cv_use_all_features"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_all_features >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ALL_FEATURES=$wxUSE_ALL_FEATURES" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3322,7 +3322,6 @@ if test "$wxUSE_GUI" = "yes"; then
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-universal was given.
 if test "${enable_universal+set}" = set; then
   enableval=$enable_universal;
@@ -3331,14 +3330,14 @@ if test "${enable_universal+set}" = set; then
                           else
                             wx_cv_use_universal='wxUSE_UNIVERSAL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
@@ -3347,8 +3346,8 @@ fi
 
 
           eval "$wx_cv_use_universal"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_universal >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_UNIVERSAL=$wxUSE_UNIVERSAL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3452,7 +3451,6 @@ fi
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-nanox" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-nanox was given.
 if test "${enable_nanox+set}" = set; then
   enableval=$enable_nanox;
@@ -3461,14 +3459,14 @@ if test "${enable_nanox+set}" = set; then
                           else
                             wx_cv_use_nanox='wxUSE_NANOX=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
@@ -3477,8 +3475,8 @@ fi
 
 
           eval "$wx_cv_use_nanox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_nanox >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_NANOX=$wxUSE_NANOX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3513,7 +3511,6 @@ fi
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-gpe was given.
 if test "${enable_gpe+set}" = set; then
   enableval=$enable_gpe;
@@ -3522,14 +3519,14 @@ if test "${enable_gpe+set}" = set; then
                           else
                             wx_cv_use_gpe='wxUSE_GPE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
@@ -3538,8 +3535,8 @@ fi
 
 
           eval "$wx_cv_use_gpe"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gpe >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_GPE=$wxUSE_GPE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3560,7 +3557,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --with-libpng" >&5
 echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-libpng was given.
 if test "${with_libpng+set}" = set; then
@@ -3578,14 +3574,14 @@ if test "${with_libpng+set}" = set; then
 echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
@@ -3594,8 +3590,8 @@ fi
 
 
           eval "$wx_cv_use_libpng"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_libpng >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LIBPNG=$wxUSE_LIBPNG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_LIBPNG" = yes; then
@@ -3619,7 +3615,6 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or
 
           { echo "$as_me:$LINENO: checking for --with-libjpeg" >&5
 echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then
@@ -3637,14 +3632,14 @@ if test "${with_libjpeg+set}" = set; then
 echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
@@ -3653,8 +3648,8 @@ fi
 
 
           eval "$wx_cv_use_libjpeg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LIBJPEG=$wxUSE_LIBJPEG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_LIBJPEG" = yes; then
@@ -3678,7 +3673,6 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o
 
           { echo "$as_me:$LINENO: checking for --with-libtiff" >&5
 echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-libtiff was given.
 if test "${with_libtiff+set}" = set; then
@@ -3696,14 +3690,14 @@ if test "${with_libtiff+set}" = set; then
 echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
@@ -3712,8 +3706,8 @@ fi
 
 
           eval "$wx_cv_use_libtiff"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_libtiff >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LIBTIFF=$wxUSE_LIBTIFF" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_LIBTIFF" = yes; then
@@ -3737,7 +3731,6 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o
 
           { echo "$as_me:$LINENO: checking for --with-libxpm" >&5
 echo $ECHO_N "checking for --with-libxpm... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-libxpm was given.
 if test "${with_libxpm+set}" = set; then
@@ -3755,14 +3748,14 @@ if test "${with_libxpm+set}" = set; then
 echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
@@ -3771,8 +3764,8 @@ fi
 
 
           eval "$wx_cv_use_libxpm"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_libxpm >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LIBXPM=$wxUSE_LIBXPM" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_LIBXPM" = yes; then
@@ -3805,7 +3798,6 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or
           fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-libmspack" >&5
 echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-libmspack was given.
 if test "${with_libmspack+set}" = set; then
@@ -3815,14 +3807,14 @@ if test "${with_libmspack+set}" = set; then
                         else
                           wx_cv_use_libmspack='wxUSE_LIBMSPACK=no'
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
@@ -3831,8 +3823,8 @@ fi
 
 
           eval "$wx_cv_use_libmspack"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_libmspack >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LIBMSPACK=$wxUSE_LIBMSPACK" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -3860,7 +3852,6 @@ echo "${ECHO_T}$result" >&6; }
           fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5
 echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-gnomeprint was given.
 if test "${with_gnomeprint+set}" = set; then
@@ -3870,14 +3861,14 @@ if test "${with_gnomeprint+set}" = set; then
                         else
                           wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no'
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
@@ -3886,8 +3877,8 @@ fi
 
 
           eval "$wx_cv_use_gnomeprint"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -3915,7 +3906,6 @@ echo "${ECHO_T}$result" >&6; }
           fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomevfs" >&5
 echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-gnomevfs was given.
 if test "${with_gnomevfs+set}" = set; then
@@ -3925,14 +3915,14 @@ if test "${with_gnomevfs+set}" = set; then
                         else
                           wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no'
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
@@ -3941,8 +3931,8 @@ fi
 
 
           eval "$wx_cv_use_gnomevfs"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -3970,7 +3960,6 @@ echo "${ECHO_T}$result" >&6; }
           fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-hildon" >&5
 echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-hildon was given.
 if test "${with_hildon+set}" = set; then
@@ -3980,14 +3969,14 @@ if test "${with_hildon+set}" = set; then
                         else
                           wx_cv_use_hildon='wxUSE_LIBHILDON=no'
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
@@ -3996,8 +3985,8 @@ fi
 
 
           eval "$wx_cv_use_hildon"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_hildon >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -4025,7 +4014,6 @@ echo "${ECHO_T}$result" >&6; }
           fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5
 echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-opengl was given.
 if test "${with_opengl+set}" = set; then
@@ -4035,14 +4023,14 @@ if test "${with_opengl+set}" = set; then
                         else
                           wx_cv_use_opengl='wxUSE_OPENGL=no'
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
@@ -4051,8 +4039,8 @@ fi
 
 
           eval "$wx_cv_use_opengl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_opengl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_OPENGL=$wxUSE_OPENGL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -4083,7 +4071,6 @@ fi
           fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-dmalloc" >&5
 echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
@@ -4093,14 +4080,14 @@ if test "${with_dmalloc+set}" = set; then
                         else
                           wx_cv_use_dmalloc='wxUSE_DMALLOC=no'
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
@@ -4109,8 +4096,8 @@ fi
 
 
           eval "$wx_cv_use_dmalloc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DMALLOC=$wxUSE_DMALLOC" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -4138,7 +4125,6 @@ echo "${ECHO_T}$result" >&6; }
           fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5
 echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-sdl was given.
 if test "${with_sdl+set}" = set; then
@@ -4148,14 +4134,14 @@ if test "${with_sdl+set}" = set; then
                         else
                           wx_cv_use_sdl='wxUSE_LIBSDL=no'
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
@@ -4164,8 +4150,8 @@ fi
 
 
           eval "$wx_cv_use_sdl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_sdl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LIBSDL=$wxUSE_LIBSDL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -4184,7 +4170,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --with-regex" >&5
 echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-regex was given.
 if test "${with_regex+set}" = set; then
@@ -4202,14 +4187,14 @@ if test "${with_regex+set}" = set; then
 echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
@@ -4218,8 +4203,8 @@ fi
 
 
           eval "$wx_cv_use_regex"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_regex >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_REGEX=$wxUSE_REGEX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_REGEX" = yes; then
@@ -4243,7 +4228,6 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or
 
           { echo "$as_me:$LINENO: checking for --with-zlib" >&5
 echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-zlib was given.
 if test "${with_zlib+set}" = set; then
@@ -4261,14 +4245,14 @@ if test "${with_zlib+set}" = set; then
 echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
@@ -4277,8 +4261,8 @@ fi
 
 
           eval "$wx_cv_use_zlib"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_zlib >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ZLIB=$wxUSE_ZLIB" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_ZLIB" = yes; then
@@ -4302,7 +4286,6 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b
 
           { echo "$as_me:$LINENO: checking for --with-odbc" >&5
 echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-odbc was given.
 if test "${with_odbc+set}" = set; then
@@ -4320,14 +4303,14 @@ if test "${with_odbc+set}" = set; then
 echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
@@ -4336,8 +4319,8 @@ fi
 
 
           eval "$wx_cv_use_odbc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_odbc >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ODBC=$wxUSE_ODBC" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_ODBC" = yes; then
@@ -4361,7 +4344,6 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b
 
           { echo "$as_me:$LINENO: checking for --with-expat" >&5
 echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; }
-          no_cache=0
 
 # Check whether --with-expat was given.
 if test "${with_expat+set}" = set; then
@@ -4379,14 +4361,14 @@ if test "${with_expat+set}" = set; then
 echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}
    { (exit 1); exit 1; }; }
                         fi
+                        cache=yes
 
 else
 
+                        cache=no
                         LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
                           eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
                         fi
 
                         wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
@@ -4395,8 +4377,8 @@ fi
 
 
           eval "$wx_cv_use_expat"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_expat >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_EXPAT=$wxUSE_EXPAT" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_EXPAT" = yes; then
@@ -4432,7 +4414,6 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval=$enable_shared;
@@ -4441,14 +4422,14 @@ if test "${enable_shared+set}" = set; then
                           else
                             wx_cv_use_shared='wxUSE_SHARED=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
@@ -4457,8 +4438,8 @@ fi
 
 
           eval "$wx_cv_use_shared"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_shared >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SHARED=$wxUSE_SHARED" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4487,7 +4468,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-optimise was given.
 if test "${enable_optimise+set}" = set; then
   enableval=$enable_optimise;
@@ -4496,14 +4476,14 @@ if test "${enable_optimise+set}" = set; then
                           else
                             wx_cv_use_optimise='wxUSE_OPTIMISE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
@@ -4512,8 +4492,8 @@ fi
 
 
           eval "$wx_cv_use_optimise"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_optimise >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_OPTIMISE=$wxUSE_OPTIMISE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4542,7 +4522,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval=$enable_debug;
@@ -4551,14 +4530,14 @@ if test "${enable_debug+set}" = set; then
                           else
                             wx_cv_use_debug='wxUSE_DEBUG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
@@ -4567,8 +4546,8 @@ fi
 
 
           eval "$wx_cv_use_debug"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debug >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DEBUG=$wxUSE_DEBUG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4597,7 +4576,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-stl was given.
 if test "${enable_stl+set}" = set; then
   enableval=$enable_stl;
@@ -4606,14 +4584,14 @@ if test "${enable_stl+set}" = set; then
                           else
                             wx_cv_use_stl='wxUSE_STL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
@@ -4622,8 +4600,8 @@ fi
 
 
           eval "$wx_cv_use_stl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_stl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STL=$wxUSE_STL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4652,7 +4630,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-std_iostreams was given.
 if test "${enable_std_iostreams+set}" = set; then
   enableval=$enable_std_iostreams;
@@ -4661,14 +4638,14 @@ if test "${enable_std_iostreams+set}" = set; then
                           else
                             wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
@@ -4677,8 +4654,8 @@ fi
 
 
           eval "$wx_cv_use_std_iostreams"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STD_IOSTREAM=$wxUSE_STD_IOSTREAM" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4707,7 +4684,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-std_string was given.
 if test "${enable_std_string+set}" = set; then
   enableval=$enable_std_string;
@@ -4716,14 +4692,14 @@ if test "${enable_std_string+set}" = set; then
                           else
                             wx_cv_use_std_string='wxUSE_STD_STRING=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
@@ -4732,8 +4708,8 @@ fi
 
 
           eval "$wx_cv_use_std_string"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_std_string >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STD_STRING=$wxUSE_STD_STRING" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4762,7 +4738,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-unicode was given.
 if test "${enable_unicode+set}" = set; then
   enableval=$enable_unicode;
@@ -4771,14 +4746,14 @@ if test "${enable_unicode+set}" = set; then
                           else
                             wx_cv_use_unicode='wxUSE_UNICODE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
@@ -4787,8 +4762,8 @@ fi
 
 
           eval "$wx_cv_use_unicode"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_unicode >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_UNICODE=$wxUSE_UNICODE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4817,7 +4792,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-mslu was given.
 if test "${enable_mslu+set}" = set; then
   enableval=$enable_mslu;
@@ -4826,14 +4800,14 @@ if test "${enable_mslu+set}" = set; then
                           else
                             wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
@@ -4842,8 +4816,8 @@ fi
 
 
           eval "$wx_cv_use_mslu"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mslu >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_UNICODE_MSLU=$wxUSE_UNICODE_MSLU" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4863,19 +4837,18 @@ echo "${ECHO_T}$result" >&6; }
           enablestring=
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-utf8 was given.
 if test "${enable_utf8+set}" = set; then
   enableval=$enable_utf8;
                           wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
@@ -4884,8 +4857,8 @@ fi
 
 
           eval "$wx_cv_use_utf8"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_utf8 >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_UNICODE_UTF8=$wxUSE_UNICODE_UTF8" >> ${wx_arg_cache_file}.tmp
           fi
 
           { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
@@ -4904,7 +4877,6 @@ echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8only" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-utf8only was given.
 if test "${enable_utf8only+set}" = set; then
   enableval=$enable_utf8only;
@@ -4913,14 +4885,14 @@ if test "${enable_utf8only+set}" = set; then
                           else
                             wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
@@ -4929,8 +4901,8 @@ fi
 
 
           eval "$wx_cv_use_utf8only"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_utf8only >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_UNICODE_UTF8_LOCALE=$wxUSE_UNICODE_UTF8_LOCALE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4959,7 +4931,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-extended_rtti" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-extended_rtti was given.
 if test "${enable_extended_rtti+set}" = set; then
   enableval=$enable_extended_rtti;
@@ -4968,14 +4939,14 @@ if test "${enable_extended_rtti+set}" = set; then
                           else
                             wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
@@ -4984,8 +4955,8 @@ fi
 
 
           eval "$wx_cv_use_extended_rtti"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_extended_rtti >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_EXTENDED_RTTI=$wxUSE_EXTENDED_RTTI" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5016,7 +4987,6 @@ if test "$USE_OS2" = "1"; then
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-omf was given.
 if test "${enable_omf+set}" = set; then
   enableval=$enable_omf;
@@ -5025,14 +4995,14 @@ if test "${enable_omf+set}" = set; then
                           else
                             wx_cv_use_omf='wxUSE_OMF=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
@@ -5041,8 +5011,8 @@ fi
 
 
           eval "$wx_cv_use_omf"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_omf >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_OMF=$wxUSE_OMF" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5083,7 +5053,6 @@ fi
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-debug_flag was given.
 if test "${enable_debug_flag+set}" = set; then
   enableval=$enable_debug_flag;
@@ -5092,14 +5061,14 @@ if test "${enable_debug_flag+set}" = set; then
                           else
                             wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
@@ -5108,8 +5077,8 @@ fi
 
 
           eval "$wx_cv_use_debug_flag"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DEBUG_FLAG=$wxUSE_DEBUG_FLAG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5138,7 +5107,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-debug_info was given.
 if test "${enable_debug_info+set}" = set; then
   enableval=$enable_debug_info;
@@ -5147,14 +5115,14 @@ if test "${enable_debug_info+set}" = set; then
                           else
                             wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
@@ -5163,8 +5131,8 @@ fi
 
 
           eval "$wx_cv_use_debug_info"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debug_info >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DEBUG_INFO=$wxUSE_DEBUG_INFO" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5193,7 +5161,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-debug_gdb was given.
 if test "${enable_debug_gdb+set}" = set; then
   enableval=$enable_debug_gdb;
@@ -5202,14 +5169,14 @@ if test "${enable_debug_gdb+set}" = set; then
                           else
                             wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
@@ -5218,8 +5185,8 @@ fi
 
 
           eval "$wx_cv_use_debug_gdb"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DEBUG_GDB=$wxUSE_DEBUG_GDB" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5248,7 +5215,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-debug_cntxt was given.
 if test "${enable_debug_cntxt+set}" = set; then
   enableval=$enable_debug_cntxt;
@@ -5257,14 +5223,14 @@ if test "${enable_debug_cntxt+set}" = set; then
                           else
                             wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
@@ -5273,8 +5239,8 @@ fi
 
 
           eval "$wx_cv_use_debug_cntxt"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DEBUG_CONTEXT=$wxUSE_DEBUG_CONTEXT" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5303,7 +5269,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-mem_tracing was given.
 if test "${enable_mem_tracing+set}" = set; then
   enableval=$enable_mem_tracing;
@@ -5312,14 +5277,14 @@ if test "${enable_mem_tracing+set}" = set; then
                           else
                             wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
@@ -5328,8 +5293,8 @@ fi
 
 
           eval "$wx_cv_use_mem_tracing"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MEM_TRACING=$wxUSE_MEM_TRACING" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5358,7 +5323,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-profile" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-profile was given.
 if test "${enable_profile+set}" = set; then
   enableval=$enable_profile;
@@ -5367,14 +5331,14 @@ if test "${enable_profile+set}" = set; then
                           else
                             wx_cv_use_profile='wxUSE_PROFILE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
@@ -5383,8 +5347,8 @@ fi
 
 
           eval "$wx_cv_use_profile"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_profile >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PROFILE=$wxUSE_PROFILE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5413,7 +5377,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_rtti" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-no_rtti was given.
 if test "${enable_no_rtti+set}" = set; then
   enableval=$enable_no_rtti;
@@ -5422,14 +5385,14 @@ if test "${enable_no_rtti+set}" = set; then
                           else
                             wx_cv_use_no_rtti='wxUSE_NO_RTTI=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
@@ -5438,8 +5401,8 @@ fi
 
 
           eval "$wx_cv_use_no_rtti"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_NO_RTTI=$wxUSE_NO_RTTI" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5468,7 +5431,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_exceptions" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-no_exceptions was given.
 if test "${enable_no_exceptions+set}" = set; then
   enableval=$enable_no_exceptions;
@@ -5477,14 +5439,14 @@ if test "${enable_no_exceptions+set}" = set; then
                           else
                             wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
@@ -5493,8 +5455,8 @@ fi
 
 
           eval "$wx_cv_use_no_exceptions"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_NO_EXCEPTIONS=$wxUSE_NO_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5523,7 +5485,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-permissive" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-permissive was given.
 if test "${enable_permissive+set}" = set; then
   enableval=$enable_permissive;
@@ -5532,14 +5493,14 @@ if test "${enable_permissive+set}" = set; then
                           else
                             wx_cv_use_permissive='wxUSE_PERMISSIVE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
@@ -5548,8 +5509,8 @@ fi
 
 
           eval "$wx_cv_use_permissive"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_permissive >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PERMISSIVE=$wxUSE_PERMISSIVE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5578,7 +5539,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_deps" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-no_deps was given.
 if test "${enable_no_deps+set}" = set; then
   enableval=$enable_no_deps;
@@ -5587,14 +5547,14 @@ if test "${enable_no_deps+set}" = set; then
                           else
                             wx_cv_use_no_deps='wxUSE_NO_DEPS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
@@ -5603,8 +5563,8 @@ fi
 
 
           eval "$wx_cv_use_no_deps"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_no_deps >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_NO_DEPS=$wxUSE_NO_DEPS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5633,7 +5593,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-vararg_macros" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-vararg_macros was given.
 if test "${enable_vararg_macros+set}" = set; then
   enableval=$enable_vararg_macros;
@@ -5642,14 +5601,14 @@ if test "${enable_vararg_macros+set}" = set; then
                           else
                             wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
@@ -5658,8 +5617,8 @@ fi
 
 
           eval "$wx_cv_use_vararg_macros"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_VARARG_MACROS=$wxUSE_VARARG_MACROS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5679,19 +5638,18 @@ echo "${ECHO_T}$result" >&6; }
           enablestring=
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-universal_binary was given.
 if test "${enable_universal_binary+set}" = set; then
   enableval=$enable_universal_binary;
                           wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'"
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
@@ -5700,8 +5658,8 @@ fi
 
 
           eval "$wx_cv_use_universal_binary"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_universal_binary >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_UNIVERSAL_BINARY=$wxUSE_UNIVERSAL_BINARY" >> ${wx_arg_cache_file}.tmp
           fi
 
           { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5
@@ -5721,7 +5679,6 @@ echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat26" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-compat26 was given.
 if test "${enable_compat26+set}" = set; then
   enableval=$enable_compat26;
@@ -5730,14 +5687,14 @@ if test "${enable_compat26+set}" = set; then
                           else
                             wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
@@ -5746,8 +5703,8 @@ fi
 
 
           eval "$wx_cv_use_compat26"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_compat26 >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "WXWIN_COMPATIBILITY_2_6=$WXWIN_COMPATIBILITY_2_6" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5776,7 +5733,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat28" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-compat28 was given.
 if test "${enable_compat28+set}" = set; then
   enableval=$enable_compat28;
@@ -5785,14 +5741,14 @@ if test "${enable_compat28+set}" = set; then
                           else
                             wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
@@ -5801,8 +5757,8 @@ fi
 
 
           eval "$wx_cv_use_compat28"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_compat28 >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "WXWIN_COMPATIBILITY_2_8=$WXWIN_COMPATIBILITY_2_8" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5832,7 +5788,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then
   enableval=$enable_rpath;
@@ -5841,14 +5796,14 @@ if test "${enable_rpath+set}" = set; then
                           else
                             wx_cv_use_rpath='wxUSE_RPATH=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
@@ -5857,8 +5812,8 @@ fi
 
 
           eval "$wx_cv_use_rpath"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_rpath >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_RPATH=$wxUSE_RPATH" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5888,7 +5843,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-objc_uniquifying" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-objc_uniquifying was given.
 if test "${enable_objc_uniquifying+set}" = set; then
   enableval=$enable_objc_uniquifying;
@@ -5897,14 +5851,14 @@ if test "${enable_objc_uniquifying+set}" = set; then
                           else
                             wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
@@ -5913,8 +5867,8 @@ fi
 
 
           eval "$wx_cv_use_objc_uniquifying"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_objc_uniquifying >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_OBJC_UNIQUIFYING=$wxUSE_OBJC_UNIQUIFYING" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5944,7 +5898,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-visibility" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-visibility was given.
 if test "${enable_visibility+set}" = set; then
   enableval=$enable_visibility;
@@ -5953,14 +5906,14 @@ if test "${enable_visibility+set}" = set; then
                           else
                             wx_cv_use_visibility='wxUSE_VISIBILITY=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
@@ -5969,8 +5922,8 @@ fi
 
 
           eval "$wx_cv_use_visibility"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_visibility >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_VISIBILITY=$wxUSE_VISIBILITY" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6001,7 +5954,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-intl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-intl was given.
 if test "${enable_intl+set}" = set; then
   enableval=$enable_intl;
@@ -6010,14 +5962,14 @@ if test "${enable_intl+set}" = set; then
                           else
                             wx_cv_use_intl='wxUSE_INTL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
@@ -6026,8 +5978,8 @@ fi
 
 
           eval "$wx_cv_use_intl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_intl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_INTL=$wxUSE_INTL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6056,7 +6008,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-config" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-config was given.
 if test "${enable_config+set}" = set; then
   enableval=$enable_config;
@@ -6065,14 +6016,14 @@ if test "${enable_config+set}" = set; then
                           else
                             wx_cv_use_config='wxUSE_CONFIG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
@@ -6081,8 +6032,8 @@ fi
 
 
           eval "$wx_cv_use_config"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_config >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CONFIG=$wxUSE_CONFIG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6112,7 +6063,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocols" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-protocols was given.
 if test "${enable_protocols+set}" = set; then
   enableval=$enable_protocols;
@@ -6121,14 +6071,14 @@ if test "${enable_protocols+set}" = set; then
                           else
                             wx_cv_use_protocols='wxUSE_PROTOCOL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
@@ -6137,8 +6087,8 @@ fi
 
 
           eval "$wx_cv_use_protocols"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_protocols >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6167,7 +6117,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ftp" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-ftp was given.
 if test "${enable_ftp+set}" = set; then
   enableval=$enable_ftp;
@@ -6176,14 +6125,14 @@ if test "${enable_ftp+set}" = set; then
                           else
                             wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
@@ -6192,8 +6141,8 @@ fi
 
 
           eval "$wx_cv_use_ftp"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_ftp >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6222,7 +6171,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-http" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-http was given.
 if test "${enable_http+set}" = set; then
   enableval=$enable_http;
@@ -6231,14 +6179,14 @@ if test "${enable_http+set}" = set; then
                           else
                             wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
@@ -6247,8 +6195,8 @@ fi
 
 
           eval "$wx_cv_use_http"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_http >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6277,7 +6225,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fileproto" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-fileproto was given.
 if test "${enable_fileproto+set}" = set; then
   enableval=$enable_fileproto;
@@ -6286,14 +6233,14 @@ if test "${enable_fileproto+set}" = set; then
                           else
                             wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
@@ -6302,8 +6249,8 @@ fi
 
 
           eval "$wx_cv_use_fileproto"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fileproto >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6332,7 +6279,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sockets" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-sockets was given.
 if test "${enable_sockets+set}" = set; then
   enableval=$enable_sockets;
@@ -6341,14 +6287,14 @@ if test "${enable_sockets+set}" = set; then
                           else
                             wx_cv_use_sockets='wxUSE_SOCKETS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
@@ -6357,8 +6303,8 @@ fi
 
 
           eval "$wx_cv_use_sockets"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_sockets >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SOCKETS=$wxUSE_SOCKETS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6387,7 +6333,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ole" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-ole was given.
 if test "${enable_ole+set}" = set; then
   enableval=$enable_ole;
@@ -6396,14 +6341,14 @@ if test "${enable_ole+set}" = set; then
                           else
                             wx_cv_use_ole='wxUSE_OLE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
@@ -6412,8 +6357,8 @@ fi
 
 
           eval "$wx_cv_use_ole"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_ole >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_OLE=$wxUSE_OLE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6442,7 +6387,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataobj" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-dataobj was given.
 if test "${enable_dataobj+set}" = set; then
   enableval=$enable_dataobj;
@@ -6451,14 +6395,14 @@ if test "${enable_dataobj+set}" = set; then
                           else
                             wx_cv_use_dataobj='wxUSE_DATAOBJ=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
@@ -6467,8 +6411,8 @@ fi
 
 
           eval "$wx_cv_use_dataobj"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dataobj >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DATAOBJ=$wxUSE_DATAOBJ" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6498,7 +6442,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipc" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-ipc was given.
 if test "${enable_ipc+set}" = set; then
   enableval=$enable_ipc;
@@ -6507,14 +6450,14 @@ if test "${enable_ipc+set}" = set; then
                           else
                             wx_cv_use_ipc='wxUSE_IPC=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
@@ -6523,8 +6466,8 @@ fi
 
 
           eval "$wx_cv_use_ipc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_ipc >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_IPC=$wxUSE_IPC" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6554,7 +6497,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-baseevtloop" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-baseevtloop... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-baseevtloop was given.
 if test "${enable_baseevtloop+set}" = set; then
   enableval=$enable_baseevtloop;
@@ -6563,14 +6505,14 @@ if test "${enable_baseevtloop+set}" = set; then
                           else
                             wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
@@ -6579,8 +6521,8 @@ fi
 
 
           eval "$wx_cv_use_baseevtloop"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_baseevtloop >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CONSOLE_EVENTLOOP=$wxUSE_CONSOLE_EVENTLOOP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6609,7 +6551,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epoolloop" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-epoolloop... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-epoolloop was given.
 if test "${enable_epoolloop+set}" = set; then
   enableval=$enable_epoolloop;
@@ -6618,14 +6559,14 @@ if test "${enable_epoolloop+set}" = set; then
                           else
                             wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
@@ -6634,8 +6575,8 @@ fi
 
 
           eval "$wx_cv_use_epoolloop"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_epoolloop >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6664,7 +6605,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-selectloop" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-selectloop... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-selectloop was given.
 if test "${enable_selectloop+set}" = set; then
   enableval=$enable_selectloop;
@@ -6673,14 +6613,14 @@ if test "${enable_selectloop+set}" = set; then
                           else
                             wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
@@ -6689,8 +6629,8 @@ fi
 
 
           eval "$wx_cv_use_selectloop"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_selectloop >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SELECT_DISPATCHER=$wxUSE_SELECT_DISPATCHER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6720,7 +6660,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-apple_ieee was given.
 if test "${enable_apple_ieee+set}" = set; then
   enableval=$enable_apple_ieee;
@@ -6729,14 +6668,14 @@ if test "${enable_apple_ieee+set}" = set; then
                           else
                             wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
@@ -6745,8 +6684,8 @@ fi
 
 
           eval "$wx_cv_use_apple_ieee"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_APPLE_IEEE=$wxUSE_APPLE_IEEE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6775,7 +6714,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arcstream" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-arcstream was given.
 if test "${enable_arcstream+set}" = set; then
   enableval=$enable_arcstream;
@@ -6784,14 +6722,14 @@ if test "${enable_arcstream+set}" = set; then
                           else
                             wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
@@ -6800,8 +6738,8 @@ fi
 
 
           eval "$wx_cv_use_arcstream"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_arcstream >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ARCHIVE_STREAMS=$wxUSE_ARCHIVE_STREAMS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6830,7 +6768,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-base64" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-base64... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-base64 was given.
 if test "${enable_base64+set}" = set; then
   enableval=$enable_base64;
@@ -6839,14 +6776,14 @@ if test "${enable_base64+set}" = set; then
                           else
                             wx_cv_use_base64='wxUSE_BASE64=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
@@ -6855,8 +6792,8 @@ fi
 
 
           eval "$wx_cv_use_base64"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_base64 >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_BASE64=$wxUSE_BASE64" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6885,7 +6822,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-backtrace was given.
 if test "${enable_backtrace+set}" = set; then
   enableval=$enable_backtrace;
@@ -6894,14 +6830,14 @@ if test "${enable_backtrace+set}" = set; then
                           else
                             wx_cv_use_backtrace='wxUSE_STACKWALKER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
@@ -6910,8 +6846,8 @@ fi
 
 
           eval "$wx_cv_use_backtrace"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_backtrace >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STACKWALKER=$wxUSE_STACKWALKER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6940,7 +6876,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-catch_segvs was given.
 if test "${enable_catch_segvs+set}" = set; then
   enableval=$enable_catch_segvs;
@@ -6949,14 +6884,14 @@ if test "${enable_catch_segvs+set}" = set; then
                           else
                             wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
@@ -6965,8 +6900,8 @@ fi
 
 
           eval "$wx_cv_use_catch_segvs"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ON_FATAL_EXCEPTION=$wxUSE_ON_FATAL_EXCEPTION" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6995,7 +6930,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-cmdline was given.
 if test "${enable_cmdline+set}" = set; then
   enableval=$enable_cmdline;
@@ -7004,14 +6938,14 @@ if test "${enable_cmdline+set}" = set; then
                           else
                             wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
@@ -7020,8 +6954,8 @@ fi
 
 
           eval "$wx_cv_use_cmdline"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CMDLINE_PARSER=$wxUSE_CMDLINE_PARSER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7050,7 +6984,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-datetime was given.
 if test "${enable_datetime+set}" = set; then
   enableval=$enable_datetime;
@@ -7059,14 +6992,14 @@ if test "${enable_datetime+set}" = set; then
                           else
                             wx_cv_use_datetime='wxUSE_DATETIME=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
@@ -7075,8 +7008,8 @@ fi
 
 
           eval "$wx_cv_use_datetime"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_datetime >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DATETIME=$wxUSE_DATETIME" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7105,7 +7038,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debugreport" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-debugreport was given.
 if test "${enable_debugreport+set}" = set; then
   enableval=$enable_debugreport;
@@ -7114,14 +7046,14 @@ if test "${enable_debugreport+set}" = set; then
                           else
                             wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
@@ -7130,8 +7062,8 @@ fi
 
 
           eval "$wx_cv_use_debugreport"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_debugreport >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DEBUGREPORT=$wxUSE_DEBUGREPORT" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7160,7 +7092,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-dialupman was given.
 if test "${enable_dialupman+set}" = set; then
   enableval=$enable_dialupman;
@@ -7169,14 +7100,14 @@ if test "${enable_dialupman+set}" = set; then
                           else
                             wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
@@ -7185,8 +7116,8 @@ fi
 
 
           eval "$wx_cv_use_dialupman"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DIALUP_MANAGER=$wxUSE_DIALUP_MANAGER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7215,7 +7146,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynlib" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-dynlib was given.
 if test "${enable_dynlib+set}" = set; then
   enableval=$enable_dynlib;
@@ -7224,14 +7154,14 @@ if test "${enable_dynlib+set}" = set; then
                           else
                             wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
@@ -7240,8 +7170,8 @@ fi
 
 
           eval "$wx_cv_use_dynlib"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DYNLIB_CLASS=$wxUSE_DYNLIB_CLASS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7270,7 +7200,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynamicloader" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-dynamicloader was given.
 if test "${enable_dynamicloader+set}" = set; then
   enableval=$enable_dynamicloader;
@@ -7279,14 +7208,14 @@ if test "${enable_dynamicloader+set}" = set; then
                           else
                             wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
@@ -7295,8 +7224,8 @@ fi
 
 
           eval "$wx_cv_use_dynamicloader"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DYNAMIC_LOADER=$wxUSE_DYNAMIC_LOADER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7325,7 +7254,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-exceptions" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-exceptions was given.
 if test "${enable_exceptions+set}" = set; then
   enableval=$enable_exceptions;
@@ -7334,14 +7262,14 @@ if test "${enable_exceptions+set}" = set; then
                           else
                             wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
@@ -7350,8 +7278,8 @@ fi
 
 
           eval "$wx_cv_use_exceptions"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_exceptions >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_EXCEPTIONS=$wxUSE_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7380,7 +7308,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-ffile was given.
 if test "${enable_ffile+set}" = set; then
   enableval=$enable_ffile;
@@ -7389,14 +7316,14 @@ if test "${enable_ffile+set}" = set; then
                           else
                             wx_cv_use_ffile='wxUSE_FFILE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
@@ -7405,8 +7332,8 @@ fi
 
 
           eval "$wx_cv_use_ffile"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_ffile >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FFILE=$wxUSE_FFILE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7435,7 +7362,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-file was given.
 if test "${enable_file+set}" = set; then
   enableval=$enable_file;
@@ -7444,14 +7370,14 @@ if test "${enable_file+set}" = set; then
                           else
                             wx_cv_use_file='wxUSE_FILE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
@@ -7460,8 +7386,8 @@ fi
 
 
           eval "$wx_cv_use_file"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_file >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FILE=$wxUSE_FILE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7490,7 +7416,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-filesystem was given.
 if test "${enable_filesystem+set}" = set; then
   enableval=$enable_filesystem;
@@ -7499,14 +7424,14 @@ if test "${enable_filesystem+set}" = set; then
                           else
                             wx_cv_use_filesystem='wxUSE_FILESYSTEM=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
@@ -7515,8 +7440,8 @@ fi
 
 
           eval "$wx_cv_use_filesystem"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FILESYSTEM=$wxUSE_FILESYSTEM" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7533,6 +7458,60 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontenum" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fontenum... $ECHO_C" >&6; }
+          # Check whether --enable-fontenum was given.
+if test "${enable_fontenum+set}" = set; then
+  enableval=$enable_fontenum;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_fontenum='wxUSE_FONTENUM=yes'
+                          else
+                            wx_cv_use_fontenum='wxUSE_FONTENUM=no'
+                          fi
+                          cache=yes
+
+else
+
+                          cache=no
+                          LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          fi
+
+                          wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_fontenum"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FONTENUM=$wxUSE_FONTENUM" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FONTENUM = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_FONTENUM
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -7545,7 +7524,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-fontmap was given.
 if test "${enable_fontmap+set}" = set; then
   enableval=$enable_fontmap;
@@ -7554,14 +7532,14 @@ if test "${enable_fontmap+set}" = set; then
                           else
                             wx_cv_use_fontmap='wxUSE_FONTMAP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
@@ -7570,8 +7548,8 @@ fi
 
 
           eval "$wx_cv_use_fontmap"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FONTMAP=$wxUSE_FONTMAP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7600,7 +7578,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_archive" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-fs_archive was given.
 if test "${enable_fs_archive+set}" = set; then
   enableval=$enable_fs_archive;
@@ -7609,14 +7586,14 @@ if test "${enable_fs_archive+set}" = set; then
                           else
                             wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
@@ -7625,8 +7602,8 @@ fi
 
 
           eval "$wx_cv_use_fs_archive"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FS_ARCHIVE=$wxUSE_FS_ARCHIVE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7655,7 +7632,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-fs_inet was given.
 if test "${enable_fs_inet+set}" = set; then
   enableval=$enable_fs_inet;
@@ -7664,14 +7640,14 @@ if test "${enable_fs_inet+set}" = set; then
                           else
                             wx_cv_use_fs_inet='wxUSE_FS_INET=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
@@ -7680,8 +7656,8 @@ fi
 
 
           eval "$wx_cv_use_fs_inet"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FS_INET=$wxUSE_FS_INET" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7710,7 +7686,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-fs_zip was given.
 if test "${enable_fs_zip+set}" = set; then
   enableval=$enable_fs_zip;
@@ -7719,14 +7694,14 @@ if test "${enable_fs_zip+set}" = set; then
                           else
                             wx_cv_use_fs_zip='wxUSE_FS_ZIP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
@@ -7735,8 +7710,8 @@ fi
 
 
           eval "$wx_cv_use_fs_zip"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FS_ZIP=$wxUSE_FS_ZIP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7765,7 +7740,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-geometry was given.
 if test "${enable_geometry+set}" = set; then
   enableval=$enable_geometry;
@@ -7774,14 +7748,14 @@ if test "${enable_geometry+set}" = set; then
                           else
                             wx_cv_use_geometry='wxUSE_GEOMETRY=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
@@ -7790,8 +7764,8 @@ fi
 
 
           eval "$wx_cv_use_geometry"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_geometry >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_GEOMETRY=$wxUSE_GEOMETRY" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7820,7 +7794,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-log was given.
 if test "${enable_log+set}" = set; then
   enableval=$enable_log;
@@ -7829,14 +7802,14 @@ if test "${enable_log+set}" = set; then
                           else
                             wx_cv_use_log='wxUSE_LOG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
@@ -7845,8 +7818,8 @@ fi
 
 
           eval "$wx_cv_use_log"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_log >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LOG=$wxUSE_LOG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7875,7 +7848,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-longlong was given.
 if test "${enable_longlong+set}" = set; then
   enableval=$enable_longlong;
@@ -7884,14 +7856,14 @@ if test "${enable_longlong+set}" = set; then
                           else
                             wx_cv_use_longlong='wxUSE_LONGLONG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
@@ -7900,8 +7872,8 @@ fi
 
 
           eval "$wx_cv_use_longlong"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_longlong >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LONGLONG=$wxUSE_LONGLONG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7930,7 +7902,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-mimetype was given.
 if test "${enable_mimetype+set}" = set; then
   enableval=$enable_mimetype;
@@ -7939,14 +7910,14 @@ if test "${enable_mimetype+set}" = set; then
                           else
                             wx_cv_use_mimetype='wxUSE_MIMETYPE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
@@ -7955,8 +7926,8 @@ fi
 
 
           eval "$wx_cv_use_mimetype"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MIMETYPE=$wxUSE_MIMETYPE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7985,7 +7956,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-snglinst was given.
 if test "${enable_snglinst+set}" = set; then
   enableval=$enable_snglinst;
@@ -7994,14 +7964,14 @@ if test "${enable_snglinst+set}" = set; then
                           else
                             wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
@@ -8010,8 +7980,8 @@ fi
 
 
           eval "$wx_cv_use_snglinst"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SNGLINST_CHECKER=$wxUSE_SNGLINST_CHECKER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8040,7 +8010,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-stdpaths was given.
 if test "${enable_stdpaths+set}" = set; then
   enableval=$enable_stdpaths;
@@ -8049,14 +8018,14 @@ if test "${enable_stdpaths+set}" = set; then
                           else
                             wx_cv_use_stdpaths='wxUSE_STDPATHS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
@@ -8065,8 +8034,8 @@ fi
 
 
           eval "$wx_cv_use_stdpaths"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STDPATHS=$wxUSE_STDPATHS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8095,7 +8064,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-stopwatch was given.
 if test "${enable_stopwatch+set}" = set; then
   enableval=$enable_stopwatch;
@@ -8104,14 +8072,14 @@ if test "${enable_stopwatch+set}" = set; then
                           else
                             wx_cv_use_stopwatch='wxUSE_STOPWATCH=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
@@ -8120,8 +8088,8 @@ fi
 
 
           eval "$wx_cv_use_stopwatch"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STOPWATCH=$wxUSE_STOPWATCH" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8150,7 +8118,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-streams was given.
 if test "${enable_streams+set}" = set; then
   enableval=$enable_streams;
@@ -8159,14 +8126,14 @@ if test "${enable_streams+set}" = set; then
                           else
                             wx_cv_use_streams='wxUSE_STREAMS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
@@ -8175,8 +8142,8 @@ fi
 
 
           eval "$wx_cv_use_streams"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_streams >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STREAMS=$wxUSE_STREAMS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8205,7 +8172,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-system_options was given.
 if test "${enable_system_options+set}" = set; then
   enableval=$enable_system_options;
@@ -8214,14 +8180,14 @@ if test "${enable_system_options+set}" = set; then
                           else
                             wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
@@ -8230,8 +8196,8 @@ fi
 
 
           eval "$wx_cv_use_system_options"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_system_options >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SYSTEM_OPTIONS=$wxUSE_SYSTEM_OPTIONS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8260,7 +8226,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tarstream" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-tarstream was given.
 if test "${enable_tarstream+set}" = set; then
   enableval=$enable_tarstream;
@@ -8269,14 +8234,14 @@ if test "${enable_tarstream+set}" = set; then
                           else
                             wx_cv_use_tarstream='wxUSE_TARSTREAM=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
@@ -8285,8 +8250,8 @@ fi
 
 
           eval "$wx_cv_use_tarstream"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tarstream >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TARSTREAM=$wxUSE_TARSTREAM" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8315,7 +8280,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-textbuf was given.
 if test "${enable_textbuf+set}" = set; then
   enableval=$enable_textbuf;
@@ -8324,14 +8288,14 @@ if test "${enable_textbuf+set}" = set; then
                           else
                             wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
@@ -8340,8 +8304,8 @@ fi
 
 
           eval "$wx_cv_use_textbuf"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TEXTBUFFER=$wxUSE_TEXTBUFFER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8370,7 +8334,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-textfile was given.
 if test "${enable_textfile+set}" = set; then
   enableval=$enable_textfile;
@@ -8379,14 +8342,14 @@ if test "${enable_textfile+set}" = set; then
                           else
                             wx_cv_use_textfile='wxUSE_TEXTFILE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
@@ -8395,8 +8358,8 @@ fi
 
 
           eval "$wx_cv_use_textfile"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_textfile >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TEXTFILE=$wxUSE_TEXTFILE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8425,7 +8388,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-timer was given.
 if test "${enable_timer+set}" = set; then
   enableval=$enable_timer;
@@ -8434,14 +8396,14 @@ if test "${enable_timer+set}" = set; then
                           else
                             wx_cv_use_timer='wxUSE_TIMER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
@@ -8450,8 +8412,8 @@ fi
 
 
           eval "$wx_cv_use_timer"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_timer >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TIMER=$wxUSE_TIMER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8480,7 +8442,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-sound was given.
 if test "${enable_sound+set}" = set; then
   enableval=$enable_sound;
@@ -8489,14 +8450,14 @@ if test "${enable_sound+set}" = set; then
                           else
                             wx_cv_use_sound='wxUSE_SOUND=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
@@ -8505,8 +8466,8 @@ fi
 
 
           eval "$wx_cv_use_sound"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_sound >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SOUND=$wxUSE_SOUND" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8535,7 +8496,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-mediactrl was given.
 if test "${enable_mediactrl+set}" = set; then
   enableval=$enable_mediactrl;
@@ -8544,14 +8504,14 @@ if test "${enable_mediactrl+set}" = set; then
                           else
                             wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
@@ -8560,8 +8520,8 @@ fi
 
 
           eval "$wx_cv_use_mediactrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mediactrl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MEDIACTRL=$wxUSE_MEDIACTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8590,7 +8550,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-gstreamer8 was given.
 if test "${enable_gstreamer8+set}" = set; then
   enableval=$enable_gstreamer8;
@@ -8599,14 +8558,14 @@ if test "${enable_gstreamer8+set}" = set; then
                           else
                             wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
@@ -8615,8 +8574,8 @@ fi
 
 
           eval "$wx_cv_use_gstreamer8"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gstreamer8 >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_GSTREAMER8=$wxUSE_GSTREAMER8" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8645,7 +8604,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-printfposparam was given.
 if test "${enable_printfposparam+set}" = set; then
   enableval=$enable_printfposparam;
@@ -8654,14 +8612,14 @@ if test "${enable_printfposparam+set}" = set; then
                           else
                             wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
@@ -8670,8 +8628,8 @@ fi
 
 
           eval "$wx_cv_use_printfposparam"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_printfposparam >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PRINTF_POS_PARAMS=$wxUSE_PRINTF_POS_PARAMS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8700,7 +8658,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-zipstream" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-zipstream was given.
 if test "${enable_zipstream+set}" = set; then
   enableval=$enable_zipstream;
@@ -8709,14 +8666,14 @@ if test "${enable_zipstream+set}" = set; then
                           else
                             wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
@@ -8725,8 +8682,8 @@ fi
 
 
           eval "$wx_cv_use_zipstream"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ZIPSTREAM=$wxUSE_ZIPSTREAM" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8756,7 +8713,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-url" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-url was given.
 if test "${enable_url+set}" = set; then
   enableval=$enable_url;
@@ -8765,14 +8721,14 @@ if test "${enable_url+set}" = set; then
                           else
                             wx_cv_use_url='wxUSE_URL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
@@ -8781,8 +8737,8 @@ fi
 
 
           eval "$wx_cv_use_url"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_url >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_URL=$wxUSE_URL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8811,7 +8767,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-variant was given.
 if test "${enable_variant+set}" = set; then
   enableval=$enable_variant;
@@ -8820,14 +8775,14 @@ if test "${enable_variant+set}" = set; then
                           else
                             wx_cv_use_variant='wxUSE_VARIANT=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
@@ -8836,8 +8791,8 @@ fi
 
 
           eval "$wx_cv_use_variant"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_variant >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_VARIANT=$wxUSE_VARIANT" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8866,7 +8821,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-protocol was given.
 if test "${enable_protocol+set}" = set; then
   enableval=$enable_protocol;
@@ -8875,14 +8829,14 @@ if test "${enable_protocol+set}" = set; then
                           else
                             wx_cv_use_protocol='wxUSE_PROTOCOL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
@@ -8891,8 +8845,8 @@ fi
 
 
           eval "$wx_cv_use_protocol"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_protocol >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8921,7 +8875,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_http" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-protocol_http was given.
 if test "${enable_protocol_http+set}" = set; then
   enableval=$enable_protocol_http;
@@ -8930,14 +8883,14 @@ if test "${enable_protocol_http+set}" = set; then
                           else
                             wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
@@ -8946,8 +8899,8 @@ fi
 
 
           eval "$wx_cv_use_protocol_http"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8976,7 +8929,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_ftp" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-protocol_ftp was given.
 if test "${enable_protocol_ftp+set}" = set; then
   enableval=$enable_protocol_ftp;
@@ -8985,14 +8937,14 @@ if test "${enable_protocol_ftp+set}" = set; then
                           else
                             wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
@@ -9001,8 +8953,8 @@ fi
 
 
           eval "$wx_cv_use_protocol_ftp"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9031,7 +8983,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_file" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-protocol_file was given.
 if test "${enable_protocol_file+set}" = set; then
   enableval=$enable_protocol_file;
@@ -9040,14 +8991,14 @@ if test "${enable_protocol_file+set}" = set; then
                           else
                             wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
@@ -9056,8 +9007,8 @@ fi
 
 
           eval "$wx_cv_use_protocol_file"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9087,7 +9038,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-threads" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval=$enable_threads;
@@ -9096,14 +9046,14 @@ if test "${enable_threads+set}" = set; then
                           else
                             wx_cv_use_threads='wxUSE_THREADS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
@@ -9112,8 +9062,8 @@ fi
 
 
           eval "$wx_cv_use_threads"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_threads >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_THREADS=$wxUSE_THREADS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9146,7 +9096,6 @@ if test "$wxUSE_GUI" = "yes"; then
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-docview" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-docview was given.
 if test "${enable_docview+set}" = set; then
   enableval=$enable_docview;
@@ -9155,14 +9104,14 @@ if test "${enable_docview+set}" = set; then
                           else
                             wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
@@ -9171,8 +9120,8 @@ fi
 
 
           eval "$wx_cv_use_docview"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_docview >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DOC_VIEW_ARCHITECTURE=$wxUSE_DOC_VIEW_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9201,7 +9150,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-help" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-help was given.
 if test "${enable_help+set}" = set; then
   enableval=$enable_help;
@@ -9210,14 +9158,14 @@ if test "${enable_help+set}" = set; then
                           else
                             wx_cv_use_help='wxUSE_HELP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
@@ -9226,8 +9174,8 @@ fi
 
 
           eval "$wx_cv_use_help"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_help >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_HELP=$wxUSE_HELP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9256,7 +9204,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mshtmlhelp" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-mshtmlhelp was given.
 if test "${enable_mshtmlhelp+set}" = set; then
   enableval=$enable_mshtmlhelp;
@@ -9265,14 +9212,14 @@ if test "${enable_mshtmlhelp+set}" = set; then
                           else
                             wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
@@ -9281,8 +9228,8 @@ fi
 
 
           eval "$wx_cv_use_mshtmlhelp"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MS_HTML_HELP=$wxUSE_MS_HTML_HELP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9311,7 +9258,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-html was given.
 if test "${enable_html+set}" = set; then
   enableval=$enable_html;
@@ -9320,14 +9266,14 @@ if test "${enable_html+set}" = set; then
                           else
                             wx_cv_use_html='wxUSE_HTML=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
@@ -9336,8 +9282,8 @@ fi
 
 
           eval "$wx_cv_use_html"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_html >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_HTML=$wxUSE_HTML" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9366,7 +9312,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-htmlhelp" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-htmlhelp was given.
 if test "${enable_htmlhelp+set}" = set; then
   enableval=$enable_htmlhelp;
@@ -9375,14 +9320,14 @@ if test "${enable_htmlhelp+set}" = set; then
                           else
                             wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
@@ -9391,8 +9336,8 @@ fi
 
 
           eval "$wx_cv_use_htmlhelp"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_WXHTML_HELP=$wxUSE_WXHTML_HELP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9421,7 +9366,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xrc" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-xrc was given.
 if test "${enable_xrc+set}" = set; then
   enableval=$enable_xrc;
@@ -9430,14 +9374,14 @@ if test "${enable_xrc+set}" = set; then
                           else
                             wx_cv_use_xrc='wxUSE_XRC=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
@@ -9446,8 +9390,8 @@ fi
 
 
           eval "$wx_cv_use_xrc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_xrc >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_XRC=$wxUSE_XRC" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9476,7 +9420,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aui" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-aui was given.
 if test "${enable_aui+set}" = set; then
   enableval=$enable_aui;
@@ -9485,14 +9428,14 @@ if test "${enable_aui+set}" = set; then
                           else
                             wx_cv_use_aui='wxUSE_AUI=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
@@ -9501,8 +9444,8 @@ fi
 
 
           eval "$wx_cv_use_aui"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_aui >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_AUI=$wxUSE_AUI" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9531,7 +9474,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stc" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-stc was given.
 if test "${enable_stc+set}" = set; then
   enableval=$enable_stc;
@@ -9540,14 +9482,14 @@ if test "${enable_stc+set}" = set; then
                           else
                             wx_cv_use_stc='wxUSE_STC=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
@@ -9556,8 +9498,8 @@ fi
 
 
           eval "$wx_cv_use_stc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_stc >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STC=$wxUSE_STC" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9586,7 +9528,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-constraints was given.
 if test "${enable_constraints+set}" = set; then
   enableval=$enable_constraints;
@@ -9595,14 +9536,14 @@ if test "${enable_constraints+set}" = set; then
                           else
                             wx_cv_use_constraints='wxUSE_CONSTRAINTS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
@@ -9611,8 +9552,8 @@ fi
 
 
           eval "$wx_cv_use_constraints"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_constraints >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CONSTRAINTS=$wxUSE_CONSTRAINTS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9641,7 +9582,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-printarch was given.
 if test "${enable_printarch+set}" = set; then
   enableval=$enable_printarch;
@@ -9650,14 +9590,14 @@ if test "${enable_printarch+set}" = set; then
                           else
                             wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
@@ -9666,8 +9606,8 @@ fi
 
 
           eval "$wx_cv_use_printarch"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_printarch >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PRINTING_ARCHITECTURE=$wxUSE_PRINTING_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9696,7 +9636,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-mdi was given.
 if test "${enable_mdi+set}" = set; then
   enableval=$enable_mdi;
@@ -9705,14 +9644,14 @@ if test "${enable_mdi+set}" = set; then
                           else
                             wx_cv_use_mdi='wxUSE_MDI=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
@@ -9721,8 +9660,8 @@ fi
 
 
           eval "$wx_cv_use_mdi"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mdi >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MDI=$wxUSE_MDI" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9751,7 +9690,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-mdidoc was given.
 if test "${enable_mdidoc+set}" = set; then
   enableval=$enable_mdidoc;
@@ -9760,14 +9698,14 @@ if test "${enable_mdidoc+set}" = set; then
                           else
                             wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
@@ -9776,8 +9714,8 @@ fi
 
 
           eval "$wx_cv_use_mdidoc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MDI_ARCHITECTURE=$wxUSE_MDI_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9806,7 +9744,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-loggui was given.
 if test "${enable_loggui+set}" = set; then
   enableval=$enable_loggui;
@@ -9815,14 +9752,14 @@ if test "${enable_loggui+set}" = set; then
                           else
                             wx_cv_use_loggui='wxUSE_LOGGUI=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
@@ -9831,8 +9768,8 @@ fi
 
 
           eval "$wx_cv_use_loggui"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_loggui >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LOGGUI=$wxUSE_LOGGUI" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9861,7 +9798,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-logwin was given.
 if test "${enable_logwin+set}" = set; then
   enableval=$enable_logwin;
@@ -9870,14 +9806,14 @@ if test "${enable_logwin+set}" = set; then
                           else
                             wx_cv_use_logwin='wxUSE_LOGWINDOW=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
@@ -9886,8 +9822,8 @@ fi
 
 
           eval "$wx_cv_use_logwin"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_logwin >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LOGWINDOW=$wxUSE_LOGWINDOW" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9916,7 +9852,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-logdialog was given.
 if test "${enable_logdialog+set}" = set; then
   enableval=$enable_logdialog;
@@ -9925,14 +9860,14 @@ if test "${enable_logdialog+set}" = set; then
                           else
                             wx_cv_use_logdialog='wxUSE_LOGDIALOG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
@@ -9941,8 +9876,8 @@ fi
 
 
           eval "$wx_cv_use_logdialog"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_logdialog >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LOGDIALOG=$wxUSE_LOGDIALOG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9971,7 +9906,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-webkit was given.
 if test "${enable_webkit+set}" = set; then
   enableval=$enable_webkit;
@@ -9980,14 +9914,14 @@ if test "${enable_webkit+set}" = set; then
                           else
                             wx_cv_use_webkit='wxUSE_WEBKIT=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
@@ -9996,8 +9930,8 @@ fi
 
 
           eval "$wx_cv_use_webkit"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_webkit >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_WEBKIT=$wxUSE_WEBKIT" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10026,7 +9960,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richtext" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-richtext was given.
 if test "${enable_richtext+set}" = set; then
   enableval=$enable_richtext;
@@ -10035,14 +9968,14 @@ if test "${enable_richtext+set}" = set; then
                           else
                             wx_cv_use_richtext='wxUSE_RICHTEXT=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
@@ -10051,8 +9984,8 @@ fi
 
 
           eval "$wx_cv_use_richtext"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_richtext >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_RICHTEXT=$wxUSE_RICHTEXT" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10081,7 +10014,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-graphics_ctx was given.
 if test "${enable_graphics_ctx+set}" = set; then
   enableval=$enable_graphics_ctx;
@@ -10090,14 +10022,14 @@ if test "${enable_graphics_ctx+set}" = set; then
                           else
                             wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
@@ -10106,8 +10038,8 @@ fi
 
 
           eval "$wx_cv_use_graphics_ctx"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_GRAPHICS_CONTEXT=$wxUSE_GRAPHICS_CONTEXT" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10136,7 +10068,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-postscript was given.
 if test "${enable_postscript+set}" = set; then
   enableval=$enable_postscript;
@@ -10145,14 +10076,14 @@ if test "${enable_postscript+set}" = set; then
                           else
                             wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
@@ -10161,8 +10092,8 @@ fi
 
 
           eval "$wx_cv_use_postscript"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_postscript >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_POSTSCRIPT=$wxUSE_POSTSCRIPT" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10191,7 +10122,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-svg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-svg was given.
 if test "${enable_svg+set}" = set; then
   enableval=$enable_svg;
@@ -10200,14 +10130,14 @@ if test "${enable_svg+set}" = set; then
                           else
                             wx_cv_use_svg='wxUSE_SVG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
@@ -10216,8 +10146,8 @@ fi
 
 
           eval "$wx_cv_use_svg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_svg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SVG=$wxUSE_SVG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10248,7 +10178,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-clipboard" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-clipboard was given.
 if test "${enable_clipboard+set}" = set; then
   enableval=$enable_clipboard;
@@ -10257,14 +10186,14 @@ if test "${enable_clipboard+set}" = set; then
                           else
                             wx_cv_use_clipboard='wxUSE_CLIPBOARD=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
@@ -10273,8 +10202,8 @@ fi
 
 
           eval "$wx_cv_use_clipboard"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CLIPBOARD=$wxUSE_CLIPBOARD" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10303,7 +10232,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dnd" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-dnd was given.
 if test "${enable_dnd+set}" = set; then
   enableval=$enable_dnd;
@@ -10312,14 +10240,14 @@ if test "${enable_dnd+set}" = set; then
                           else
                             wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
@@ -10328,8 +10256,8 @@ fi
 
 
           eval "$wx_cv_use_dnd"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dnd >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DRAG_AND_DROP=$wxUSE_DRAG_AND_DROP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10358,7 +10286,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-metafile was given.
 if test "${enable_metafile+set}" = set; then
   enableval=$enable_metafile;
@@ -10367,14 +10294,14 @@ if test "${enable_metafile+set}" = set; then
                           else
                             wx_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
@@ -10383,8 +10310,8 @@ fi
 
 
           eval "$wx_cv_use_metafile"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10416,7 +10343,6 @@ DEFAULT_wxUSE_CONTROLS=none
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-controls" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-controls was given.
 if test "${enable_controls+set}" = set; then
   enableval=$enable_controls;
@@ -10425,14 +10351,14 @@ if test "${enable_controls+set}" = set; then
                           else
                             wx_cv_use_controls='wxUSE_CONTROLS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
@@ -10441,8 +10367,8 @@ fi
 
 
           eval "$wx_cv_use_controls"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_controls >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CONTROLS=$wxUSE_CONTROLS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10580,7 +10506,6 @@ fi
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accel" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-accel was given.
 if test "${enable_accel+set}" = set; then
   enableval=$enable_accel;
@@ -10589,14 +10514,14 @@ if test "${enable_accel+set}" = set; then
                           else
                             wx_cv_use_accel='wxUSE_ACCEL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
@@ -10605,8 +10530,8 @@ fi
 
 
           eval "$wx_cv_use_accel"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_accel >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ACCEL=$wxUSE_ACCEL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10635,7 +10560,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-animatectrl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-animatectrl was given.
 if test "${enable_animatectrl+set}" = set; then
   enableval=$enable_animatectrl;
@@ -10644,14 +10568,14 @@ if test "${enable_animatectrl+set}" = set; then
                           else
                             wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
@@ -10660,8 +10584,8 @@ fi
 
 
           eval "$wx_cv_use_animatectrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ANIMATIONCTRL=$wxUSE_ANIMATIONCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10690,7 +10614,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-button was given.
 if test "${enable_button+set}" = set; then
   enableval=$enable_button;
@@ -10699,14 +10622,14 @@ if test "${enable_button+set}" = set; then
                           else
                             wx_cv_use_button='wxUSE_BUTTON=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
@@ -10715,8 +10638,8 @@ fi
 
 
           eval "$wx_cv_use_button"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_button >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_BUTTON=$wxUSE_BUTTON" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10745,7 +10668,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-bmpbutton was given.
 if test "${enable_bmpbutton+set}" = set; then
   enableval=$enable_bmpbutton;
@@ -10754,14 +10676,14 @@ if test "${enable_bmpbutton+set}" = set; then
                           else
                             wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
@@ -10770,8 +10692,8 @@ fi
 
 
           eval "$wx_cv_use_bmpbutton"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_BMPBUTTON=$wxUSE_BMPBUTTON" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10800,7 +10722,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-bmpcombobox was given.
 if test "${enable_bmpcombobox+set}" = set; then
   enableval=$enable_bmpcombobox;
@@ -10809,14 +10730,14 @@ if test "${enable_bmpcombobox+set}" = set; then
                           else
                             wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
@@ -10825,8 +10746,8 @@ fi
 
 
           eval "$wx_cv_use_bmpcombobox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_BITMAPCOMBOBOX=$wxUSE_BITMAPCOMBOBOX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10855,7 +10776,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-calendar" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-calendar was given.
 if test "${enable_calendar+set}" = set; then
   enableval=$enable_calendar;
@@ -10864,14 +10784,14 @@ if test "${enable_calendar+set}" = set; then
                           else
                             wx_cv_use_calendar='wxUSE_CALCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
@@ -10880,8 +10800,8 @@ fi
 
 
           eval "$wx_cv_use_calendar"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_calendar >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CALCTRL=$wxUSE_CALCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10910,7 +10830,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-caret" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-caret was given.
 if test "${enable_caret+set}" = set; then
   enableval=$enable_caret;
@@ -10919,14 +10838,14 @@ if test "${enable_caret+set}" = set; then
                           else
                             wx_cv_use_caret='wxUSE_CARET=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
@@ -10935,8 +10854,8 @@ fi
 
 
           eval "$wx_cv_use_caret"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_caret >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CARET=$wxUSE_CARET" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10965,7 +10884,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checkbox" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-checkbox was given.
 if test "${enable_checkbox+set}" = set; then
   enableval=$enable_checkbox;
@@ -10974,14 +10892,14 @@ if test "${enable_checkbox+set}" = set; then
                           else
                             wx_cv_use_checkbox='wxUSE_CHECKBOX=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
@@ -10990,8 +10908,8 @@ fi
 
 
           eval "$wx_cv_use_checkbox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CHECKBOX=$wxUSE_CHECKBOX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11020,7 +10938,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checklst" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-checklst was given.
 if test "${enable_checklst+set}" = set; then
   enableval=$enable_checklst;
@@ -11029,14 +10946,14 @@ if test "${enable_checklst+set}" = set; then
                           else
                             wx_cv_use_checklst='wxUSE_CHECKLST=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
@@ -11045,8 +10962,8 @@ fi
 
 
           eval "$wx_cv_use_checklst"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_checklst >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CHECKLST=$wxUSE_CHECKLST" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11075,7 +10992,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choice" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-choice was given.
 if test "${enable_choice+set}" = set; then
   enableval=$enable_choice;
@@ -11084,14 +11000,14 @@ if test "${enable_choice+set}" = set; then
                           else
                             wx_cv_use_choice='wxUSE_CHOICE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
@@ -11100,8 +11016,8 @@ fi
 
 
           eval "$wx_cv_use_choice"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_choice >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CHOICE=$wxUSE_CHOICE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11130,7 +11046,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicebook" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-choicebook was given.
 if test "${enable_choicebook+set}" = set; then
   enableval=$enable_choicebook;
@@ -11139,14 +11054,14 @@ if test "${enable_choicebook+set}" = set; then
                           else
                             wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
@@ -11155,8 +11070,8 @@ fi
 
 
           eval "$wx_cv_use_choicebook"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_choicebook >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CHOICEBOOK=$wxUSE_CHOICEBOOK" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11185,7 +11100,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-collpane" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-collpane was given.
 if test "${enable_collpane+set}" = set; then
   enableval=$enable_collpane;
@@ -11194,14 +11108,14 @@ if test "${enable_collpane+set}" = set; then
                           else
                             wx_cv_use_collpane='wxUSE_COLLPANE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
@@ -11210,8 +11124,8 @@ fi
 
 
           eval "$wx_cv_use_collpane"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_collpane >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_COLLPANE=$wxUSE_COLLPANE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11240,7 +11154,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-colourpicker" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-colourpicker was given.
 if test "${enable_colourpicker+set}" = set; then
   enableval=$enable_colourpicker;
@@ -11249,14 +11162,14 @@ if test "${enable_colourpicker+set}" = set; then
                           else
                             wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
@@ -11265,8 +11178,8 @@ fi
 
 
           eval "$wx_cv_use_colourpicker"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_COLOURPICKERCTRL=$wxUSE_COLOURPICKERCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11295,7 +11208,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combobox" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-combobox was given.
 if test "${enable_combobox+set}" = set; then
   enableval=$enable_combobox;
@@ -11304,14 +11216,14 @@ if test "${enable_combobox+set}" = set; then
                           else
                             wx_cv_use_combobox='wxUSE_COMBOBOX=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
@@ -11320,8 +11232,8 @@ fi
 
 
           eval "$wx_cv_use_combobox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_combobox >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_COMBOBOX=$wxUSE_COMBOBOX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11350,7 +11262,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-comboctrl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-comboctrl was given.
 if test "${enable_comboctrl+set}" = set; then
   enableval=$enable_comboctrl;
@@ -11359,14 +11270,14 @@ if test "${enable_comboctrl+set}" = set; then
                           else
                             wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
@@ -11375,8 +11286,8 @@ fi
 
 
           eval "$wx_cv_use_comboctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_COMBOCTRL=$wxUSE_COMBOCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11405,7 +11316,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-datepick was given.
 if test "${enable_datepick+set}" = set; then
   enableval=$enable_datepick;
@@ -11414,14 +11324,14 @@ if test "${enable_datepick+set}" = set; then
                           else
                             wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
@@ -11430,8 +11340,8 @@ fi
 
 
           eval "$wx_cv_use_datepick"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_datepick >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DATEPICKCTRL=$wxUSE_DATEPICKCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11460,7 +11370,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-dirpicker was given.
 if test "${enable_dirpicker+set}" = set; then
   enableval=$enable_dirpicker;
@@ -11469,14 +11378,14 @@ if test "${enable_dirpicker+set}" = set; then
                           else
                             wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
@@ -11485,8 +11394,8 @@ fi
 
 
           eval "$wx_cv_use_dirpicker"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DIRPICKERCTRL=$wxUSE_DIRPICKERCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11515,7 +11424,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-display was given.
 if test "${enable_display+set}" = set; then
   enableval=$enable_display;
@@ -11524,14 +11432,14 @@ if test "${enable_display+set}" = set; then
                           else
                             wx_cv_use_display='wxUSE_DISPLAY=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
@@ -11540,8 +11448,8 @@ fi
 
 
           eval "$wx_cv_use_display"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_display >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DISPLAY=$wxUSE_DISPLAY" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11570,7 +11478,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-detect_sm was given.
 if test "${enable_detect_sm+set}" = set; then
   enableval=$enable_detect_sm;
@@ -11579,14 +11486,14 @@ if test "${enable_detect_sm+set}" = set; then
                           else
                             wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
@@ -11595,8 +11502,8 @@ fi
 
 
           eval "$wx_cv_use_detect_sm"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_detect_sm >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DETECT_SM=$wxUSE_DETECT_SM" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11625,7 +11532,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-editablebox was given.
 if test "${enable_editablebox+set}" = set; then
   enableval=$enable_editablebox;
@@ -11634,14 +11540,14 @@ if test "${enable_editablebox+set}" = set; then
                           else
                             wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
@@ -11650,8 +11556,8 @@ fi
 
 
           eval "$wx_cv_use_editablebox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_editablebox >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_EDITABLELISTBOX=$wxUSE_EDITABLELISTBOX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11680,7 +11586,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-filepicker was given.
 if test "${enable_filepicker+set}" = set; then
   enableval=$enable_filepicker;
@@ -11689,14 +11594,14 @@ if test "${enable_filepicker+set}" = set; then
                           else
                             wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
@@ -11705,8 +11610,8 @@ fi
 
 
           eval "$wx_cv_use_filepicker"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_filepicker >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FILEPICKERCTRL=$wxUSE_FILEPICKERCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11735,7 +11640,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontpicker" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-fontpicker was given.
 if test "${enable_fontpicker+set}" = set; then
   enableval=$enable_fontpicker;
@@ -11744,14 +11648,14 @@ if test "${enable_fontpicker+set}" = set; then
                           else
                             wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
@@ -11760,8 +11664,8 @@ fi
 
 
           eval "$wx_cv_use_fontpicker"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FONTPICKERCTRL=$wxUSE_FONTPICKERCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11790,7 +11694,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gauge" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-gauge was given.
 if test "${enable_gauge+set}" = set; then
   enableval=$enable_gauge;
@@ -11799,14 +11702,14 @@ if test "${enable_gauge+set}" = set; then
                           else
                             wx_cv_use_gauge='wxUSE_GAUGE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
@@ -11815,8 +11718,8 @@ fi
 
 
           eval "$wx_cv_use_gauge"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_GAUGE=$wxUSE_GAUGE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11845,7 +11748,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-grid" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-grid was given.
 if test "${enable_grid+set}" = set; then
   enableval=$enable_grid;
@@ -11854,14 +11756,14 @@ if test "${enable_grid+set}" = set; then
                           else
                             wx_cv_use_grid='wxUSE_GRID=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
@@ -11870,8 +11772,8 @@ fi
 
 
           eval "$wx_cv_use_grid"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_grid >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_GRID=$wxUSE_GRID" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11900,7 +11802,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-dataviewctrl was given.
 if test "${enable_dataviewctrl+set}" = set; then
   enableval=$enable_dataviewctrl;
@@ -11909,14 +11810,14 @@ if test "${enable_dataviewctrl+set}" = set; then
                           else
                             wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
@@ -11925,8 +11826,8 @@ fi
 
 
           eval "$wx_cv_use_dataviewctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DATAVIEWCTRL=$wxUSE_DATAVIEWCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11955,7 +11856,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hyperlink" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-hyperlink was given.
 if test "${enable_hyperlink+set}" = set; then
   enableval=$enable_hyperlink;
@@ -11964,14 +11864,14 @@ if test "${enable_hyperlink+set}" = set; then
                           else
                             wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
@@ -11980,8 +11880,8 @@ fi
 
 
           eval "$wx_cv_use_hyperlink"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_HYPERLINKCTRL=$wxUSE_HYPERLINKCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12010,7 +11910,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-imaglist was given.
 if test "${enable_imaglist+set}" = set; then
   enableval=$enable_imaglist;
@@ -12019,14 +11918,14 @@ if test "${enable_imaglist+set}" = set; then
                           else
                             wx_cv_use_imaglist='wxUSE_IMAGLIST=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
@@ -12035,8 +11934,8 @@ fi
 
 
           eval "$wx_cv_use_imaglist"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_IMAGLIST=$wxUSE_IMAGLIST" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12065,7 +11964,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbook" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-listbook was given.
 if test "${enable_listbook+set}" = set; then
   enableval=$enable_listbook;
@@ -12074,14 +11972,14 @@ if test "${enable_listbook+set}" = set; then
                           else
                             wx_cv_use_listbook='wxUSE_LISTBOOK=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
@@ -12090,8 +11988,8 @@ fi
 
 
           eval "$wx_cv_use_listbook"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_listbook >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LISTBOOK=$wxUSE_LISTBOOK" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12120,7 +12018,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbox" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-listbox was given.
 if test "${enable_listbox+set}" = set; then
   enableval=$enable_listbox;
@@ -12129,14 +12026,14 @@ if test "${enable_listbox+set}" = set; then
                           else
                             wx_cv_use_listbox='wxUSE_LISTBOX=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
@@ -12145,8 +12042,8 @@ fi
 
 
           eval "$wx_cv_use_listbox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_listbox >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LISTBOX=$wxUSE_LISTBOX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12175,7 +12072,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listctrl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-listctrl was given.
 if test "${enable_listctrl+set}" = set; then
   enableval=$enable_listctrl;
@@ -12184,14 +12080,14 @@ if test "${enable_listctrl+set}" = set; then
                           else
                             wx_cv_use_listctrl='wxUSE_LISTCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
@@ -12200,8 +12096,8 @@ fi
 
 
           eval "$wx_cv_use_listctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_LISTCTRL=$wxUSE_LISTCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12230,7 +12126,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notebook" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-notebook was given.
 if test "${enable_notebook+set}" = set; then
   enableval=$enable_notebook;
@@ -12239,14 +12134,14 @@ if test "${enable_notebook+set}" = set; then
                           else
                             wx_cv_use_notebook='wxUSE_NOTEBOOK=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
@@ -12255,8 +12150,8 @@ fi
 
 
           eval "$wx_cv_use_notebook"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_notebook >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_NOTEBOOK=$wxUSE_NOTEBOOK" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12285,7 +12180,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombobox" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-odcombobox was given.
 if test "${enable_odcombobox+set}" = set; then
   enableval=$enable_odcombobox;
@@ -12294,14 +12188,14 @@ if test "${enable_odcombobox+set}" = set; then
                           else
                             wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
@@ -12310,8 +12204,8 @@ fi
 
 
           eval "$wx_cv_use_odcombobox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ODCOMBOBOX=$wxUSE_ODCOMBOBOX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12340,7 +12234,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobox" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-radiobox was given.
 if test "${enable_radiobox+set}" = set; then
   enableval=$enable_radiobox;
@@ -12349,14 +12242,14 @@ if test "${enable_radiobox+set}" = set; then
                           else
                             wx_cv_use_radiobox='wxUSE_RADIOBOX=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
@@ -12365,8 +12258,8 @@ fi
 
 
           eval "$wx_cv_use_radiobox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_RADIOBOX=$wxUSE_RADIOBOX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12395,7 +12288,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobtn" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-radiobtn was given.
 if test "${enable_radiobtn+set}" = set; then
   enableval=$enable_radiobtn;
@@ -12404,14 +12296,14 @@ if test "${enable_radiobtn+set}" = set; then
                           else
                             wx_cv_use_radiobtn='wxUSE_RADIOBTN=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
@@ -12420,8 +12312,8 @@ fi
 
 
           eval "$wx_cv_use_radiobtn"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_RADIOBTN=$wxUSE_RADIOBTN" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12450,7 +12342,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sash" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-sash was given.
 if test "${enable_sash+set}" = set; then
   enableval=$enable_sash;
@@ -12459,14 +12350,14 @@ if test "${enable_sash+set}" = set; then
                           else
                             wx_cv_use_sash='wxUSE_SASH=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
@@ -12475,8 +12366,8 @@ fi
 
 
           eval "$wx_cv_use_sash"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_sash >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SASH=$wxUSE_SASH" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12505,7 +12396,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-scrollbar" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-scrollbar was given.
 if test "${enable_scrollbar+set}" = set; then
   enableval=$enable_scrollbar;
@@ -12514,14 +12404,14 @@ if test "${enable_scrollbar+set}" = set; then
                           else
                             wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
@@ -12530,8 +12420,8 @@ fi
 
 
           eval "$wx_cv_use_scrollbar"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SCROLLBAR=$wxUSE_SCROLLBAR" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12560,7 +12450,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-searchctrl was given.
 if test "${enable_searchctrl+set}" = set; then
   enableval=$enable_searchctrl;
@@ -12569,14 +12458,14 @@ if test "${enable_searchctrl+set}" = set; then
                           else
                             wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
@@ -12585,8 +12474,8 @@ fi
 
 
           eval "$wx_cv_use_searchctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SEARCHCTRL=$wxUSE_SEARCHCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12615,7 +12504,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-slider was given.
 if test "${enable_slider+set}" = set; then
   enableval=$enable_slider;
@@ -12624,14 +12512,14 @@ if test "${enable_slider+set}" = set; then
                           else
                             wx_cv_use_slider='wxUSE_SLIDER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
@@ -12640,8 +12528,8 @@ fi
 
 
           eval "$wx_cv_use_slider"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_slider >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SLIDER=$wxUSE_SLIDER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12670,7 +12558,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinbtn" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-spinbtn was given.
 if test "${enable_spinbtn+set}" = set; then
   enableval=$enable_spinbtn;
@@ -12679,14 +12566,14 @@ if test "${enable_spinbtn+set}" = set; then
                           else
                             wx_cv_use_spinbtn='wxUSE_SPINBTN=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
@@ -12695,8 +12582,8 @@ fi
 
 
           eval "$wx_cv_use_spinbtn"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SPINBTN=$wxUSE_SPINBTN" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12725,7 +12612,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinctrl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-spinctrl was given.
 if test "${enable_spinctrl+set}" = set; then
   enableval=$enable_spinctrl;
@@ -12734,14 +12620,14 @@ if test "${enable_spinctrl+set}" = set; then
                           else
                             wx_cv_use_spinctrl='wxUSE_SPINCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
@@ -12750,8 +12636,8 @@ fi
 
 
           eval "$wx_cv_use_spinctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SPINCTRL=$wxUSE_SPINCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12780,7 +12666,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splitter" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-splitter was given.
 if test "${enable_splitter+set}" = set; then
   enableval=$enable_splitter;
@@ -12789,14 +12674,14 @@ if test "${enable_splitter+set}" = set; then
                           else
                             wx_cv_use_splitter='wxUSE_SPLITTER=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
@@ -12805,8 +12690,8 @@ fi
 
 
           eval "$wx_cv_use_splitter"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_splitter >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SPLITTER=$wxUSE_SPLITTER" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12835,7 +12720,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbmp" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-statbmp was given.
 if test "${enable_statbmp+set}" = set; then
   enableval=$enable_statbmp;
@@ -12844,14 +12728,14 @@ if test "${enable_statbmp+set}" = set; then
                           else
                             wx_cv_use_statbmp='wxUSE_STATBMP=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
@@ -12860,8 +12744,8 @@ fi
 
 
           eval "$wx_cv_use_statbmp"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STATBMP=$wxUSE_STATBMP" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12890,7 +12774,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbox" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-statbox was given.
 if test "${enable_statbox+set}" = set; then
   enableval=$enable_statbox;
@@ -12899,14 +12782,14 @@ if test "${enable_statbox+set}" = set; then
                           else
                             wx_cv_use_statbox='wxUSE_STATBOX=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
@@ -12915,8 +12798,8 @@ fi
 
 
           eval "$wx_cv_use_statbox"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STATBOX=$wxUSE_STATBOX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12945,7 +12828,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statline" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-statline was given.
 if test "${enable_statline+set}" = set; then
   enableval=$enable_statline;
@@ -12954,14 +12836,14 @@ if test "${enable_statline+set}" = set; then
                           else
                             wx_cv_use_statline='wxUSE_STATLINE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
@@ -12970,8 +12852,8 @@ fi
 
 
           eval "$wx_cv_use_statline"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_statline >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STATLINE=$wxUSE_STATLINE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13000,7 +12882,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stattext" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-stattext was given.
 if test "${enable_stattext+set}" = set; then
   enableval=$enable_stattext;
@@ -13009,14 +12890,14 @@ if test "${enable_stattext+set}" = set; then
                           else
                             wx_cv_use_stattext='wxUSE_STATTEXT=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
@@ -13025,8 +12906,8 @@ fi
 
 
           eval "$wx_cv_use_stattext"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_stattext >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STATTEXT=$wxUSE_STATTEXT" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13055,7 +12936,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statusbar" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-statusbar was given.
 if test "${enable_statusbar+set}" = set; then
   enableval=$enable_statusbar;
@@ -13064,14 +12944,14 @@ if test "${enable_statusbar+set}" = set; then
                           else
                             wx_cv_use_statusbar='wxUSE_STATUSBAR=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
@@ -13080,8 +12960,8 @@ fi
 
 
           eval "$wx_cv_use_statusbar"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STATUSBAR=$wxUSE_STATUSBAR" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13110,7 +12990,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tabdialog" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-tabdialog was given.
 if test "${enable_tabdialog+set}" = set; then
   enableval=$enable_tabdialog;
@@ -13119,14 +12998,14 @@ if test "${enable_tabdialog+set}" = set; then
                           else
                             wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
@@ -13135,8 +13014,8 @@ fi
 
 
           eval "$wx_cv_use_tabdialog"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TAB_DIALOG=$wxUSE_TAB_DIALOG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13165,7 +13044,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-taskbaricon" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-taskbaricon was given.
 if test "${enable_taskbaricon+set}" = set; then
   enableval=$enable_taskbaricon;
@@ -13174,14 +13052,14 @@ if test "${enable_taskbaricon+set}" = set; then
                           else
                             wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
@@ -13190,8 +13068,8 @@ fi
 
 
           eval "$wx_cv_use_taskbaricon"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_taskbaricon >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TASKBARICON=$wxUSE_TASKBARICON" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13220,7 +13098,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-textctrl was given.
 if test "${enable_textctrl+set}" = set; then
   enableval=$enable_textctrl;
@@ -13229,14 +13106,14 @@ if test "${enable_textctrl+set}" = set; then
                           else
                             wx_cv_use_textctrl='wxUSE_TEXTCTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
@@ -13245,8 +13122,8 @@ fi
 
 
           eval "$wx_cv_use_textctrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TEXTCTRL=$wxUSE_TEXTCTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13275,7 +13152,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-togglebtn was given.
 if test "${enable_togglebtn+set}" = set; then
   enableval=$enable_togglebtn;
@@ -13284,14 +13160,14 @@ if test "${enable_togglebtn+set}" = set; then
                           else
                             wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
@@ -13300,8 +13176,8 @@ fi
 
 
           eval "$wx_cv_use_togglebtn"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TOGGLEBTN=$wxUSE_TOGGLEBTN" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13330,7 +13206,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-toolbar was given.
 if test "${enable_toolbar+set}" = set; then
   enableval=$enable_toolbar;
@@ -13339,14 +13214,14 @@ if test "${enable_toolbar+set}" = set; then
                           else
                             wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
@@ -13355,8 +13230,8 @@ fi
 
 
           eval "$wx_cv_use_toolbar"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TOOLBAR=$wxUSE_TOOLBAR" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13385,7 +13260,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-tbarnative was given.
 if test "${enable_tbarnative+set}" = set; then
   enableval=$enable_tbarnative;
@@ -13394,14 +13268,14 @@ if test "${enable_tbarnative+set}" = set; then
                           else
                             wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
@@ -13410,8 +13284,8 @@ fi
 
 
           eval "$wx_cv_use_tbarnative"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TOOLBAR_NATIVE=$wxUSE_TOOLBAR_NATIVE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13440,7 +13314,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-treebook was given.
 if test "${enable_treebook+set}" = set; then
   enableval=$enable_treebook;
@@ -13449,14 +13322,14 @@ if test "${enable_treebook+set}" = set; then
                           else
                             wx_cv_use_treebook='wxUSE_TREEBOOK=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
@@ -13465,8 +13338,8 @@ fi
 
 
           eval "$wx_cv_use_treebook"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_treebook >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TREEBOOK=$wxUSE_TREEBOOK" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13495,7 +13368,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbook" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-toolbook was given.
 if test "${enable_toolbook+set}" = set; then
   enableval=$enable_toolbook;
@@ -13504,14 +13376,14 @@ if test "${enable_toolbook+set}" = set; then
                           else
                             wx_cv_use_toolbook='wxUSE_TOOLBOOK=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
@@ -13520,8 +13392,8 @@ fi
 
 
           eval "$wx_cv_use_toolbook"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_toolbook >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TOOLBOOK=$wxUSE_TOOLBOOK" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13550,7 +13422,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-treectrl was given.
 if test "${enable_treectrl+set}" = set; then
   enableval=$enable_treectrl;
@@ -13559,14 +13430,14 @@ if test "${enable_treectrl+set}" = set; then
                           else
                             wx_cv_use_treectrl='wxUSE_TREECTRL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
@@ -13575,8 +13446,8 @@ fi
 
 
           eval "$wx_cv_use_treectrl"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TREECTRL=$wxUSE_TREECTRL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13605,7 +13476,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-tipwindow was given.
 if test "${enable_tipwindow+set}" = set; then
   enableval=$enable_tipwindow;
@@ -13614,14 +13484,14 @@ if test "${enable_tipwindow+set}" = set; then
                           else
                             wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
@@ -13630,8 +13500,8 @@ fi
 
 
           eval "$wx_cv_use_tipwindow"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TIPWINDOW=$wxUSE_TIPWINDOW" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13660,7 +13530,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-popupwin was given.
 if test "${enable_popupwin+set}" = set; then
   enableval=$enable_popupwin;
@@ -13669,14 +13538,14 @@ if test "${enable_popupwin+set}" = set; then
                           else
                             wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
@@ -13685,8 +13554,8 @@ fi
 
 
           eval "$wx_cv_use_popupwin"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_popupwin >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_POPUPWIN=$wxUSE_POPUPWIN" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13717,7 +13586,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commondlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-commondlg was given.
 if test "${enable_commondlg+set}" = set; then
   enableval=$enable_commondlg;
@@ -13726,14 +13594,14 @@ if test "${enable_commondlg+set}" = set; then
                           else
                             wx_cv_use_commondlg='wxUSE_COMMONDLGS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
@@ -13742,8 +13610,8 @@ fi
 
 
           eval "$wx_cv_use_commondlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_COMMONDLGS=$wxUSE_COMMONDLGS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13772,7 +13640,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aboutdlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-aboutdlg was given.
 if test "${enable_aboutdlg+set}" = set; then
   enableval=$enable_aboutdlg;
@@ -13781,14 +13648,14 @@ if test "${enable_aboutdlg+set}" = set; then
                           else
                             wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
@@ -13797,8 +13664,8 @@ fi
 
 
           eval "$wx_cv_use_aboutdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ABOUTDLG=$wxUSE_ABOUTDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13827,7 +13694,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicedlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-choicedlg was given.
 if test "${enable_choicedlg+set}" = set; then
   enableval=$enable_choicedlg;
@@ -13836,14 +13702,14 @@ if test "${enable_choicedlg+set}" = set; then
                           else
                             wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
@@ -13852,8 +13718,8 @@ fi
 
 
           eval "$wx_cv_use_choicedlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_CHOICEDLG=$wxUSE_CHOICEDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13882,7 +13748,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-coldlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-coldlg was given.
 if test "${enable_coldlg+set}" = set; then
   enableval=$enable_coldlg;
@@ -13891,14 +13756,14 @@ if test "${enable_coldlg+set}" = set; then
                           else
                             wx_cv_use_coldlg='wxUSE_COLOURDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
@@ -13907,8 +13772,8 @@ fi
 
 
           eval "$wx_cv_use_coldlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_COLOURDLG=$wxUSE_COLOURDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13937,7 +13802,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filedlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-filedlg was given.
 if test "${enable_filedlg+set}" = set; then
   enableval=$enable_filedlg;
@@ -13946,14 +13810,14 @@ if test "${enable_filedlg+set}" = set; then
                           else
                             wx_cv_use_filedlg='wxUSE_FILEDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
@@ -13962,8 +13826,8 @@ fi
 
 
           eval "$wx_cv_use_filedlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FILEDLG=$wxUSE_FILEDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13992,7 +13856,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-finddlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-finddlg was given.
 if test "${enable_finddlg+set}" = set; then
   enableval=$enable_finddlg;
@@ -14001,14 +13864,14 @@ if test "${enable_finddlg+set}" = set; then
                           else
                             wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
@@ -14017,8 +13880,8 @@ fi
 
 
           eval "$wx_cv_use_finddlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_finddlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FINDREPLDLG=$wxUSE_FINDREPLDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14047,7 +13910,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontdlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-fontdlg was given.
 if test "${enable_fontdlg+set}" = set; then
   enableval=$enable_fontdlg;
@@ -14056,14 +13918,14 @@ if test "${enable_fontdlg+set}" = set; then
                           else
                             wx_cv_use_fontdlg='wxUSE_FONTDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
@@ -14072,8 +13934,8 @@ fi
 
 
           eval "$wx_cv_use_fontdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FONTDLG=$wxUSE_FONTDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14102,7 +13964,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirdlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-dirdlg was given.
 if test "${enable_dirdlg+set}" = set; then
   enableval=$enable_dirdlg;
@@ -14111,14 +13972,14 @@ if test "${enable_dirdlg+set}" = set; then
                           else
                             wx_cv_use_dirdlg='wxUSE_DIRDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
@@ -14127,8 +13988,8 @@ fi
 
 
           eval "$wx_cv_use_dirdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DIRDLG=$wxUSE_DIRDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14157,7 +14018,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-msgdlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-msgdlg was given.
 if test "${enable_msgdlg+set}" = set; then
   enableval=$enable_msgdlg;
@@ -14166,14 +14026,14 @@ if test "${enable_msgdlg+set}" = set; then
                           else
                             wx_cv_use_msgdlg='wxUSE_MSGDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
@@ -14182,8 +14042,8 @@ fi
 
 
           eval "$wx_cv_use_msgdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MSGDLG=$wxUSE_MSGDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14212,7 +14072,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-numberdlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-numberdlg was given.
 if test "${enable_numberdlg+set}" = set; then
   enableval=$enable_numberdlg;
@@ -14221,14 +14080,14 @@ if test "${enable_numberdlg+set}" = set; then
                           else
                             wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
@@ -14237,8 +14096,8 @@ fi
 
 
           eval "$wx_cv_use_numberdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_NUMBERDLG=$wxUSE_NUMBERDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14267,7 +14126,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splash" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-splash was given.
 if test "${enable_splash+set}" = set; then
   enableval=$enable_splash;
@@ -14276,14 +14134,14 @@ if test "${enable_splash+set}" = set; then
                           else
                             wx_cv_use_splash='wxUSE_SPLASH=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
@@ -14292,8 +14150,8 @@ fi
 
 
           eval "$wx_cv_use_splash"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_splash >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SPLASH=$wxUSE_SPLASH" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14322,7 +14180,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textdlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-textdlg was given.
 if test "${enable_textdlg+set}" = set; then
   enableval=$enable_textdlg;
@@ -14331,14 +14188,14 @@ if test "${enable_textdlg+set}" = set; then
                           else
                             wx_cv_use_textdlg='wxUSE_TEXTDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
@@ -14347,8 +14204,8 @@ fi
 
 
           eval "$wx_cv_use_textdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TEXTDLG=$wxUSE_TEXTDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14377,7 +14234,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipdlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-tipdlg was given.
 if test "${enable_tipdlg+set}" = set; then
   enableval=$enable_tipdlg;
@@ -14386,14 +14242,14 @@ if test "${enable_tipdlg+set}" = set; then
                           else
                             wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
@@ -14402,8 +14258,8 @@ fi
 
 
           eval "$wx_cv_use_tipdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_STARTUP_TIPS=$wxUSE_STARTUP_TIPS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14432,7 +14288,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-progressdlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-progressdlg was given.
 if test "${enable_progressdlg+set}" = set; then
   enableval=$enable_progressdlg;
@@ -14441,14 +14296,14 @@ if test "${enable_progressdlg+set}" = set; then
                           else
                             wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
@@ -14457,8 +14312,8 @@ fi
 
 
           eval "$wx_cv_use_progressdlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PROGRESSDLG=$wxUSE_PROGRESSDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14487,7 +14342,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wizarddlg" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-wizarddlg was given.
 if test "${enable_wizarddlg+set}" = set; then
   enableval=$enable_wizarddlg;
@@ -14496,14 +14350,14 @@ if test "${enable_wizarddlg+set}" = set; then
                           else
                             wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
@@ -14512,8 +14366,8 @@ fi
 
 
           eval "$wx_cv_use_wizarddlg"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_WIZARDDLG=$wxUSE_WIZARDDLG" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14544,7 +14398,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-menus" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-menus was given.
 if test "${enable_menus+set}" = set; then
   enableval=$enable_menus;
@@ -14553,14 +14406,14 @@ if test "${enable_menus+set}" = set; then
                           else
                             wx_cv_use_menus='wxUSE_MENUS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
@@ -14569,8 +14422,8 @@ fi
 
 
           eval "$wx_cv_use_menus"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_menus >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MENUS=$wxUSE_MENUS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14599,7 +14452,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-miniframe" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-miniframe was given.
 if test "${enable_miniframe+set}" = set; then
   enableval=$enable_miniframe;
@@ -14608,14 +14460,14 @@ if test "${enable_miniframe+set}" = set; then
                           else
                             wx_cv_use_miniframe='wxUSE_MINIFRAME=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
@@ -14624,8 +14476,8 @@ fi
 
 
           eval "$wx_cv_use_miniframe"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MINIFRAME=$wxUSE_MINIFRAME" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14654,7 +14506,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tooltips" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-tooltips was given.
 if test "${enable_tooltips+set}" = set; then
   enableval=$enable_tooltips;
@@ -14663,14 +14514,14 @@ if test "${enable_tooltips+set}" = set; then
                           else
                             wx_cv_use_tooltips='wxUSE_TOOLTIPS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
@@ -14679,8 +14530,8 @@ fi
 
 
           eval "$wx_cv_use_tooltips"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TOOLTIPS=$wxUSE_TOOLTIPS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14709,7 +14560,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splines" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-splines was given.
 if test "${enable_splines+set}" = set; then
   enableval=$enable_splines;
@@ -14718,14 +14568,14 @@ if test "${enable_splines+set}" = set; then
                           else
                             wx_cv_use_splines='wxUSE_SPLINES=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
@@ -14734,8 +14584,8 @@ fi
 
 
           eval "$wx_cv_use_splines"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_splines >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_SPLINES=$wxUSE_SPLINES" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14764,7 +14614,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-mousewheel was given.
 if test "${enable_mousewheel+set}" = set; then
   enableval=$enable_mousewheel;
@@ -14773,14 +14622,14 @@ if test "${enable_mousewheel+set}" = set; then
                           else
                             wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
@@ -14789,8 +14638,8 @@ fi
 
 
           eval "$wx_cv_use_mousewheel"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_MOUSEWHEEL=$wxUSE_MOUSEWHEEL" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14819,7 +14668,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-validators was given.
 if test "${enable_validators+set}" = set; then
   enableval=$enable_validators;
@@ -14828,14 +14676,14 @@ if test "${enable_validators+set}" = set; then
                           else
                             wx_cv_use_validators='wxUSE_VALIDATORS=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
@@ -14844,8 +14692,8 @@ fi
 
 
           eval "$wx_cv_use_validators"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_validators >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_VALIDATORS=$wxUSE_VALIDATORS" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14874,7 +14722,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-busyinfo" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-busyinfo was given.
 if test "${enable_busyinfo+set}" = set; then
   enableval=$enable_busyinfo;
@@ -14883,14 +14730,14 @@ if test "${enable_busyinfo+set}" = set; then
                           else
                             wx_cv_use_busyinfo='wxUSE_BUSYINFO=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
@@ -14899,8 +14746,8 @@ fi
 
 
           eval "$wx_cv_use_busyinfo"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_BUSYINFO=$wxUSE_BUSYINFO" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14929,7 +14776,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-joystick" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-joystick was given.
 if test "${enable_joystick+set}" = set; then
   enableval=$enable_joystick;
@@ -14938,14 +14784,14 @@ if test "${enable_joystick+set}" = set; then
                           else
                             wx_cv_use_joystick='wxUSE_JOYSTICK=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
@@ -14954,8 +14800,8 @@ fi
 
 
           eval "$wx_cv_use_joystick"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_joystick >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_JOYSTICK=$wxUSE_JOYSTICK" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14984,7 +14830,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-metafile was given.
 if test "${enable_metafile+set}" = set; then
   enableval=$enable_metafile;
@@ -14993,14 +14838,14 @@ if test "${enable_metafile+set}" = set; then
                           else
                             wx_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
@@ -15009,8 +14854,8 @@ fi
 
 
           eval "$wx_cv_use_metafile"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15039,7 +14884,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dragimage" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-dragimage was given.
 if test "${enable_dragimage+set}" = set; then
   enableval=$enable_dragimage;
@@ -15048,14 +14892,14 @@ if test "${enable_dragimage+set}" = set; then
                           else
                             wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
@@ -15064,8 +14908,8 @@ fi
 
 
           eval "$wx_cv_use_dragimage"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dragimage >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DRAGIMAGE=$wxUSE_DRAGIMAGE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15094,7 +14938,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accessibility" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-accessibility was given.
 if test "${enable_accessibility+set}" = set; then
   enableval=$enable_accessibility;
@@ -15103,14 +14946,14 @@ if test "${enable_accessibility+set}" = set; then
                           else
                             wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
@@ -15119,8 +14962,8 @@ fi
 
 
           eval "$wx_cv_use_accessibility"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_accessibility >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ACCESSIBILITY=$wxUSE_ACCESSIBILITY" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
 echo "${ECHO_T}$result" >&6; }
 
 
-if test "$wxUSE_MSW" = "1"; then
-
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dccache" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; }
-          no_cache=0
-          # Check whether --enable-dccache was given.
-if test "${enable_dccache+set}" = set; then
-  enableval=$enable_dccache;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_dccache='wxUSE_DC_CACHEING=yes'
-                          else
-                            wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
-                          fi
-
-else
-
-                          LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_dccache"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dccache >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DC_CACHEING = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_DC_CACHEING
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-fi
-
 
 
           enablestring=
@@ -15209,7 +14994,6 @@ fi
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-palette was given.
 if test "${enable_palette+set}" = set; then
   enableval=$enable_palette;
@@ -15218,14 +15002,14 @@ if test "${enable_palette+set}" = set; then
                           else
                             wx_cv_use_palette='wxUSE_PALETTE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
@@ -15234,8 +15018,8 @@ fi
 
 
           eval "$wx_cv_use_palette"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_palette >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PALETTE=$wxUSE_PALETTE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15264,7 +15048,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-image" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-image was given.
 if test "${enable_image+set}" = set; then
   enableval=$enable_image;
@@ -15273,14 +15056,14 @@ if test "${enable_image+set}" = set; then
                           else
                             wx_cv_use_image='wxUSE_IMAGE=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
@@ -15289,8 +15072,8 @@ fi
 
 
           eval "$wx_cv_use_image"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_image >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_IMAGE=$wxUSE_IMAGE" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15319,7 +15102,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gif" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-gif was given.
 if test "${enable_gif+set}" = set; then
   enableval=$enable_gif;
@@ -15328,14 +15110,14 @@ if test "${enable_gif+set}" = set; then
                           else
                             wx_cv_use_gif='wxUSE_GIF=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
@@ -15344,8 +15126,8 @@ fi
 
 
           eval "$wx_cv_use_gif"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_gif >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_GIF=$wxUSE_GIF" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15374,7 +15156,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pcx" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-pcx was given.
 if test "${enable_pcx+set}" = set; then
   enableval=$enable_pcx;
@@ -15383,14 +15164,14 @@ if test "${enable_pcx+set}" = set; then
                           else
                             wx_cv_use_pcx='wxUSE_PCX=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
@@ -15399,8 +15180,8 @@ fi
 
 
           eval "$wx_cv_use_pcx"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_pcx >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PCX=$wxUSE_PCX" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15429,7 +15210,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tga" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-tga was given.
 if test "${enable_tga+set}" = set; then
   enableval=$enable_tga;
@@ -15438,14 +15218,14 @@ if test "${enable_tga+set}" = set; then
                           else
                             wx_cv_use_tga='wxUSE_TGA=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
@@ -15454,8 +15234,8 @@ fi
 
 
           eval "$wx_cv_use_tga"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_tga >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_TGA=$wxUSE_TGA" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15484,7 +15264,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iff" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-iff was given.
 if test "${enable_iff+set}" = set; then
   enableval=$enable_iff;
@@ -15493,14 +15272,14 @@ if test "${enable_iff+set}" = set; then
                           else
                             wx_cv_use_iff='wxUSE_IFF=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
@@ -15509,8 +15288,8 @@ fi
 
 
           eval "$wx_cv_use_iff"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_iff >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_IFF=$wxUSE_IFF" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15539,7 +15318,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pnm" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-pnm was given.
 if test "${enable_pnm+set}" = set; then
   enableval=$enable_pnm;
@@ -15548,14 +15326,14 @@ if test "${enable_pnm+set}" = set; then
                           else
                             wx_cv_use_pnm='wxUSE_PNM=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
@@ -15564,8 +15342,8 @@ fi
 
 
           eval "$wx_cv_use_pnm"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_pnm >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_PNM=$wxUSE_PNM" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15594,7 +15372,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xpm" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-xpm was given.
 if test "${enable_xpm+set}" = set; then
   enableval=$enable_xpm;
@@ -15603,14 +15380,14 @@ if test "${enable_xpm+set}" = set; then
                           else
                             wx_cv_use_xpm='wxUSE_XPM=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
@@ -15619,8 +15396,8 @@ fi
 
 
           eval "$wx_cv_use_xpm"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_xpm >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_XPM=$wxUSE_XPM" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15649,7 +15426,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ico_cur" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-ico_cur was given.
 if test "${enable_ico_cur+set}" = set; then
   enableval=$enable_ico_cur;
@@ -15658,14 +15434,14 @@ if test "${enable_ico_cur+set}" = set; then
                           else
                             wx_cv_use_ico_cur='wxUSE_ICO_CUR=no'
                           fi
+                          cache=yes
 
 else
 
+                          cache=no
                           LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
                           fi
 
                           wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
@@ -15674,8 +15450,8 @@ fi
 
 
           eval "$wx_cv_use_ico_cur"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_ICO_CUR=$wxUSE_ICO_CUR" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
 echo "${ECHO_T}$result" >&6; }
 
 
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dccache" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; }
+          # Check whether --enable-dccache was given.
+if test "${enable_dccache+set}" = set; then
+  enableval=$enable_dccache;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_dccache='wxUSE_DC_CACHEING=yes'
+                          else
+                            wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
+                          fi
+                          cache=yes
+
+else
+
+                          cache=no
+                          LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          fi
+
+                          wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_dccache"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DC_CACHEING=$wxUSE_DC_CACHEING" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DC_CACHEING = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_DC_CACHEING
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ps-in-msw" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ps-in-msw... $ECHO_C" >&6; }
+          # Check whether --enable-ps-in-msw was given.
+if test "${enable_ps_in_msw+set}" = set; then
+  enableval=$enable_ps_in_msw;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes'
+                          else
+                            wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no'
+                          fi
+                          cache=yes
+
+else
+
+                          cache=no
+                          LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          fi
+
+                          wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ps_in_msw"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ownerdrawn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ownerdrawn... $ECHO_C" >&6; }
+          # Check whether --enable-ownerdrawn was given.
+if test "${enable_ownerdrawn+set}" = set; then
+  enableval=$enable_ownerdrawn;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes'
+                          else
+                            wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no'
+                          fi
+                          cache=yes
+
+else
+
+                          cache=no
+                          LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          fi
+
+                          wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ownerdrawn"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_OWNER_DRAWN=$wxUSE_OWNER_DRAWN" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_OWNER_DRAWN = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_OWNER_DRAWN
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-regkey" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6; }
+          # Check whether --enable-regkey was given.
+if test "${enable_regkey+set}" = set; then
+  enableval=$enable_regkey;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_regkey='wxUSE_REGKEY=yes'
+                          else
+                            wx_cv_use_regkey='wxUSE_REGKEY=no'
+                          fi
+                          cache=yes
+
+else
+
+                          cache=no
+                          LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          fi
+
+                          wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_regkey"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_REGKEY = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_REGKEY
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-uxtheme" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-uxtheme... $ECHO_C" >&6; }
+          # Check whether --enable-uxtheme was given.
+if test "${enable_uxtheme+set}" = set; then
+  enableval=$enable_uxtheme;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_uxtheme='wxUSE_UXTHEME=yes'
+                          else
+                            wx_cv_use_uxtheme='wxUSE_UXTHEME=no'
+                          fi
+                          cache=yes
+
+else
+
+                          cache=no
+                          LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          fi
+
+                          wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_uxtheme"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_UXTHEME=$wxUSE_UXTHEME" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_UXTHEME = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_UXTHEME
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxdib" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wxdib... $ECHO_C" >&6; }
+          # Check whether --enable-wxdib was given.
+if test "${enable_wxdib+set}" = set; then
+  enableval=$enable_wxdib;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_wxdib='wxUSE_DIB=yes'
+                          else
+                            wx_cv_use_wxdib='wxUSE_DIB=no'
+                          fi
+                          cache=yes
+
+else
+
+                          cache=no
+                          LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          fi
+
+                          wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_wxdib"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_DIB=$wxUSE_DIB" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DIB = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_DIB
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
 fi
 
 
@@ -21203,9 +21305,13 @@ done
 
 
 if test "$ac_cv_header_wchar_h" != "yes"; then
-    { echo "$as_me:$LINENO: checking for wcstr.h" >&5
-echo $ECHO_N "checking for wcstr.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_wcstr_h+set}" = set; then
+
+for ac_header in wcstr.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21216,7 +21322,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 
-#include <wcstr.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -21235,19 +21341,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_wcstr_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_wcstr_h=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_wcstr_h" >&5
-echo "${ECHO_T}$ac_cv_header_wcstr_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
 
+done
 
 fi
 
@@ -21263,9 +21377,13 @@ case "${host}" in
 esac
 
 if test "$USE_UNIX" = 1 ; then
-    { echo "$as_me:$LINENO: checking for sys/select.h" >&5
-echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_select_h+set}" = set; then
+
+for ac_header in sys/select.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -21276,7 +21394,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 
-#include <sys/select.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -21295,19 +21413,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_sys_select_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_sys_select_h=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_select_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+
+done
 
 fi
 
@@ -26045,9 +26171,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-    { echo "$as_me:$LINENO: checking for iostream" >&5
-echo $ECHO_N "checking for iostream... $ECHO_C" >&6; }
-if test "${ac_cv_header_iostream+set}" = set; then
+
+for ac_header in iostream
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -26058,7 +26188,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
-#include <iostream>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -26077,19 +26207,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_iostream=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_iostream=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_iostream" >&5
-echo "${ECHO_T}$ac_cv_header_iostream" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
 
+done
 
 
     if test "$ac_cv_header_iostream" = "yes" ; then
@@ -29960,9 +30098,13 @@ TOOLKIT_INCLUDE=
 WIDGET_SET=
 
 if test "$USE_WIN32" = 1 ; then
-    { echo "$as_me:$LINENO: checking for w32api.h" >&5
-echo $ECHO_N "checking for w32api.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_w32api_h+set}" = set; then
+
+for ac_header in w32api.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -29973,7 +30115,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
-#include <w32api.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -29992,19 +30134,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_w32api_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_w32api_h=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_w32api_h" >&5
-echo "${ECHO_T}$ac_cv_header_w32api_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+
+done
 
     { echo "$as_me:$LINENO: checking for windows.h" >&5
 echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; }
@@ -33892,12 +34042,6 @@ done
     fi
 
     if test "$wxUSE_MOTIF" = 1; then
-        if test "$wxUSE_UNICODE" = "yes"; then
-            { { echo "$as_me:$LINENO: error: Unicode configuration not supported with Motif" >&5
-echo "$as_me: error: Unicode configuration not supported with Motif" >&2;}
-   { (exit 1); exit 1; }; }
-        fi
-
         { echo "$as_me:$LINENO: checking for Motif/Lesstif headers" >&5
 echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; }
 
 
 if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
-                { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
-echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+
+for ac_header in X11/Xlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -34803,7 +34951,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
-#include <X11/Xlib.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -34822,23 +34970,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_X11_Xlib_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_X11_Xlib_h=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
 
 
-        { echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
-echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
+for ac_header in X11/XKBlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -34853,7 +35013,7 @@ cat >>conftest.$ac_ext <<_ACEOF
                           #endif
 
 
-#include <X11/XKBlib.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -34872,19 +35032,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_X11_XKBlib_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_X11_XKBlib_h=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
 
+done
 
     fi
 fi
@@ -35238,9 +35406,13 @@ echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; }
             if test "$ac_find_libraries" != "" ; then
                 { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-                { echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5
-echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then
+
+for ac_header in X11/extensions/xf86vmode.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -35255,7 +35427,7 @@ cat >>conftest.$ac_ext <<_ACEOF
                                       #endif
 
 
-#include <X11/extensions/xf86vmode.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -35274,24 +35446,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_X11_extensions_xf86vmode_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_X11_extensions_xf86vmode_h=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6; }
-if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
                                   GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
 
 fi
 
+done
 
             else
                 { echo "$as_me:$LINENO: result: no" >&5
@@ -35975,6 +36152,86 @@ echo "${ECHO_T}$wx_cv_cc_visibility" >&6; }
 #define HAVE_VISIBILITY 1
 _ACEOF
 
+
+                  { echo "$as_me:$LINENO: checking for broken libstdc++ visibility" >&5
+echo $ECHO_N "checking for broken libstdc++ visibility... $ECHO_C" >&6; }
+      if test "${wx_cv_cc_broken_libstdcxx_visibility+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+        wx_save_CXXFLAGS="$CXXFLAGS"
+        CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+        ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+            #include <string>
+
+int
+main ()
+{
+
+            std::string x;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  wx_cv_cc_broken_libstdcxx_visibility=no
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_cc_broken_libstdcxx_visibility=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+        ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+        CXXFLAGS="$wx_save_CXXFLAGS"
+fi
+
+      { echo "$as_me:$LINENO: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5
+echo "${ECHO_T}$wx_cv_cc_broken_libstdcxx_visibility" >&6; }
+      if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1
+_ACEOF
+
+      fi
+
     else
       CFLAGS_VISIBILITY=""
       CXXFLAGS_VISIBILITY=""
@@ -38277,9 +38534,13 @@ _ACEOF
 #include <wchar.h>"
     case "${host}" in
         *-*-solaris2* )
-            { echo "$as_me:$LINENO: checking for widec.h" >&5
-echo $ECHO_N "checking for widec.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_widec_h+set}" = set; then
+
+for ac_header in widec.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -38290,7 +38551,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 
-#include <widec.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -38309,19 +38570,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_widec_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_widec_h=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_widec_h" >&5
-echo "${ECHO_T}$ac_cv_header_widec_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+
+done
 
             if test "$ac_cv_header_widec_h" = "yes"; then
                 wchar_headers="$wchar_headers
@@ -39944,7 +40213,7 @@ done
 
 
 
-for ac_func in putenv setenv
+for ac_func in setenv putenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -41572,9 +41841,13 @@ _ACEOF
 
       fi
 
-      { echo "$as_me:$LINENO: checking for sched.h" >&5
-echo $ECHO_N "checking for sched.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sched_h+set}" = set; then
+
+for ac_header in sched.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -41585,7 +41858,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 
-#include <sched.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -41604,19 +41877,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_sched_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_sched_h=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sched_h" >&5
-echo "${ECHO_T}$ac_cv_header_sched_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
 
+done
 
       if test "$ac_cv_header_sched_h" = "yes"; then
           { echo "$as_me:$LINENO: checking for sched_yield" >&5
@@ -47249,9 +47530,13 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; }
 
         else
                 if test "$wxUSE_MGL" != "1"; then
-                                                                                    { echo "$as_me:$LINENO: checking for linux/joystick.h" >&5
-echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_linux_joystick_h+set}" = set; then
+
+for ac_header in linux/joystick.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -47262,7 +47547,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 
-#include <linux/joystick.h>
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -47281,22 +47566,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_header_linux_joystick_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_linux_joystick_h=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5
-echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; }
-if test $ac_cv_header_linux_joystick_h = yes; then
-  wxUSE_JOYSTICK=yes
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ wxUSE_JOYSTICK=yes
 fi
 
+done
 
         fi
     fi
 
 
 
+if test "$wxUSE_FONTENUM" = "yes" ; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FONTENUM 1
+_ACEOF
+
+fi
+
 if test "$wxUSE_FONTMAP" = "yes" ; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_FONTMAP 1
@@ -48343,13 +48640,6 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
 fi
 
-if test "$wxUSE_DC_CACHEING" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DC_CACHEING 1
-_ACEOF
-
-fi
-
 if test "$wxUSE_DRAGIMAGE" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_DRAGIMAGE 1
@@ -48753,6 +49043,53 @@ _ACEOF
 fi
 
 
+if test "$wxUSE_MSW" = 1 ; then
+
+if test "$wxUSE_DC_CACHEING" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_DC_CACHEING 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_DIB" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WXDIB 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_OWNER_DRAWN" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_OWNER_DRAWN 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_REGKEY" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_REGKEY 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_UXTHEME" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_UXTHEME 1
+_ACEOF
+
+fi
+
+fi
+
+
 if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
       cat >>confdefs.h <<\_ACEOF