]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
remove ODBC and DBgrid libraries
[wxWidgets.git] / configure
index 8757436fae7741faee35e4a8b10b778c2120e618..c6b885531ff3d3dabd12b2e83bde02f4ebf7bc32 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 47607 2007-07-21 01:42:58Z VZ .
+# From configure.in Id: configure.in 49284 2007-10-21 11:39:33Z MW .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -679,16 +679,7 @@ EGREP
 CXX
 CXXFLAGS
 ac_ct_CXX
-RANLIB
 AR
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-STRIP
-WINDRES
-DLLTOOL
-IF_GNU_MAKE
-LN_S
 subdirs
 PKG_CONFIG
 GTK_CFLAGS
@@ -709,13 +700,12 @@ PANGOXFT_CFLAGS
 PANGOXFT_LIBS
 CFLAGS_VISIBILITY
 CXXFLAGS_VISIBILITY
-REZ
-DEREZ
-SETFILE
 LIBICONV
 SDL_CONFIG
 SDL_CFLAGS
 SDL_LIBS
+GTKPRINT_CFLAGS
+GTKPRINT_LIBS
 LIBGNOMEPRINTUI_CFLAGS
 LIBGNOMEPRINTUI_LIBS
 GNOMEVFS_CFLAGS
@@ -733,7 +723,6 @@ STD_GUI_LIBS
 wxUSE_ZLIB
 wxUSE_REGEX
 wxUSE_EXPAT
-wxUSE_ODBC
 wxUSE_LIBJPEG
 wxUSE_LIBPNG
 wxUSE_LIBTIFF
@@ -748,11 +737,11 @@ CXXWARNINGS
 EXTRALIBS
 EXTRALIBS_XML
 EXTRALIBS_HTML
-EXTRALIBS_ODBC
 EXTRALIBS_GUI
 EXTRALIBS_OPENGL
 EXTRALIBS_SDL
 WITH_PLUGIN_SDL
+EXTRALIBS_GTKPRINT
 EXTRALIBS_GNOMEPRINT
 EXTRALIBS_GNOMEVFS
 EXTRALIBS_HILDON
@@ -767,12 +756,19 @@ SAMPLES_RPATH_POSTLINK
 HOST_SUFFIX
 CPPUNIT_CFLAGS
 CPPUNIT_LIBS
+RANLIB
+INSTALL_PROGRAM
+INSTALL_SCRIPT
+INSTALL_DATA
+LN_S
 SET_MAKE
 MAKE_SET
 AROPTIONS
+STRIP
 NM
 INSTALL_DIR
 LDFLAGS_GUI
+IF_GNU_MAKE
 PLATFORM_UNIX
 PLATFORM_WIN32
 PLATFORM_MSDOS
@@ -805,6 +801,9 @@ USE_SOSYMLINKS
 SONAME_FLAG
 DEPS_TRACKING
 BK_DEPS
+WINDRES
+REZ
+SETFILE
 GCC_PCH
 ICC_PCH
 BK_MAKE_PCH
@@ -977,6 +976,7 @@ COND_WXUSE_LIBTIFF_BUILTIN
 COND_WXUSE_ODBC_BUILTIN
 COND_WXUSE_REGEX_BUILTIN
 COND_WXUSE_ZLIB_BUILTIN
+DEREZ
 SHARED
 WX_LIBRARY_BASENAME_NOGUI
 WX_LIBRARY_BASENAME_GUI
@@ -1001,7 +1001,6 @@ WXCONFIG_LIBS
 WXCONFIG_RPATH
 WXCONFIG_LDFLAGS_GUI
 WXCONFIG_RESFLAGS
-EXE_LINKER
 GUIDIST
 DISTDIR
 SAMPLES_SUBDIRS
@@ -1018,6 +1017,7 @@ LIBWXMACRES
 POSTLINK_COMMAND
 MACSETFILE
 GCC
+DLLTOOL
 CPPUNIT_CONFIG
 LIBOBJS
 LTLIBOBJS'
@@ -1044,6 +1044,8 @@ PANGOFT2_CFLAGS
 PANGOFT2_LIBS
 PANGOXFT_CFLAGS
 PANGOXFT_LIBS
+GTKPRINT_CFLAGS
+GTKPRINT_LIBS
 LIBGNOMEPRINTUI_CFLAGS
 LIBGNOMEPRINTUI_LIBS
 GNOMEVFS_CFLAGS
@@ -1054,7 +1056,8 @@ CAIRO_CFLAGS
 CAIRO_LIBS
 GST_CFLAGS
 GST_LIBS'
-ac_subdirs_all='src/expat'
+ac_subdirs_all='src/tiff
+src/expat'
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -1666,7 +1669,7 @@ Optional Features:
   --enable-permissive     compile code disregarding strict ANSI
   --enable-no_deps        create code without dependency information
   --disable-vararg_macros don't use vararg macros, even if they are supported
-  --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)
+  --enable-universal_binary  create Mac PowerPC and Intel Universal binary
   --enable-compat26       enable wxWidgets 2.6 compatibility
   --disable-compat28      disable wxWidgets 2.8 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds
@@ -1683,7 +1686,7 @@ Optional Features:
   --enable-dataobj        use data object classes
   --enable-ipc            use interprocess communication (wxSocket etc.)
   --enable-baseevtloop    use event loop in console programs too
-  --enable-epoolloop      use wxEpollDispatcher class (Linux only)
+  --enable-epollloop      use wxEpollDispatcher class (Linux only)
   --enable-selectloop     use wxSelectDispatcher class
   --enable-apple_ieee     use the Apple IEEE codec
   --enable-arcstream      use wxArchive streams
@@ -1730,6 +1733,8 @@ Optional Features:
   --enable-protocol-ftp   FTP support in wxProtocol
   --enable-protocol-file  FILE support in wxProtocol
   --enable-threads        use threads
+  --enable-iniconf        use wxIniConfig (Win32 only)
+  --enable-regkey         use wxRegKey class (Win32 only)
   --enable-docview        use document view architecture
   --enable-help           use help subsystem
   --enable-mshtmlhelp     use MS HTML Help (win32)
@@ -1775,6 +1780,7 @@ Optional Features:
   --enable-detect_sm      use code to detect X11 session manager
   --enable-editablebox    use wxEditableListBox class
   --enable-filepicker     use wxFilePickerCtrl class
+  --enable-filectrl       use wxFileCtrl class
   --enable-fontpicker     use wxFontPickerCtrl class
   --enable-gauge          use wxGauge class
   --enable-grid           use wxGrid class
@@ -1847,7 +1853,10 @@ Optional Features:
   --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-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
@@ -1881,6 +1890,7 @@ Optional Packages:
   --with-libtiff          use libtiff (TIFF file format)
   --with-libxpm           use libxpm (XPM file format)
   --with-libmspack        use libmspack (CHM help files loading)
+  --without-gtkprint      don't use GTK printing support
   --without-gnomeprint    don't use GNOME printing libraries
   --with-gnomevfs         use GNOME VFS for associating MIME types
   --with-hildon           use Hildon framework for Nokia 770
@@ -1889,8 +1899,9 @@ Optional Packages:
   --with-sdl              use SDL for audio on Unix
   --with-regex            enable support for wxRegEx class
   --with-zlib             use zlib for LZW compression
-  --with-odbc             use the IODBC and wxODBC classes
   --with-expat            enable XML support using expat parser
+  --with-macosx-sdk=PATH  use an OS X SDK at PATH
+  --with-macosx-version-min=VER   build binaries which require at least this OS X version
   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
   --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
   --with-x                use the X Window System
@@ -1928,6 +1939,10 @@ Some influential environment variables:
               C compiler flags for PANGOXFT, overriding pkg-config
   PANGOXFT_LIBS
               linker flags for PANGOXFT, overriding pkg-config
+  GTKPRINT_CFLAGS
+              C compiler flags for GTKPRINT, overriding pkg-config
+  GTKPRINT_LIBS
+              linker flags for GTKPRINT, overriding pkg-config
   LIBGNOMEPRINTUI_CFLAGS
               C compiler flags for LIBGNOMEPRINTUI, overriding pkg-config
   LIBGNOMEPRINTUI_LIBS
@@ -2926,7 +2941,6 @@ DEFAULT_wxUSE_LIBGNOMEVFS=no
 DEFAULT_wxUSE_LIBHILDON=no
 DEFAULT_wxUSE_LIBMSPACK=no
 DEFAULT_wxUSE_LIBSDL=no
-DEFAULT_wxUSE_ODBC=no
 DEFAULT_wxUSE_OPENGL=no
 
 DEFAULT_wxUSE_ACCESSIBILITY=no
@@ -2938,6 +2952,8 @@ DEFAULT_wxUSE_TAB_DIALOG=no
 DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 
+DEFAULT_wxUSE_UNIVERSAL_BINARY=no
+
 DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
 DEFAULT_wxUSE_GTK2=yes
@@ -2975,7 +2991,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;
@@ -2984,14 +2999,16 @@ if test "${enable_gui+set}" = set; then
                           else
                             wx_cv_use_gui='wxUSE_GUI=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
@@ -3000,8 +3017,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
@@ -3030,7 +3047,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;
@@ -3039,14 +3055,16 @@ if test "${enable_monolithic+set}" = set; then
                           else
                             wx_cv_use_monolithic='wxUSE_MONOLITHIC=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
@@ -3055,8 +3073,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
@@ -3085,7 +3103,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;
@@ -3094,14 +3111,16 @@ if test "${enable_plugins+set}" = set; then
                           else
                             wx_cv_use_plugins='wxUSE_PLUGINS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
@@ -3110,8 +3129,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
@@ -3139,7 +3158,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
@@ -3149,14 +3167,16 @@ if test "${with_subdirs+set}" = set; then
                         else
                           wx_cv_use_subdirs='wxWITH_SUBDIRS=no'
                         fi
+                        cache=yes
 
 else
 
                         LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
@@ -3165,8 +3185,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
@@ -3201,7 +3221,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;
@@ -3210,14 +3229,16 @@ if test "${enable_official_build+set}" = set; then
                           else
                             wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
@@ -3226,8 +3247,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
@@ -3265,7 +3286,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;
@@ -3274,14 +3294,16 @@ if test "${enable_all_features+set}" = set; then
                           else
                             wx_cv_use_all_features='wxUSE_ALL_FEATURES=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
@@ -3290,8 +3312,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
@@ -3324,7 +3346,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;
@@ -3333,14 +3354,16 @@ if test "${enable_universal+set}" = set; then
                           else
                             wx_cv_use_universal='wxUSE_UNIVERSAL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
@@ -3349,8 +3372,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
@@ -3454,7 +3477,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;
@@ -3463,14 +3485,16 @@ if test "${enable_nanox+set}" = set; then
                           else
                             wx_cv_use_nanox='wxUSE_NANOX=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
@@ -3479,8 +3503,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
@@ -3515,7 +3539,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;
@@ -3524,14 +3547,16 @@ if test "${enable_gpe+set}" = set; then
                           else
                             wx_cv_use_gpe='wxUSE_GPE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
@@ -3540,8 +3565,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
@@ -3562,7 +3587,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
@@ -3580,14 +3604,16 @@ 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
 
                         LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
@@ -3596,8 +3622,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
@@ -3621,7 +3647,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
@@ -3639,14 +3664,16 @@ 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
 
                         LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
@@ -3655,8 +3682,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
@@ -3680,7 +3707,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
@@ -3698,14 +3724,16 @@ 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
 
                         LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
@@ -3714,8 +3742,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
@@ -3739,7 +3767,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
@@ -3757,14 +3784,16 @@ 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
 
                         LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
@@ -3773,8 +3802,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
@@ -3807,7 +3836,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
@@ -3817,14 +3845,16 @@ if test "${with_libmspack+set}" = set; then
                         else
                           wx_cv_use_libmspack='wxUSE_LIBMSPACK=no'
                         fi
+                        cache=yes
 
 else
 
                         LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
@@ -3833,8 +3863,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
@@ -3851,6 +3881,62 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+          withstring=without
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+          { echo "$as_me:$LINENO: checking for --${withstring:-with}-gtkprint" >&5
+echo $ECHO_N "checking for --${withstring:-with}-gtkprint... $ECHO_C" >&6; }
+
+# Check whether --with-gtkprint was given.
+if test "${with_gtkprint+set}" = set; then
+  withval=$with_gtkprint;
+                        if test "$withval" = yes; then
+                          wx_cv_use_gtkprint='wxUSE_GTKPRINT=yes'
+                        else
+                          wx_cv_use_gtkprint='wxUSE_GTKPRINT=no'
+                        fi
+                        cache=yes
+
+else
+
+                        LINE=`grep "^wxUSE_GTKPRINT=" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
+                        fi
+
+                        wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_gtkprint"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_GTKPRINT=$wxUSE_GTKPRINT" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_GTKPRINT = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_GTKPRINT
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           withstring=without
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -3862,7 +3948,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
@@ -3872,14 +3957,16 @@ if test "${with_gnomeprint+set}" = set; then
                         else
                           wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no'
                         fi
+                        cache=yes
 
 else
 
                         LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
@@ -3888,8 +3975,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
@@ -3917,7 +4004,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
@@ -3927,14 +4013,16 @@ if test "${with_gnomevfs+set}" = set; then
                         else
                           wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no'
                         fi
+                        cache=yes
 
 else
 
                         LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
@@ -3943,8 +4031,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
@@ -3972,7 +4060,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
@@ -3982,14 +4069,16 @@ if test "${with_hildon+set}" = set; then
                         else
                           wx_cv_use_hildon='wxUSE_LIBHILDON=no'
                         fi
+                        cache=yes
 
 else
 
                         LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
@@ -3998,8 +4087,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
@@ -4027,7 +4116,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
@@ -4037,14 +4125,16 @@ if test "${with_opengl+set}" = set; then
                         else
                           wx_cv_use_opengl='wxUSE_OPENGL=no'
                         fi
+                        cache=yes
 
 else
 
                         LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
@@ -4053,8 +4143,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
@@ -4085,7 +4175,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
@@ -4095,14 +4184,16 @@ if test "${with_dmalloc+set}" = set; then
                         else
                           wx_cv_use_dmalloc='wxUSE_DMALLOC=no'
                         fi
+                        cache=yes
 
 else
 
                         LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
@@ -4111,8 +4202,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
@@ -4140,7 +4231,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
@@ -4150,14 +4240,16 @@ if test "${with_sdl+set}" = set; then
                         else
                           wx_cv_use_sdl='wxUSE_LIBSDL=no'
                         fi
+                        cache=yes
 
 else
 
                         LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
@@ -4166,8 +4258,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
@@ -4186,7 +4278,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
@@ -4204,14 +4295,16 @@ 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
 
                         LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
@@ -4220,8 +4313,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
@@ -4245,7 +4338,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
@@ -4263,14 +4355,16 @@ 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
 
                         LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
@@ -4279,8 +4373,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,68 +4396,8 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b
           fi
 
 
-          { 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
-  withval=$with_odbc;
-                        if test "$withval" = yes; then
-                          wx_cv_use_odbc='wxUSE_ODBC=yes'
-                        elif test "$withval" = no; then
-                          wx_cv_use_odbc='wxUSE_ODBC=no'
-                        elif test "$withval" = sys; then
-                          wx_cv_use_odbc='wxUSE_ODBC=sys'
-                        elif test "$withval" = builtin; then
-                          wx_cv_use_odbc='wxUSE_ODBC=builtin'
-                        else
-                          { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
-echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
-   { (exit 1); exit 1; }; }
-                        fi
-
-else
-
-                        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}"
-
-fi
-
-
-          eval "$wx_cv_use_odbc"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_odbc >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_ODBC" = yes; then
-            { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-          elif test "$wxUSE_ODBC" = no; then
-            { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          elif test "$wxUSE_ODBC" = sys; then
-            { echo "$as_me:$LINENO: result: system version" >&5
-echo "${ECHO_T}system version" >&6; }
-          elif test "$wxUSE_ODBC" = builtin; then
-            { echo "$as_me:$LINENO: result: builtin version" >&5
-echo "${ECHO_T}builtin version" >&6; }
-          else
-            { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5
-echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;}
-   { (exit 1); exit 1; }; }
-          fi
-
-
           { 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
@@ -4381,14 +4415,16 @@ 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
 
                         LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
                         else
-                          no_cache=1
+                            cache=no
                         fi
 
                         wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
@@ -4397,8 +4433,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
@@ -4420,6 +4456,59 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or
           fi
 
 
+{ echo "$as_me:$LINENO: checking for --with-macosx-sdk" >&5
+echo $ECHO_N "checking for --with-macosx-sdk... $ECHO_C" >&6; }
+
+# Check whether --with-macosx-sdk was given.
+if test "${with_macosx_sdk+set}" = set; then
+  withval=$with_macosx_sdk;
+        wxUSE_MACOSX_SDK=$withval
+        wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
+        echo "wxUSE_MACOSX_SDK=$wxUSE_MACOSX_SDK" >> ${wx_arg_cache_file}.tmp
+
+else
+
+        # NOTE: Empty string on purpose so that --without-macosx-sdk (thus no)
+        # will override --enable-universal_binary's automatic SDK usage.
+        wxUSE_MACOSX_SDK=
+        LINE=`grep "^wxUSE_MACOSX_SDK=" ${wx_arg_cache_file}`
+        if test "x$LINE" != x ; then
+            eval "$LINE"
+            echo "$LINE" >> ${wx_arg_cache_file}.tmp
+        fi
+
+fi
+
+{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_SDK" >&5
+echo "${ECHO_T}$wxUSE_MACOSX_SDK" >&6; }
+
+{ echo "$as_me:$LINENO: checking for --with-macosx-version-min" >&5
+echo $ECHO_N "checking for --with-macosx-version-min... $ECHO_C" >&6; }
+
+# Check whether --with-macosx-version-min was given.
+if test "${with_macosx_version_min+set}" = set; then
+  withval=$with_macosx_version_min;
+        wxUSE_MACOSX_VERSION_MIN=$withval
+        wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
+        echo "wxUSE_MACOSX_VERSION_MIN=$wxUSE_MACOSX_VERSION_MIN" >> ${wx_arg_cache_file}.tmp
+
+else
+
+        # default "yes" because when not using an SDK it means the same as no
+        # but when using an SDK it means to use the SDK version
+        wxUSE_MACOSX_VERSION_MIN=yes
+        # See if there is a value in the cache
+        LINE=`grep "^wxUSE_MACOSX_VERSION_MIN=" ${wx_arg_cache_file}`
+        if test "x$LINE" != x ; then
+            eval "$LINE"
+            echo "$LINE" >> ${wx_arg_cache_file}.tmp
+        fi
+
+fi
+
+{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5
+echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
+
 
 
           enablestring=disable
@@ -4434,7 +4523,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;
@@ -4443,14 +4531,16 @@ if test "${enable_shared+set}" = set; then
                           else
                             wx_cv_use_shared='wxUSE_SHARED=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
@@ -4459,8 +4549,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
@@ -4489,7 +4579,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;
@@ -4498,14 +4587,16 @@ if test "${enable_optimise+set}" = set; then
                           else
                             wx_cv_use_optimise='wxUSE_OPTIMISE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
@@ -4514,8 +4605,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
@@ -4544,7 +4635,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;
@@ -4553,14 +4643,16 @@ if test "${enable_debug+set}" = set; then
                           else
                             wx_cv_use_debug='wxUSE_DEBUG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
@@ -4569,8 +4661,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
@@ -4599,7 +4691,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;
@@ -4608,14 +4699,16 @@ if test "${enable_stl+set}" = set; then
                           else
                             wx_cv_use_stl='wxUSE_STL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
@@ -4624,8 +4717,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
@@ -4654,7 +4747,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;
@@ -4663,14 +4755,16 @@ if test "${enable_std_iostreams+set}" = set; then
                           else
                             wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
@@ -4679,8 +4773,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
@@ -4709,7 +4803,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;
@@ -4718,14 +4811,16 @@ if test "${enable_std_string+set}" = set; then
                           else
                             wx_cv_use_std_string='wxUSE_STD_STRING=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
@@ -4734,8 +4829,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
@@ -4764,7 +4859,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;
@@ -4773,14 +4867,16 @@ if test "${enable_unicode+set}" = set; then
                           else
                             wx_cv_use_unicode='wxUSE_UNICODE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
@@ -4789,8 +4885,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
@@ -4819,7 +4915,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;
@@ -4828,14 +4923,16 @@ if test "${enable_mslu+set}" = set; then
                           else
                             wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
@@ -4844,8 +4941,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
@@ -4865,19 +4962,20 @@ 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
 
                           LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
+                            cache=yes
                           else
-                            no_cache=1
+                            cache=no
                           fi
 
                           wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
@@ -4886,8 +4984,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
@@ -4906,7 +5004,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;
@@ -4915,14 +5012,16 @@ if test "${enable_utf8only+set}" = set; then
                           else
                             wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
@@ -4931,8 +5030,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
@@ -4961,7 +5060,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;
@@ -4970,14 +5068,16 @@ if test "${enable_extended_rtti+set}" = set; then
                           else
                             wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
@@ -4986,8 +5086,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
@@ -5018,7 +5118,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;
@@ -5027,14 +5126,16 @@ if test "${enable_omf+set}" = set; then
                           else
                             wx_cv_use_omf='wxUSE_OMF=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
@@ -5043,8 +5144,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
@@ -5085,7 +5186,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;
@@ -5094,14 +5194,16 @@ if test "${enable_debug_flag+set}" = set; then
                           else
                             wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
@@ -5110,8 +5212,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
@@ -5140,7 +5242,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;
@@ -5149,14 +5250,16 @@ if test "${enable_debug_info+set}" = set; then
                           else
                             wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
@@ -5165,8 +5268,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
@@ -5195,7 +5298,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;
@@ -5204,14 +5306,16 @@ if test "${enable_debug_gdb+set}" = set; then
                           else
                             wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
@@ -5220,8 +5324,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
@@ -5250,7 +5354,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;
@@ -5259,14 +5362,16 @@ if test "${enable_debug_cntxt+set}" = set; then
                           else
                             wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
@@ -5275,8 +5380,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
@@ -5305,7 +5410,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;
@@ -5314,14 +5418,16 @@ if test "${enable_mem_tracing+set}" = set; then
                           else
                             wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
@@ -5330,8 +5436,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
@@ -5360,7 +5466,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;
@@ -5369,14 +5474,16 @@ if test "${enable_profile+set}" = set; then
                           else
                             wx_cv_use_profile='wxUSE_PROFILE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
@@ -5385,8 +5492,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
@@ -5415,7 +5522,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;
@@ -5424,14 +5530,16 @@ if test "${enable_no_rtti+set}" = set; then
                           else
                             wx_cv_use_no_rtti='wxUSE_NO_RTTI=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
@@ -5440,8 +5548,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
@@ -5470,7 +5578,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;
@@ -5479,14 +5586,16 @@ if test "${enable_no_exceptions+set}" = set; then
                           else
                             wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
@@ -5495,8 +5604,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
@@ -5525,7 +5634,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;
@@ -5534,14 +5642,16 @@ if test "${enable_permissive+set}" = set; then
                           else
                             wx_cv_use_permissive='wxUSE_PERMISSIVE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
@@ -5550,8 +5660,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
@@ -5580,7 +5690,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;
@@ -5589,14 +5698,16 @@ if test "${enable_no_deps+set}" = set; then
                           else
                             wx_cv_use_no_deps='wxUSE_NO_DEPS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
@@ -5605,8 +5716,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
@@ -5635,7 +5746,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;
@@ -5644,14 +5754,16 @@ if test "${enable_vararg_macros+set}" = set; then
                           else
                             wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
@@ -5660,8 +5772,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
@@ -5681,19 +5793,20 @@ 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
 
                           LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
+                            cache=yes
                           else
-                            no_cache=1
+                            cache=no
                           fi
 
                           wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
@@ -5702,8 +5815,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
@@ -5723,7 +5836,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;
@@ -5732,14 +5844,16 @@ if test "${enable_compat26+set}" = set; then
                           else
                             wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
@@ -5748,8 +5862,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
@@ -5778,7 +5892,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;
@@ -5787,14 +5900,16 @@ if test "${enable_compat28+set}" = set; then
                           else
                             wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
@@ -5803,8 +5918,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
@@ -5834,7 +5949,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;
@@ -5843,14 +5957,16 @@ if test "${enable_rpath+set}" = set; then
                           else
                             wx_cv_use_rpath='wxUSE_RPATH=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
@@ -5859,8 +5975,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
@@ -5890,7 +6006,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;
@@ -5899,14 +6014,16 @@ if test "${enable_objc_uniquifying+set}" = set; then
                           else
                             wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
@@ -5915,8 +6032,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
@@ -5946,7 +6063,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;
@@ -5955,14 +6071,16 @@ if test "${enable_visibility+set}" = set; then
                           else
                             wx_cv_use_visibility='wxUSE_VISIBILITY=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
@@ -5971,8 +6089,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
@@ -6003,7 +6121,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;
@@ -6012,14 +6129,16 @@ if test "${enable_intl+set}" = set; then
                           else
                             wx_cv_use_intl='wxUSE_INTL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
@@ -6028,8 +6147,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
@@ -6058,7 +6177,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;
@@ -6067,14 +6185,16 @@ if test "${enable_config+set}" = set; then
                           else
                             wx_cv_use_config='wxUSE_CONFIG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
@@ -6083,8 +6203,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
@@ -6114,7 +6234,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;
@@ -6123,14 +6242,16 @@ if test "${enable_protocols+set}" = set; then
                           else
                             wx_cv_use_protocols='wxUSE_PROTOCOL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
@@ -6139,8 +6260,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
@@ -6169,7 +6290,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;
@@ -6178,14 +6298,16 @@ if test "${enable_ftp+set}" = set; then
                           else
                             wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
@@ -6194,8 +6316,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
@@ -6224,7 +6346,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;
@@ -6233,14 +6354,16 @@ if test "${enable_http+set}" = set; then
                           else
                             wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
@@ -6249,8 +6372,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
@@ -6279,7 +6402,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;
@@ -6288,14 +6410,16 @@ if test "${enable_fileproto+set}" = set; then
                           else
                             wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
@@ -6304,8 +6428,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
@@ -6334,7 +6458,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;
@@ -6343,14 +6466,16 @@ if test "${enable_sockets+set}" = set; then
                           else
                             wx_cv_use_sockets='wxUSE_SOCKETS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
@@ -6359,8 +6484,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
@@ -6389,7 +6514,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;
@@ -6398,14 +6522,16 @@ if test "${enable_ole+set}" = set; then
                           else
                             wx_cv_use_ole='wxUSE_OLE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
@@ -6414,8 +6540,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
@@ -6444,7 +6570,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;
@@ -6453,14 +6578,16 @@ if test "${enable_dataobj+set}" = set; then
                           else
                             wx_cv_use_dataobj='wxUSE_DATAOBJ=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
@@ -6469,8 +6596,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
@@ -6500,7 +6627,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;
@@ -6509,14 +6635,16 @@ if test "${enable_ipc+set}" = set; then
                           else
                             wx_cv_use_ipc='wxUSE_IPC=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
@@ -6525,8 +6653,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
@@ -6556,7 +6684,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;
@@ -6565,14 +6692,16 @@ if test "${enable_baseevtloop+set}" = set; then
                           else
                             wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
@@ -6581,8 +6710,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,35 +6738,36 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
-          { 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;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epollloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-epollloop... $ECHO_C" >&6; }
+          # Check whether --enable-epollloop was given.
+if test "${enable_epollloop+set}" = set; then
+  enableval=$enable_epollloop;
                           if test "$enableval" = yes; then
-                            wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes'
+                            wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=yes'
                           else
-                            wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=no'
+                            wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
-                          wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
+                          wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
 
 fi
 
 
-          eval "$wx_cv_use_epoolloop"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_epoolloop >> ${wx_arg_cache_file}.tmp
+          eval "$wx_cv_use_epollloop"
+          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
@@ -6666,7 +6796,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;
@@ -6675,14 +6804,16 @@ if test "${enable_selectloop+set}" = set; then
                           else
                             wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
@@ -6691,8 +6822,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
@@ -6722,7 +6853,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;
@@ -6731,14 +6861,16 @@ if test "${enable_apple_ieee+set}" = set; then
                           else
                             wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
@@ -6747,8 +6879,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
@@ -6777,7 +6909,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;
@@ -6786,14 +6917,16 @@ if test "${enable_arcstream+set}" = set; then
                           else
                             wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
@@ -6802,8 +6935,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
@@ -6832,7 +6965,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;
@@ -6841,14 +6973,16 @@ if test "${enable_base64+set}" = set; then
                           else
                             wx_cv_use_base64='wxUSE_BASE64=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
@@ -6857,8 +6991,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
@@ -6887,7 +7021,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;
@@ -6896,14 +7029,16 @@ if test "${enable_backtrace+set}" = set; then
                           else
                             wx_cv_use_backtrace='wxUSE_STACKWALKER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
@@ -6912,8 +7047,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
@@ -6942,7 +7077,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;
@@ -6951,14 +7085,16 @@ if test "${enable_catch_segvs+set}" = set; then
                           else
                             wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
@@ -6967,8 +7103,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
@@ -6997,7 +7133,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;
@@ -7006,14 +7141,16 @@ if test "${enable_cmdline+set}" = set; then
                           else
                             wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
@@ -7022,8 +7159,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
@@ -7052,7 +7189,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;
@@ -7061,14 +7197,16 @@ if test "${enable_datetime+set}" = set; then
                           else
                             wx_cv_use_datetime='wxUSE_DATETIME=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
@@ -7077,8 +7215,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
@@ -7107,7 +7245,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;
@@ -7116,14 +7253,16 @@ if test "${enable_debugreport+set}" = set; then
                           else
                             wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
@@ -7132,8 +7271,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
@@ -7162,7 +7301,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;
@@ -7171,14 +7309,16 @@ if test "${enable_dialupman+set}" = set; then
                           else
                             wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
@@ -7187,8 +7327,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
@@ -7217,7 +7357,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;
@@ -7226,14 +7365,16 @@ if test "${enable_dynlib+set}" = set; then
                           else
                             wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
@@ -7242,8 +7383,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
@@ -7272,7 +7413,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;
@@ -7281,14 +7421,16 @@ if test "${enable_dynamicloader+set}" = set; then
                           else
                             wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
@@ -7297,8 +7439,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
@@ -7327,7 +7469,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;
@@ -7336,14 +7477,16 @@ if test "${enable_exceptions+set}" = set; then
                           else
                             wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
@@ -7352,8 +7495,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
@@ -7382,7 +7525,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;
@@ -7391,14 +7533,16 @@ if test "${enable_ffile+set}" = set; then
                           else
                             wx_cv_use_ffile='wxUSE_FFILE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
@@ -7407,8 +7551,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
@@ -7437,7 +7581,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;
@@ -7446,14 +7589,16 @@ if test "${enable_file+set}" = set; then
                           else
                             wx_cv_use_file='wxUSE_FILE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
@@ -7462,8 +7607,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
@@ -7492,7 +7637,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;
@@ -7501,14 +7645,16 @@ if test "${enable_filesystem+set}" = set; then
                           else
                             wx_cv_use_filesystem='wxUSE_FILESYSTEM=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
@@ -7517,8 +7663,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
@@ -7547,7 +7693,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontenum" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-fontenum... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-fontenum was given.
 if test "${enable_fontenum+set}" = set; then
   enableval=$enable_fontenum;
@@ -7556,14 +7701,16 @@ if test "${enable_fontenum+set}" = set; then
                           else
                             wx_cv_use_fontenum='wxUSE_FONTENUM=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}"
@@ -7572,8 +7719,8 @@ fi
 
 
           eval "$wx_cv_use_fontenum"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_fontenum >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FONTENUM=$wxUSE_FONTENUM" >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7602,7 +7749,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;
@@ -7611,14 +7757,16 @@ if test "${enable_fontmap+set}" = set; then
                           else
                             wx_cv_use_fontmap='wxUSE_FONTMAP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
@@ -7627,8 +7775,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
@@ -7657,7 +7805,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;
@@ -7666,14 +7813,16 @@ if test "${enable_fs_archive+set}" = set; then
                           else
                             wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
@@ -7682,8 +7831,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
@@ -7712,7 +7861,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;
@@ -7721,14 +7869,16 @@ if test "${enable_fs_inet+set}" = set; then
                           else
                             wx_cv_use_fs_inet='wxUSE_FS_INET=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
@@ -7737,8 +7887,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
@@ -7767,7 +7917,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;
@@ -7776,14 +7925,16 @@ if test "${enable_fs_zip+set}" = set; then
                           else
                             wx_cv_use_fs_zip='wxUSE_FS_ZIP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
@@ -7792,8 +7943,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
@@ -7822,7 +7973,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;
@@ -7831,14 +7981,16 @@ if test "${enable_geometry+set}" = set; then
                           else
                             wx_cv_use_geometry='wxUSE_GEOMETRY=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
@@ -7847,8 +7999,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
@@ -7877,7 +8029,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;
@@ -7886,14 +8037,16 @@ if test "${enable_log+set}" = set; then
                           else
                             wx_cv_use_log='wxUSE_LOG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
@@ -7902,8 +8055,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
@@ -7932,7 +8085,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;
@@ -7941,14 +8093,16 @@ if test "${enable_longlong+set}" = set; then
                           else
                             wx_cv_use_longlong='wxUSE_LONGLONG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
@@ -7957,8 +8111,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
@@ -7987,7 +8141,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;
@@ -7996,14 +8149,16 @@ if test "${enable_mimetype+set}" = set; then
                           else
                             wx_cv_use_mimetype='wxUSE_MIMETYPE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
@@ -8012,8 +8167,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
@@ -8042,7 +8197,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;
@@ -8051,14 +8205,16 @@ if test "${enable_snglinst+set}" = set; then
                           else
                             wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
@@ -8067,8 +8223,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
@@ -8097,7 +8253,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;
@@ -8106,14 +8261,16 @@ if test "${enable_stdpaths+set}" = set; then
                           else
                             wx_cv_use_stdpaths='wxUSE_STDPATHS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
@@ -8122,8 +8279,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
@@ -8152,7 +8309,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;
@@ -8161,14 +8317,16 @@ if test "${enable_stopwatch+set}" = set; then
                           else
                             wx_cv_use_stopwatch='wxUSE_STOPWATCH=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
@@ -8177,8 +8335,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
@@ -8207,7 +8365,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;
@@ -8216,14 +8373,16 @@ if test "${enable_streams+set}" = set; then
                           else
                             wx_cv_use_streams='wxUSE_STREAMS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
@@ -8232,8 +8391,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
@@ -8262,7 +8421,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;
@@ -8271,14 +8429,16 @@ if test "${enable_system_options+set}" = set; then
                           else
                             wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
@@ -8287,8 +8447,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
@@ -8317,7 +8477,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;
@@ -8326,14 +8485,16 @@ if test "${enable_tarstream+set}" = set; then
                           else
                             wx_cv_use_tarstream='wxUSE_TARSTREAM=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
@@ -8342,8 +8503,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
@@ -8372,7 +8533,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;
@@ -8381,14 +8541,16 @@ if test "${enable_textbuf+set}" = set; then
                           else
                             wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
@@ -8397,8 +8559,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
@@ -8427,7 +8589,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;
@@ -8436,14 +8597,16 @@ if test "${enable_textfile+set}" = set; then
                           else
                             wx_cv_use_textfile='wxUSE_TEXTFILE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
@@ -8452,8 +8615,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
@@ -8482,7 +8645,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;
@@ -8491,14 +8653,16 @@ if test "${enable_timer+set}" = set; then
                           else
                             wx_cv_use_timer='wxUSE_TIMER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
@@ -8507,8 +8671,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
@@ -8537,7 +8701,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;
@@ -8546,14 +8709,16 @@ if test "${enable_sound+set}" = set; then
                           else
                             wx_cv_use_sound='wxUSE_SOUND=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
@@ -8562,8 +8727,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
@@ -8592,7 +8757,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;
@@ -8601,14 +8765,16 @@ if test "${enable_mediactrl+set}" = set; then
                           else
                             wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
@@ -8617,8 +8783,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
@@ -8647,7 +8813,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;
@@ -8656,14 +8821,16 @@ if test "${enable_gstreamer8+set}" = set; then
                           else
                             wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
@@ -8672,8 +8839,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
@@ -8702,7 +8869,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;
@@ -8711,14 +8877,16 @@ if test "${enable_printfposparam+set}" = set; then
                           else
                             wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
@@ -8727,8 +8895,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
@@ -8757,7 +8925,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;
@@ -8766,14 +8933,16 @@ if test "${enable_zipstream+set}" = set; then
                           else
                             wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
@@ -8782,8 +8951,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
@@ -8813,7 +8982,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;
@@ -8822,14 +8990,16 @@ if test "${enable_url+set}" = set; then
                           else
                             wx_cv_use_url='wxUSE_URL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
@@ -8838,8 +9008,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
@@ -8868,7 +9038,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;
@@ -8877,14 +9046,16 @@ if test "${enable_variant+set}" = set; then
                           else
                             wx_cv_use_variant='wxUSE_VARIANT=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
@@ -8893,8 +9064,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
@@ -8923,7 +9094,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;
@@ -8932,14 +9102,16 @@ if test "${enable_protocol+set}" = set; then
                           else
                             wx_cv_use_protocol='wxUSE_PROTOCOL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
@@ -8948,8 +9120,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
@@ -8978,7 +9150,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;
@@ -8987,14 +9158,16 @@ if test "${enable_protocol_http+set}" = set; then
                           else
                             wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
@@ -9003,8 +9176,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
@@ -9033,7 +9206,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;
@@ -9042,14 +9214,16 @@ if test "${enable_protocol_ftp+set}" = set; then
                           else
                             wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
@@ -9058,8 +9232,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
@@ -9088,7 +9262,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;
@@ -9097,14 +9270,16 @@ if test "${enable_protocol_file+set}" = set; then
                           else
                             wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
@@ -9113,8 +9288,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
@@ -9144,7 +9319,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;
@@ -9153,14 +9327,16 @@ if test "${enable_threads+set}" = set; then
                           else
                             wx_cv_use_threads='wxUSE_THREADS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
@@ -9169,8 +9345,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
@@ -9187,6 +9363,119 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+
+          enablestring=
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iniconf" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-iniconf... $ECHO_C" >&6; }
+          # Check whether --enable-iniconf was given.
+if test "${enable_iniconf+set}" = set; then
+  enableval=$enable_iniconf;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_iniconf='wxUSE_INICONF=yes'
+                          else
+                            wx_cv_use_iniconf='wxUSE_INICONF=no'
+                          fi
+                          cache=yes
+
+else
+
+                          LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
+                          fi
+
+                          wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_iniconf"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_INICONF = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_INICONF
+          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
+
+                          LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
+                          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; }
+
+
 if test "$wxUSE_GUI" = "yes"; then
 
 
@@ -9203,7 +9492,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;
@@ -9212,14 +9500,16 @@ if test "${enable_docview+set}" = set; then
                           else
                             wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
@@ -9228,8 +9518,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
@@ -9258,7 +9548,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;
@@ -9267,14 +9556,16 @@ if test "${enable_help+set}" = set; then
                           else
                             wx_cv_use_help='wxUSE_HELP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
@@ -9283,8 +9574,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
@@ -9313,7 +9604,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;
@@ -9322,14 +9612,16 @@ if test "${enable_mshtmlhelp+set}" = set; then
                           else
                             wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
@@ -9338,8 +9630,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
@@ -9368,7 +9660,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;
@@ -9377,14 +9668,16 @@ if test "${enable_html+set}" = set; then
                           else
                             wx_cv_use_html='wxUSE_HTML=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
@@ -9393,8 +9686,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
@@ -9423,7 +9716,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;
@@ -9432,14 +9724,16 @@ if test "${enable_htmlhelp+set}" = set; then
                           else
                             wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
@@ -9448,8 +9742,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
@@ -9478,7 +9772,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;
@@ -9487,14 +9780,16 @@ if test "${enable_xrc+set}" = set; then
                           else
                             wx_cv_use_xrc='wxUSE_XRC=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
@@ -9503,8 +9798,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
@@ -9533,7 +9828,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;
@@ -9542,14 +9836,16 @@ if test "${enable_aui+set}" = set; then
                           else
                             wx_cv_use_aui='wxUSE_AUI=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
@@ -9558,8 +9854,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
@@ -9588,7 +9884,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;
@@ -9597,14 +9892,16 @@ if test "${enable_stc+set}" = set; then
                           else
                             wx_cv_use_stc='wxUSE_STC=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
@@ -9613,8 +9910,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
@@ -9643,7 +9940,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;
@@ -9652,14 +9948,16 @@ if test "${enable_constraints+set}" = set; then
                           else
                             wx_cv_use_constraints='wxUSE_CONSTRAINTS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
@@ -9668,8 +9966,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
@@ -9698,7 +9996,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;
@@ -9707,14 +10004,16 @@ if test "${enable_printarch+set}" = set; then
                           else
                             wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
@@ -9723,8 +10022,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
@@ -9753,7 +10052,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;
@@ -9762,14 +10060,16 @@ if test "${enable_mdi+set}" = set; then
                           else
                             wx_cv_use_mdi='wxUSE_MDI=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
@@ -9778,8 +10078,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
@@ -9808,7 +10108,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;
@@ -9817,14 +10116,16 @@ if test "${enable_mdidoc+set}" = set; then
                           else
                             wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
@@ -9833,8 +10134,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
@@ -9863,7 +10164,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;
@@ -9872,14 +10172,16 @@ if test "${enable_loggui+set}" = set; then
                           else
                             wx_cv_use_loggui='wxUSE_LOGGUI=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
@@ -9888,8 +10190,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
@@ -9918,7 +10220,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;
@@ -9927,14 +10228,16 @@ if test "${enable_logwin+set}" = set; then
                           else
                             wx_cv_use_logwin='wxUSE_LOGWINDOW=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
@@ -9943,8 +10246,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
@@ -9973,7 +10276,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;
@@ -9982,14 +10284,16 @@ if test "${enable_logdialog+set}" = set; then
                           else
                             wx_cv_use_logdialog='wxUSE_LOGDIALOG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
@@ -9998,8 +10302,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
@@ -10028,7 +10332,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;
@@ -10037,14 +10340,16 @@ if test "${enable_webkit+set}" = set; then
                           else
                             wx_cv_use_webkit='wxUSE_WEBKIT=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
@@ -10053,8 +10358,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
@@ -10083,7 +10388,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;
@@ -10092,14 +10396,16 @@ if test "${enable_richtext+set}" = set; then
                           else
                             wx_cv_use_richtext='wxUSE_RICHTEXT=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
@@ -10108,8 +10414,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
@@ -10138,7 +10444,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;
@@ -10147,14 +10452,16 @@ if test "${enable_graphics_ctx+set}" = set; then
                           else
                             wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
@@ -10163,8 +10470,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
@@ -10193,7 +10500,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;
@@ -10202,14 +10508,16 @@ if test "${enable_postscript+set}" = set; then
                           else
                             wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
@@ -10218,8 +10526,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
@@ -10248,7 +10556,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;
@@ -10257,14 +10564,16 @@ if test "${enable_svg+set}" = set; then
                           else
                             wx_cv_use_svg='wxUSE_SVG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
@@ -10273,8 +10582,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
@@ -10305,7 +10614,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;
@@ -10314,14 +10622,16 @@ if test "${enable_clipboard+set}" = set; then
                           else
                             wx_cv_use_clipboard='wxUSE_CLIPBOARD=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
@@ -10330,8 +10640,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
@@ -10360,7 +10670,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;
@@ -10369,14 +10678,16 @@ if test "${enable_dnd+set}" = set; then
                           else
                             wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
@@ -10385,8 +10696,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
@@ -10415,7 +10726,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;
@@ -10424,14 +10734,16 @@ if test "${enable_metafile+set}" = set; then
                           else
                             wx_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
@@ -10440,8 +10752,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
@@ -10473,7 +10785,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;
@@ -10482,14 +10793,16 @@ if test "${enable_controls+set}" = set; then
                           else
                             wx_cv_use_controls='wxUSE_CONTROLS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
@@ -10498,8 +10811,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
@@ -10535,6 +10848,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_DISPLAY=yes
   DEFAULT_wxUSE_DETECT_SM=yes
   DEFAULT_wxUSE_DIRPICKERCTRL=yes
+  DEFAULT_wxUSE_FILECTRL=yes
   DEFAULT_wxUSE_FILEPICKERCTRL=yes
   DEFAULT_wxUSE_FONTPICKERCTRL=yes
   DEFAULT_wxUSE_GAUGE=yes
@@ -10588,6 +10902,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_DISPLAY=no
   DEFAULT_wxUSE_DETECT_SM=no
   DEFAULT_wxUSE_DIRPICKERCTRL=no
+  DEFAULT_wxUSE_FILECTRL=no
   DEFAULT_wxUSE_FILEPICKERCTRL=no
   DEFAULT_wxUSE_FONTPICKERCTRL=no
   DEFAULT_wxUSE_GAUGE=no
@@ -10637,7 +10952,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;
@@ -10646,14 +10960,16 @@ if test "${enable_accel+set}" = set; then
                           else
                             wx_cv_use_accel='wxUSE_ACCEL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
@@ -10662,8 +10978,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
@@ -10692,7 +11008,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;
@@ -10701,14 +11016,16 @@ if test "${enable_animatectrl+set}" = set; then
                           else
                             wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
@@ -10717,8 +11034,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
@@ -10747,7 +11064,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;
@@ -10756,14 +11072,16 @@ if test "${enable_button+set}" = set; then
                           else
                             wx_cv_use_button='wxUSE_BUTTON=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
@@ -10772,8 +11090,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
@@ -10802,7 +11120,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;
@@ -10811,14 +11128,16 @@ if test "${enable_bmpbutton+set}" = set; then
                           else
                             wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
@@ -10827,8 +11146,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
@@ -10857,7 +11176,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;
@@ -10866,14 +11184,16 @@ if test "${enable_bmpcombobox+set}" = set; then
                           else
                             wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
@@ -10882,8 +11202,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
@@ -10912,7 +11232,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;
@@ -10921,14 +11240,16 @@ if test "${enable_calendar+set}" = set; then
                           else
                             wx_cv_use_calendar='wxUSE_CALCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
@@ -10937,8 +11258,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
@@ -10967,7 +11288,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;
@@ -10976,14 +11296,16 @@ if test "${enable_caret+set}" = set; then
                           else
                             wx_cv_use_caret='wxUSE_CARET=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
@@ -10992,8 +11314,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
@@ -11022,7 +11344,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;
@@ -11031,14 +11352,16 @@ if test "${enable_checkbox+set}" = set; then
                           else
                             wx_cv_use_checkbox='wxUSE_CHECKBOX=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
@@ -11047,8 +11370,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
@@ -11077,7 +11400,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;
@@ -11086,14 +11408,16 @@ if test "${enable_checklst+set}" = set; then
                           else
                             wx_cv_use_checklst='wxUSE_CHECKLST=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
@@ -11102,8 +11426,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
@@ -11132,7 +11456,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;
@@ -11141,14 +11464,16 @@ if test "${enable_choice+set}" = set; then
                           else
                             wx_cv_use_choice='wxUSE_CHOICE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
@@ -11157,8 +11482,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
@@ -11187,7 +11512,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;
@@ -11196,14 +11520,16 @@ if test "${enable_choicebook+set}" = set; then
                           else
                             wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
@@ -11212,8 +11538,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
@@ -11242,7 +11568,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;
@@ -11251,14 +11576,16 @@ if test "${enable_collpane+set}" = set; then
                           else
                             wx_cv_use_collpane='wxUSE_COLLPANE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
@@ -11267,8 +11594,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
@@ -11297,7 +11624,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;
@@ -11306,14 +11632,16 @@ if test "${enable_colourpicker+set}" = set; then
                           else
                             wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
@@ -11322,8 +11650,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
@@ -11352,7 +11680,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;
@@ -11361,14 +11688,16 @@ if test "${enable_combobox+set}" = set; then
                           else
                             wx_cv_use_combobox='wxUSE_COMBOBOX=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
@@ -11377,8 +11706,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
@@ -11407,7 +11736,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;
@@ -11416,14 +11744,16 @@ if test "${enable_comboctrl+set}" = set; then
                           else
                             wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
@@ -11432,8 +11762,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
@@ -11462,7 +11792,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;
@@ -11471,14 +11800,16 @@ if test "${enable_datepick+set}" = set; then
                           else
                             wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
@@ -11487,8 +11818,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
@@ -11517,7 +11848,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;
@@ -11526,14 +11856,16 @@ if test "${enable_dirpicker+set}" = set; then
                           else
                             wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
@@ -11542,8 +11874,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
@@ -11572,7 +11904,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;
@@ -11581,14 +11912,16 @@ if test "${enable_display+set}" = set; then
                           else
                             wx_cv_use_display='wxUSE_DISPLAY=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
@@ -11597,8 +11930,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
@@ -11627,7 +11960,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;
@@ -11636,14 +11968,16 @@ if test "${enable_detect_sm+set}" = set; then
                           else
                             wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
@@ -11652,8 +11986,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
@@ -11682,7 +12016,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;
@@ -11691,14 +12024,16 @@ if test "${enable_editablebox+set}" = set; then
                           else
                             wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
@@ -11707,8 +12042,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
@@ -11737,7 +12072,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;
@@ -11746,14 +12080,16 @@ if test "${enable_filepicker+set}" = set; then
                           else
                             wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
@@ -11762,8 +12098,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
 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}-filectrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filectrl... $ECHO_C" >&6; }
+          # Check whether --enable-filectrl was given.
+if test "${enable_filectrl+set}" = set; then
+  enableval=$enable_filectrl;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_filectrl='wxUSE_FILECTRL=yes'
+                          else
+                            wx_cv_use_filectrl='wxUSE_FILECTRL=no'
+                          fi
+                          cache=yes
+
+else
+
+                          LINE=`grep "^wxUSE_FILECTRL=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
+                          fi
+
+                          wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_filectrl"
+          if test "x$cache" = xyes; then
+            echo "wxUSE_FILECTRL=$wxUSE_FILECTRL" >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FILECTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_FILECTRL
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -11792,7 +12184,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;
@@ -11801,14 +12192,16 @@ if test "${enable_fontpicker+set}" = set; then
                           else
                             wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
@@ -11817,8 +12210,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
@@ -11847,7 +12240,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;
@@ -11856,14 +12248,16 @@ if test "${enable_gauge+set}" = set; then
                           else
                             wx_cv_use_gauge='wxUSE_GAUGE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
@@ -11872,8 +12266,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
@@ -11902,7 +12296,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;
@@ -11911,14 +12304,16 @@ if test "${enable_grid+set}" = set; then
                           else
                             wx_cv_use_grid='wxUSE_GRID=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
@@ -11927,8 +12322,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
@@ -11957,7 +12352,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;
@@ -11966,14 +12360,16 @@ if test "${enable_dataviewctrl+set}" = set; then
                           else
                             wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
@@ -11982,8 +12378,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
@@ -12012,7 +12408,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;
@@ -12021,14 +12416,16 @@ if test "${enable_hyperlink+set}" = set; then
                           else
                             wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
@@ -12037,8 +12434,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
@@ -12067,7 +12464,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;
@@ -12076,14 +12472,16 @@ if test "${enable_imaglist+set}" = set; then
                           else
                             wx_cv_use_imaglist='wxUSE_IMAGLIST=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
@@ -12092,8 +12490,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
@@ -12122,7 +12520,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;
@@ -12131,14 +12528,16 @@ if test "${enable_listbook+set}" = set; then
                           else
                             wx_cv_use_listbook='wxUSE_LISTBOOK=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
@@ -12147,8 +12546,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
@@ -12177,7 +12576,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;
@@ -12186,14 +12584,16 @@ if test "${enable_listbox+set}" = set; then
                           else
                             wx_cv_use_listbox='wxUSE_LISTBOX=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
@@ -12202,8 +12602,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
@@ -12232,7 +12632,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;
@@ -12241,14 +12640,16 @@ if test "${enable_listctrl+set}" = set; then
                           else
                             wx_cv_use_listctrl='wxUSE_LISTCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
@@ -12257,8 +12658,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
@@ -12287,7 +12688,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;
@@ -12296,14 +12696,16 @@ if test "${enable_notebook+set}" = set; then
                           else
                             wx_cv_use_notebook='wxUSE_NOTEBOOK=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
@@ -12312,8 +12714,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
@@ -12342,7 +12744,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;
@@ -12351,14 +12752,16 @@ if test "${enable_odcombobox+set}" = set; then
                           else
                             wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
@@ -12367,8 +12770,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
@@ -12397,7 +12800,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;
@@ -12406,14 +12808,16 @@ if test "${enable_radiobox+set}" = set; then
                           else
                             wx_cv_use_radiobox='wxUSE_RADIOBOX=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
@@ -12422,8 +12826,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
@@ -12452,7 +12856,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;
@@ -12461,14 +12864,16 @@ if test "${enable_radiobtn+set}" = set; then
                           else
                             wx_cv_use_radiobtn='wxUSE_RADIOBTN=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
@@ -12477,8 +12882,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
@@ -12507,7 +12912,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;
@@ -12516,14 +12920,16 @@ if test "${enable_sash+set}" = set; then
                           else
                             wx_cv_use_sash='wxUSE_SASH=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
@@ -12532,8 +12938,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
@@ -12562,7 +12968,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;
@@ -12571,14 +12976,16 @@ if test "${enable_scrollbar+set}" = set; then
                           else
                             wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
@@ -12587,8 +12994,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
@@ -12617,7 +13024,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;
@@ -12626,14 +13032,16 @@ if test "${enable_searchctrl+set}" = set; then
                           else
                             wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
@@ -12642,8 +13050,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
@@ -12672,7 +13080,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;
@@ -12681,14 +13088,16 @@ if test "${enable_slider+set}" = set; then
                           else
                             wx_cv_use_slider='wxUSE_SLIDER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
@@ -12697,8 +13106,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
@@ -12727,7 +13136,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;
@@ -12736,14 +13144,16 @@ if test "${enable_spinbtn+set}" = set; then
                           else
                             wx_cv_use_spinbtn='wxUSE_SPINBTN=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
@@ -12752,8 +13162,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
@@ -12782,7 +13192,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;
@@ -12791,14 +13200,16 @@ if test "${enable_spinctrl+set}" = set; then
                           else
                             wx_cv_use_spinctrl='wxUSE_SPINCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
@@ -12807,8 +13218,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
@@ -12837,7 +13248,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;
@@ -12846,14 +13256,16 @@ if test "${enable_splitter+set}" = set; then
                           else
                             wx_cv_use_splitter='wxUSE_SPLITTER=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
@@ -12862,8 +13274,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
@@ -12892,7 +13304,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;
@@ -12901,14 +13312,16 @@ if test "${enable_statbmp+set}" = set; then
                           else
                             wx_cv_use_statbmp='wxUSE_STATBMP=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
@@ -12917,8 +13330,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
@@ -12947,7 +13360,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;
@@ -12956,14 +13368,16 @@ if test "${enable_statbox+set}" = set; then
                           else
                             wx_cv_use_statbox='wxUSE_STATBOX=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
@@ -12972,8 +13386,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
@@ -13002,7 +13416,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;
@@ -13011,14 +13424,16 @@ if test "${enable_statline+set}" = set; then
                           else
                             wx_cv_use_statline='wxUSE_STATLINE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
@@ -13027,8 +13442,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
@@ -13057,7 +13472,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;
@@ -13066,14 +13480,16 @@ if test "${enable_stattext+set}" = set; then
                           else
                             wx_cv_use_stattext='wxUSE_STATTEXT=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
@@ -13082,8 +13498,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
@@ -13112,7 +13528,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;
@@ -13121,14 +13536,16 @@ if test "${enable_statusbar+set}" = set; then
                           else
                             wx_cv_use_statusbar='wxUSE_STATUSBAR=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
@@ -13137,8 +13554,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
@@ -13167,7 +13584,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;
@@ -13176,14 +13592,16 @@ if test "${enable_tabdialog+set}" = set; then
                           else
                             wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
@@ -13192,8 +13610,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
@@ -13222,7 +13640,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;
@@ -13231,14 +13648,16 @@ if test "${enable_taskbaricon+set}" = set; then
                           else
                             wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
@@ -13247,8 +13666,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
@@ -13277,7 +13696,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;
@@ -13286,14 +13704,16 @@ if test "${enable_textctrl+set}" = set; then
                           else
                             wx_cv_use_textctrl='wxUSE_TEXTCTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
@@ -13302,8 +13722,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
@@ -13332,7 +13752,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;
@@ -13341,14 +13760,16 @@ if test "${enable_togglebtn+set}" = set; then
                           else
                             wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
@@ -13357,8 +13778,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
@@ -13387,7 +13808,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;
@@ -13396,14 +13816,16 @@ if test "${enable_toolbar+set}" = set; then
                           else
                             wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
@@ -13412,8 +13834,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
@@ -13442,7 +13864,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;
@@ -13451,14 +13872,16 @@ if test "${enable_tbarnative+set}" = set; then
                           else
                             wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
@@ -13467,8 +13890,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
@@ -13497,7 +13920,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;
@@ -13506,14 +13928,16 @@ if test "${enable_treebook+set}" = set; then
                           else
                             wx_cv_use_treebook='wxUSE_TREEBOOK=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
@@ -13522,8 +13946,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
@@ -13552,7 +13976,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;
@@ -13561,14 +13984,16 @@ if test "${enable_toolbook+set}" = set; then
                           else
                             wx_cv_use_toolbook='wxUSE_TOOLBOOK=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
@@ -13577,8 +14002,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
@@ -13607,7 +14032,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;
@@ -13616,14 +14040,16 @@ if test "${enable_treectrl+set}" = set; then
                           else
                             wx_cv_use_treectrl='wxUSE_TREECTRL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
@@ -13632,8 +14058,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
@@ -13662,7 +14088,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;
@@ -13671,14 +14096,16 @@ if test "${enable_tipwindow+set}" = set; then
                           else
                             wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
@@ -13687,8 +14114,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
@@ -13717,7 +14144,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;
@@ -13726,14 +14152,16 @@ if test "${enable_popupwin+set}" = set; then
                           else
                             wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
@@ -13742,8 +14170,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
@@ -13774,7 +14202,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;
@@ -13783,14 +14210,16 @@ if test "${enable_commondlg+set}" = set; then
                           else
                             wx_cv_use_commondlg='wxUSE_COMMONDLGS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
@@ -13799,8 +14228,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
@@ -13829,7 +14258,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;
@@ -13838,14 +14266,16 @@ if test "${enable_aboutdlg+set}" = set; then
                           else
                             wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
@@ -13854,8 +14284,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
@@ -13884,7 +14314,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;
@@ -13893,14 +14322,16 @@ if test "${enable_choicedlg+set}" = set; then
                           else
                             wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
@@ -13909,8 +14340,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
@@ -13939,7 +14370,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;
@@ -13948,14 +14378,16 @@ if test "${enable_coldlg+set}" = set; then
                           else
                             wx_cv_use_coldlg='wxUSE_COLOURDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
@@ -13964,8 +14396,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
@@ -13994,7 +14426,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;
@@ -14003,14 +14434,16 @@ if test "${enable_filedlg+set}" = set; then
                           else
                             wx_cv_use_filedlg='wxUSE_FILEDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
@@ -14019,8 +14452,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
@@ -14049,7 +14482,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;
@@ -14058,14 +14490,16 @@ if test "${enable_finddlg+set}" = set; then
                           else
                             wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
@@ -14074,8 +14508,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
@@ -14104,7 +14538,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;
@@ -14113,14 +14546,16 @@ if test "${enable_fontdlg+set}" = set; then
                           else
                             wx_cv_use_fontdlg='wxUSE_FONTDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
@@ -14129,8 +14564,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
@@ -14159,7 +14594,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;
@@ -14168,14 +14602,16 @@ if test "${enable_dirdlg+set}" = set; then
                           else
                             wx_cv_use_dirdlg='wxUSE_DIRDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
@@ -14184,8 +14620,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
@@ -14214,7 +14650,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;
@@ -14223,14 +14658,16 @@ if test "${enable_msgdlg+set}" = set; then
                           else
                             wx_cv_use_msgdlg='wxUSE_MSGDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
@@ -14239,8 +14676,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
@@ -14269,7 +14706,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;
@@ -14278,14 +14714,16 @@ if test "${enable_numberdlg+set}" = set; then
                           else
                             wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
@@ -14294,8 +14732,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
@@ -14324,7 +14762,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;
@@ -14333,14 +14770,16 @@ if test "${enable_splash+set}" = set; then
                           else
                             wx_cv_use_splash='wxUSE_SPLASH=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
@@ -14349,8 +14788,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
@@ -14379,7 +14818,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;
@@ -14388,14 +14826,16 @@ if test "${enable_textdlg+set}" = set; then
                           else
                             wx_cv_use_textdlg='wxUSE_TEXTDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
@@ -14404,8 +14844,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
@@ -14434,7 +14874,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;
@@ -14443,14 +14882,16 @@ if test "${enable_tipdlg+set}" = set; then
                           else
                             wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
@@ -14459,8 +14900,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
@@ -14489,7 +14930,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;
@@ -14498,14 +14938,16 @@ if test "${enable_progressdlg+set}" = set; then
                           else
                             wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
@@ -14514,8 +14956,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
@@ -14544,7 +14986,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;
@@ -14553,14 +14994,16 @@ if test "${enable_wizarddlg+set}" = set; then
                           else
                             wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
@@ -14569,8 +15012,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
@@ -14601,7 +15044,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;
@@ -14610,14 +15052,16 @@ if test "${enable_menus+set}" = set; then
                           else
                             wx_cv_use_menus='wxUSE_MENUS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
@@ -14626,8 +15070,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
@@ -14656,7 +15100,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;
@@ -14665,14 +15108,16 @@ if test "${enable_miniframe+set}" = set; then
                           else
                             wx_cv_use_miniframe='wxUSE_MINIFRAME=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
@@ -14681,8 +15126,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
@@ -14711,7 +15156,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;
@@ -14720,14 +15164,16 @@ if test "${enable_tooltips+set}" = set; then
                           else
                             wx_cv_use_tooltips='wxUSE_TOOLTIPS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
@@ -14736,8 +15182,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
@@ -14766,7 +15212,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;
@@ -14775,14 +15220,16 @@ if test "${enable_splines+set}" = set; then
                           else
                             wx_cv_use_splines='wxUSE_SPLINES=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
@@ -14791,8 +15238,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
@@ -14821,7 +15268,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;
@@ -14830,14 +15276,16 @@ if test "${enable_mousewheel+set}" = set; then
                           else
                             wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
@@ -14846,8 +15294,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
@@ -14876,7 +15324,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;
@@ -14885,14 +15332,16 @@ if test "${enable_validators+set}" = set; then
                           else
                             wx_cv_use_validators='wxUSE_VALIDATORS=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
@@ -14901,8 +15350,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
@@ -14931,7 +15380,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;
@@ -14940,14 +15388,16 @@ if test "${enable_busyinfo+set}" = set; then
                           else
                             wx_cv_use_busyinfo='wxUSE_BUSYINFO=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
@@ -14956,8 +15406,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
@@ -14986,7 +15436,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;
@@ -14995,14 +15444,16 @@ if test "${enable_joystick+set}" = set; then
                           else
                             wx_cv_use_joystick='wxUSE_JOYSTICK=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
@@ -15011,8 +15462,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
@@ -15041,7 +15492,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;
@@ -15050,14 +15500,16 @@ if test "${enable_metafile+set}" = set; then
                           else
                             wx_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
@@ -15066,8 +15518,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
@@ -15096,7 +15548,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;
@@ -15105,14 +15556,16 @@ if test "${enable_dragimage+set}" = set; then
                           else
                             wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
@@ -15121,8 +15574,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
@@ -15151,7 +15604,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;
@@ -15160,14 +15612,16 @@ if test "${enable_accessibility+set}" = set; then
                           else
                             wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
@@ -15176,8 +15630,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
@@ -15208,7 +15662,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { 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;
@@ -15217,14 +15670,16 @@ if test "${enable_palette+set}" = set; then
                           else
                             wx_cv_use_palette='wxUSE_PALETTE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
@@ -15233,8 +15688,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
@@ -15263,7 +15718,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;
@@ -15272,14 +15726,16 @@ if test "${enable_image+set}" = set; then
                           else
                             wx_cv_use_image='wxUSE_IMAGE=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
@@ -15288,8 +15744,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
@@ -15318,7 +15774,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;
@@ -15327,14 +15782,16 @@ if test "${enable_gif+set}" = set; then
                           else
                             wx_cv_use_gif='wxUSE_GIF=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
@@ -15343,8 +15800,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
@@ -15373,7 +15830,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;
@@ -15382,14 +15838,16 @@ if test "${enable_pcx+set}" = set; then
                           else
                             wx_cv_use_pcx='wxUSE_PCX=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
@@ -15398,8 +15856,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
@@ -15428,7 +15886,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;
@@ -15437,14 +15894,16 @@ if test "${enable_tga+set}" = set; then
                           else
                             wx_cv_use_tga='wxUSE_TGA=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
@@ -15453,8 +15912,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
@@ -15483,7 +15942,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;
@@ -15492,14 +15950,16 @@ if test "${enable_iff+set}" = set; then
                           else
                             wx_cv_use_iff='wxUSE_IFF=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
@@ -15508,8 +15968,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
@@ -15538,7 +15998,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;
@@ -15547,14 +16006,16 @@ if test "${enable_pnm+set}" = set; then
                           else
                             wx_cv_use_pnm='wxUSE_PNM=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
@@ -15563,8 +16024,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
@@ -15593,7 +16054,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;
@@ -15602,14 +16062,16 @@ if test "${enable_xpm+set}" = set; then
                           else
                             wx_cv_use_xpm='wxUSE_XPM=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
@@ -15618,8 +16080,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
@@ -15648,7 +16110,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;
@@ -15657,14 +16118,16 @@ if test "${enable_ico_cur+set}" = set; then
                           else
                             wx_cv_use_ico_cur='wxUSE_ICO_CUR=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
@@ -15673,8 +16136,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
@@ -15705,7 +16168,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { 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;
@@ -15714,14 +16176,16 @@ if test "${enable_dccache+set}" = set; then
                           else
                             wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
@@ -15730,8 +16194,8 @@ fi
 
 
           eval "$wx_cv_use_dccache"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_dccache >> ${wx_arg_cache_file}.tmp
+          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
 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
+
+                          LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
+                          fi
+
+                          wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}"
+
+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
+
+                          LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
+                          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
@@ -15760,7 +16336,6 @@ echo "${ECHO_T}$result" >&6; }
 
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-uxtheme" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-uxtheme... $ECHO_C" >&6; }
-          no_cache=0
           # Check whether --enable-uxtheme was given.
 if test "${enable_uxtheme+set}" = set; then
   enableval=$enable_uxtheme;
@@ -15769,14 +16344,16 @@ if test "${enable_uxtheme+set}" = set; then
                           else
                             wx_cv_use_uxtheme='wxUSE_UXTHEME=no'
                           fi
+                          cache=yes
 
 else
 
                           LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
                           else
-                            no_cache=1
+                              cache=no
                           fi
 
                           wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
@@ -15785,8 +16362,8 @@ fi
 
 
           eval "$wx_cv_use_uxtheme"
-          if test "$no_cache" != 1; then
-            echo $wx_cv_use_uxtheme >> ${wx_arg_cache_file}.tmp
+          if test "x$cache" = xyes; then
+            echo "wxUSE_UXTHEME=$wxUSE_UXTHEME" >> ${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}-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
+
+                          LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
+                          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
 
 
@@ -19619,103 +20252,6 @@ echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
 if test "x$SUNCXX" != xyes; then
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
@@ -19820,595 +20356,256 @@ echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
     fi
 fi
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-         if test $ac_prog = install &&
-           grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # AIX install.  It has an incompatible calling convention.
-           :
-         elif test $ac_prog = install &&
-           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # program-specific install script used by HP pwplus--don't use.
-           :
-         else
-           ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-           break 3
-         fi
-       fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-case ${INSTALL} in
-  /* ) # Absolute
-     ;;
-  ?:* ) # Drive letter, considered as absolute.
-     ;;
-  *)
-     INSTALL=`pwd`/${INSTALL} ;;
-esac
-
-
-case "${host}" in
-
-                *-*-darwin* )
-        INSTALL_PROGRAM="cp -fp"
-        INSTALL_DATA="cp -fp"
-        ;;
-    *)
-        ;;
-esac
+retest_macosx_linking=no
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+#if test "$wxUSE_MAC" = 1; then
+    if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
+                        if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
+            # Implicitly turn on the new --with-macosx-sdk using the default
+            # SDK which provides the behavior this option has always had.
+            if test "x$wxUSE_MACOSX_SDK" = "x"; then
+                { echo "$as_me:$LINENO: WARNING: Enabling default SDK due to --enable-universal_binary." >&5
+echo "$as_me: WARNING: Enabling default SDK due to --enable-universal_binary." >&2;}
+                { echo "$as_me:$LINENO: WARNING: If you don't want this, specify --without-macosx-sdk" >&5
+echo "$as_me: WARNING: If you don't want this, specify --without-macosx-sdk" >&2;}
+                wxUSE_MACOSX_SDK=yes
+            fi
+        else
+            # Complain to user if he specified an argument to --enable-universal_binary
+            # and also 1) specified --with-macosx-sdk using the default (yes) or
+            # 2) specified --with-macosx-sdk using a path or 3) specified
+            # --without-macosx-sdk (no).
+            if test "x$wxUSE_MACOSX_SDK" != "x" ; then
+                { { echo "$as_me:$LINENO: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary
+See \`config.log' for more details." >&5
+echo "$as_me: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+            else
+                # Put the SDK path into the wxUSE_MACOSX_SDK.  We don't have to
+                # special-case the empty string because the below test simply
+                # converts "no" to the empty string anyway.
+                wxUSE_MACOSX_SDK="$wxUSE_UNIVERSAL_BINARY"
+                                { echo "$as_me:$LINENO: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&5
+echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;}
+            fi
+        fi
+                OSX_UNIV_OPTS="-arch ppc -arch i386"
+        CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
+        CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
+        LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
+                                                                                                                retest_macosx_linking=yes
 
+                                        { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5
+echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;}
+        bk_use_pch=no
+    fi
+#fi
 
+if test "x$wxUSE_MACOSX_SDK" = "xno"; then
+    wxUSE_MACOSX_SDK=
+elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
+    # TODO: Search for most recent SDK and use it.
+    wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
 fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
 
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP="true"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
+if test "x$wxUSE_MACOSX_SDK" != "x"; then
+    { echo "$as_me:$LINENO: checking for SDK directory $wxUSE_MACOSX_SDK" >&5
+echo $ECHO_N "checking for SDK directory $wxUSE_MACOSX_SDK... $ECHO_C" >&6; }
+    if ! test -d "$wxUSE_MACOSX_SDK"; then
+        { { echo "$as_me:$LINENO: error: not found
+See \`config.log' for more details." >&5
+echo "$as_me: error: not found
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+    else
+        { echo "$as_me:$LINENO: result: exists" >&5
+echo "${ECHO_T}exists" >&6; }
+    fi
+    MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK"
+    eval "CC=\"$CC $MACOSX_SDK_OPTS\""
+    eval "CXX=\"$CXX $MACOSX_SDK_OPTS\""
+    eval "LD=\"$LD $MACOSX_SDK_OPTS\""
+    retest_macosx_linking=yes
+            fi
 
+if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then
+    wxUSE_MACOSX_VERSION_MIN=
+elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then
+    if test "x$wxUSE_MACOSX_SDK" != "x"; then
+        { echo "$as_me:$LINENO: checking SDK deployment version" >&5
+echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6; }
 
-if test "$wxUSE_WINE" = "yes"; then
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}wrc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}wrc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_WINDRES="${ac_tool_prefix}wrc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-WINDRES=$ac_cv_prog_WINDRES
-if test -n "$WINDRES"; then
-  { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+        MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
 
+        # If that failed, try again with the new key
+        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
 
-fi
-if test -z "$ac_cv_prog_WINDRES"; then
-  ac_ct_WINDRES=$WINDRES
-  # Extract the first word of "wrc", so it can be a program name with args.
-set dummy wrc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_WINDRES"; then
-  ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_WINDRES="wrc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+            MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
 
-fi
-fi
-ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
-if test -n "$ac_ct_WINDRES"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+        fi
 
-  if test "x$ac_ct_WINDRES" = x; then
-    WINDRES=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    WINDRES=$ac_ct_WINDRES
-  fi
-else
-  WINDRES="$ac_cv_prog_WINDRES"
+        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then
+            wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN
+            { echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5
+echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
+        else
+            { echo "$as_me:$LINENO: WARNING: Could not determine deployment target from SDKSettings.plist" >&5
+echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;}
+            wxUSE_MACOSX_VERSION_MIN=
+        fi
+    else
+        wxUSE_MACOSX_VERSION_MIN=
+    fi
 fi
 
-    RESCOMP="$WINDRES"
-else
-    case "${host}" in
-    *-*-cygwin* | *-*-mingw32* )
-                                if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
-set dummy ${ac_tool_prefix}windres; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-WINDRES=$ac_cv_prog_WINDRES
-if test -n "$WINDRES"; then
-  { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
+    MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
+    eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\""
+    eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\""
+    eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\""
+    retest_macosx_linking=yes
 fi
 
+if test "x$retest_macosx_linking" = "xyes"; then
+    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
 
-fi
-if test -z "$ac_cv_prog_WINDRES"; then
-  ac_ct_WINDRES=$WINDRES
-  # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_WINDRES"; then
-  ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_WINDRES="windres"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+    { echo "$as_me:$LINENO: checking if C compiler works with SDK/version options" >&5
+echo $ECHO_N "checking if C compiler works with SDK/version options... $ECHO_C" >&6; }
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
-fi
-ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
-if test -n "$ac_ct_WINDRES"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+int
+main ()
+{
 
-  if test "x$ac_ct_WINDRES" = x; then
-    WINDRES=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
+  ;
+  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
-    WINDRES=$ac_ct_WINDRES
-  fi
-else
-  WINDRES="$ac_cv_prog_WINDRES"
-fi
-
-        RESCOMP="$WINDRES"
-        if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+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_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+       { { echo "$as_me:$LINENO: error: no.  Try a different SDK
+See \`config.log' for more details." >&5
+echo "$as_me: error: no.  Try a different SDK
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; exit 1
 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
 
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+    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
 
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
+    { echo "$as_me:$LINENO: checking if C++ compiler works with SDK/version options" >&5
+echo $ECHO_N "checking if C++ compiler works with SDK/version options... $ECHO_C" >&6; }
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-        ;;
-    esac
-fi
+int
+main ()
+{
 
-{ echo "$as_me:$LINENO: checking if make is GNU make" >&5
-echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6; }
-if test "${wx_cv_prog_makeisgnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  ;
+  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
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
-            $EGREP -s GNU > /dev/null); then
-        wx_cv_prog_makeisgnu="yes"
-    else
-        wx_cv_prog_makeisgnu="no"
-    fi
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_prog_makeisgnu" >&5
-echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6; }
-
-if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
-    IF_GNU_MAKE=""
-else
-    IF_GNU_MAKE="#"
+       { { echo "$as_me:$LINENO: error: no.  Try a different SDK
+See \`config.log' for more details." >&5
+echo "$as_me: error: no.  Try a different SDK
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; exit 1
 fi
 
-
-
-if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
-{ echo "$as_me:$LINENO: checking if make supports VPATH" >&5
-echo $ECHO_N "checking if make supports VPATH... $ECHO_C" >&6; }
-if test "${wx_cv_prog_makevpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-cat - << EOF > confMake
-check : file
-       cp \$? \$@
-       cp \$? final_file
-EOF
-
-if test ! -d sub ; then
-  mkdir sub
-fi
-echo dummy > sub/file
-${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null
-RESULT=$?
-rm -f sub/file check final_file confMake
-rmdir sub
-if test "$RESULT" = 0; then
-  wx_cv_prog_makevpath="yes"
-else
-  wx_cv_prog_makevpath="no"
-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
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_prog_makevpath" >&5
-echo "${ECHO_T}$wx_cv_prog_makevpath" >&6; }
 
-if test "x$wx_cv_prog_makevpath" != "xyes"; then
-{ { echo "$as_me:$LINENO: error:
-You need a make-utility that is able to use the variable
-VPATH correctly.
-If your version of make does not support VPATH correctly,
-please install GNU-make (possibly as gmake), and start
-configure with the following command:
-export MAKE=gmake; ./configure  for sh-type shells
-setenv MAKE gmake; ./configure  for csh-type shells
-Also please do remember to use gmake in this case every time
-you are trying to compile.
-" >&5
-echo "$as_me: error:
-You need a make-utility that is able to use the variable
-VPATH correctly.
-If your version of make does not support VPATH correctly,
-please install GNU-make (possibly as gmake), and start
-configure with the following command:
-export MAKE=gmake; ./configure  for sh-type shells
-setenv MAKE gmake; ./configure  for csh-type shells
-Also please do remember to use gmake in this case every time
-you are trying to compile.
-" >&2;}
-   { (exit 1); exit 1; }; }
-fi fi
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
-fi
 
+case "${host}" in
 
+                *-*-darwin* )
+        INSTALL_PROGRAM="cp -fp"
+        INSTALL_DATA="cp -fp"
+        ;;
+    *)
+        ;;
+esac
 
 
 if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
@@ -21251,11 +21448,7 @@ done
 
 
 
-
-
-
-
-for ac_header in stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h
+for ac_header in langinfo.h wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -27073,95 +27266,209 @@ 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
-  wx_cv_lib_stl=yes
+  wx_cv_lib_stl=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_lib_stl=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5
+echo "${ECHO_T}$wx_cv_lib_stl" >&6; }
+
+    if test "$wx_cv_lib_stl" != yes; then
+         { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5
+echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missing" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+
+        { echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5
+echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6; }
+if test "${wx_cv_func_stdstring_compare+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  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 foo, bar;
+            foo.compare(bar);
+            foo.compare(1, 1, bar);
+            foo.compare(1, 1, bar, 1, 1);
+            foo.compare("");
+            foo.compare(1, 1, "");
+            foo.compare(1, 1, "", 2);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+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_compile") 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_objext; then
+  wx_cv_func_stdstring_compare=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_func_stdstring_compare=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5
+echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; }
+
+    if test "$wx_cv_func_stdstring_compare" = yes; then
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_STRING_COMPARE 1
+_ACEOF
+
+    fi
+
+        { echo "$as_me:$LINENO: checking for hash_map" >&5
+echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_hash_map+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+
+#include <hash_map>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+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_compile") 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_objext; then
+  ac_cv_header_hash_map=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_header_hash_map=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
+echo "${ECHO_T}$ac_cv_header_hash_map" >&6; }
+if test $ac_cv_header_hash_map = yes; then
+  { echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5
+echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6; }
+if test "${wx_cv_class_stdhashmapset+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <hash_map>
+                #include <hash_set>
+int
+main ()
+{
+std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
+                 std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+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_compile") 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_objext; then
+  wx_cv_class_stdhashmapset=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       wx_cv_lib_stl=no
-
+       wx_cv_class_stdhashmapset=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5
-echo "${ECHO_T}$wx_cv_lib_stl" >&6; }
-
-    if test "$wx_cv_lib_stl" != yes; then
-         { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5
-echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missing" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-        { echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5
-echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6; }
-if test "${wx_cv_func_stdstring_compare+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  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 foo, bar;
-            foo.compare(bar);
-            foo.compare(1, 1, bar);
-            foo.compare(1, 1, bar, 1, 1);
-            foo.compare("");
-            foo.compare(1, 1, "");
-            foo.compare(1, 1, "", 2);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-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_compile") 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_objext; then
-  wx_cv_func_stdstring_compare=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_func_stdstring_compare=no
 
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
+echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5
-echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; }
 
-    if test "$wx_cv_func_stdstring_compare" = yes; then
+    if test "$wx_cv_class_stdhashmapset" = yes; then
         cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_STRING_COMPARE 1
+#define HAVE_HASH_MAP 1
+_ACEOF
+
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_HASH_MAP 1
 _ACEOF
 
     fi
 
-        { echo "$as_me:$LINENO: checking for hash_map" >&5
-echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; }
-if test "${ac_cv_header_hash_map+set}" = set; then
+    { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
+echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_ext_hash_map+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -27173,7 +27480,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 
 
-#include <hash_map>
+#include <ext/hash_map>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -27192,22 +27499,22 @@ 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_hash_map=yes
+  ac_cv_header_ext_hash_map=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_hash_map=no
+       ac_cv_header_ext_hash_map=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
-echo "${ECHO_T}$ac_cv_header_hash_map" >&6; }
-if test $ac_cv_header_hash_map = yes; then
-  { echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5
-echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6; }
-if test "${wx_cv_class_stdhashmapset+set}" = set; then
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
+echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
+if test $ac_cv_header_ext_hash_map = yes; then
+  { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
+echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
+if test "${wx_cv_class_gnuhashmapset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -27216,13 +27523,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <hash_map>
-                #include <hash_set>
+#include <ext/hash_map>
+                #include <ext/hash_set>
 int
 main ()
 {
-std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
-                 std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
+__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
+                 __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
   ;
   return 0;
 }
@@ -27244,99 +27551,60 @@ 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
-  wx_cv_class_stdhashmapset=yes
+  wx_cv_class_gnuhashmapset=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       wx_cv_class_stdhashmapset=no
+       wx_cv_class_gnuhashmapset=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
+echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
 fi
 
 
 
-    if test "$wx_cv_class_stdhashmapset" = yes; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_HASH_MAP 1
+    if test "$wx_cv_class_gnuhashmapset" = yes; then
+         cat >>confdefs.h <<\_ACEOF
+#define HAVE_EXT_HASH_MAP 1
 _ACEOF
 
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_HASH_MAP 1
+         cat >>confdefs.h <<\_ACEOF
+#define HAVE_GNU_CXX_HASH_MAP 1
 _ACEOF
 
     fi
+fi
 
-    { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
-echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
-if test "${ac_cv_header_ext_hash_map+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-
-#include <ext/hash_map>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-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_compile") 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_objext; then
-  ac_cv_header_ext_hash_map=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_ext_hash_map=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
-echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
-if test $ac_cv_header_ext_hash_map = yes; then
-  { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
-echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
-if test "${wx_cv_class_gnuhashmapset+set}" = set; then
+  if test -n "$GCC"; then
+    { echo "$as_me:$LINENO: checking for __sync_fetch_* builtins" >&5
+echo $ECHO_N "checking for __sync_fetch_* builtins... $ECHO_C" >&6; }
+    if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <ext/hash_map>
-                #include <ext/hash_set>
+
 int
 main ()
 {
-__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
-                 __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
+
+          int value=0;
+          __sync_fetch_and_add(&value, 1);
+          __sync_sub_and_fetch(&value, 1);
+
   ;
   return 0;
 }
@@ -27358,35 +27626,28 @@ 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
-  wx_cv_class_gnuhashmapset=yes
+  wx_cv_cc_gcc_atomic_builtins=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       wx_cv_class_gnuhashmapset=no
+       wx_cv_cc_gcc_atomic_builtins=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
-fi
-
-
 
-    if test "$wx_cv_class_gnuhashmapset" = yes; then
-         cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXT_HASH_MAP 1
-_ACEOF
-
-         cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNU_CXX_HASH_MAP 1
+    { echo "$as_me:$LINENO: result: $wx_cv_cc_gcc_atomic_builtins" >&5
+echo "${ECHO_T}$wx_cv_cc_gcc_atomic_builtins" >&6; }
+    if test $wx_cv_cc_gcc_atomic_builtins = yes; then
+      cat >>confdefs.h <<\_ACEOF
+#define HAVE_GCC_ATOMIC_BUILTINS 1
 _ACEOF
 
     fi
-fi
+  fi
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -28202,7 +28463,7 @@ echo "${ECHO_T}$ac_res" >&6; }
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
@@ -28284,7 +28545,7 @@ echo "${ECHO_T}$ac_res" >&6; }
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
@@ -28914,8 +29175,6 @@ echo "$as_me: WARNING: system png library not found or too old, will use built-i
             fi
         fi
     fi
-
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 
 
@@ -29734,6 +29993,10 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead"
         else
                         wxUSE_LIBTIFF=sys
         fi
+        if test "$wxUSE_LIBTIFF" = "builtin" ; then
+            subdirs="$subdirs src/tiff"
+
+        fi
     fi
 fi
 
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 
-        if test "$wxUSE_ODBC" = "sys" ; then
-        wxUSE_ODBC = "yes"
-    fi
-    if test "$wxUSE_ODBC" = "yes" ; then
-        LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF
-
-    fi
-
         RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
@@ -34051,12 +34303,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; }
 
@@ -34935,9 +35181,7 @@ fi
 
 
 if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then
-    if test "$TOOLKIT" = "DFB" ; then
-        wxUSE_UNICODE_UTF8=yes
-    elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "1" ; then
+    if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then
         wxUSE_UNICODE_UTF8=yes
     elif test "$USE_OS2" = "1" ; then
                                 wxUSE_UNICODE_UTF8=yes
 done
 
 
-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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                          #if HAVE_X11_XLIB_H
-                            #include <X11/Xlib.h>
-                          #endif
-
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-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_compile") 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_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-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
-
-
-
-IODBC_C_SRC=""
-
-
-if test "$TOOLKIT" != "MSW" ; then
-
-    if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
-
-        { echo "$as_me:$LINENO: checking for sql.h" >&5
-echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sql_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
@@ -35093,8 +35267,12 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+                          #if HAVE_X11_XLIB_H
+                            #include <X11/Xlib.h>
+                          #endif
 
-#include <sql.h>
+
+#include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -35113,258 +35291,31 @@ 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_sql_h=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_header_sql_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_sql_h" >&5
-echo "${ECHO_T}$ac_cv_header_sql_h" >&6; }
-if test $ac_cv_header_sql_h = yes; then
-  found_sql_h=1
-fi
-
-
-        if test "x$found_sql_h" = "x1" ; then
-            { echo "$as_me:$LINENO: checking for SQLAllocEnv in -liodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -liodbc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-liodbc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
-  ;
-  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_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_iodbc_SQLAllocEnv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_iodbc_SQLAllocEnv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocEnv" >&6; }
-if test $ac_cv_lib_iodbc_SQLAllocEnv = yes; then
-  ODBC_LINK=" -liodbc"
-else
-
-                { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lunixodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -lunixodbc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_unixodbc_SQLAllocEnv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lunixodbc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
-  ;
-  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_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_unixodbc_SQLAllocEnv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_unixodbc_SQLAllocEnv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_unixodbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_unixodbc_SQLAllocEnv" >&6; }
-if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then
-  ODBC_LINK=" -lunixodbc"
-else
-
-                    { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lodbc" >&5
-echo $ECHO_N "checking for SQLAllocEnv in -lodbc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_odbc_SQLAllocEnv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lodbc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char SQLAllocEnv ();
-int
-main ()
-{
-return SQLAllocEnv ();
-  ;
-  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_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_odbc_SQLAllocEnv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_odbc_SQLAllocEnv=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocEnv" >&6; }
-if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then
-  ODBC_LINK=" -lodbc"
-fi
-
-
-fi
-
-
-fi
-
-        fi
-        if test "x$ODBC_LINK" = "x" ; then
-            if test "$wxUSE_ODBC" = "sys" ; then
-                { { echo "$as_me:$LINENO: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&5
-echo "$as_me: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&2;}
-   { (exit 1); exit 1; }; }
-            else
-                { echo "$as_me:$LINENO: WARNING: system ODBC library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system ODBC library not found, will use built-in instead" >&2;}
-                wxUSE_ODBC=builtin
-            fi
-        else
-                        wxUSE_ODBC=sys
-        fi
-    fi
-
-    if test "$wxUSE_ODBC" = "builtin" ; then
-        cat >>confdefs.h <<\_ACEOF
-#define wxUSE_BUILTIN_IODBC 1
-_ACEOF
+done
 
     fi
 fi
 
-if test "$wxUSE_ODBC" != "no" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF
-
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_IODBC_"
-fi
 
 
 if test "$wxUSE_DISPLAY" = "yes"; then
 echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; }
 if test $ac_cv_header_GL_gl_h = yes; then
 
-            if test "${ac_cv_header_GL_glu_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for GL/glu.h" >&5
+            { echo "$as_me:$LINENO: checking for GL/glu.h" >&5
 echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_GL_glu_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5
-echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; }
 else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking GL/glu.h usability" >&5
-echo $ECHO_N "checking GL/glu.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+
+
 #include <GL/glu.h>
 _ACEOF
 rm -f conftest.$ac_objext
@@ -35726,98 +35671,18 @@ 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_header_compiler=yes
+  ac_cv_header_GL_glu_h=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_header_compiler=no
+       ac_cv_header_GL_glu_h=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking GL/glu.h presence" >&5
-echo $ECHO_N "checking GL/glu.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <GL/glu.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: GL/glu.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: GL/glu.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: GL/glu.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: GL/glu.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: GL/glu.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwidgets.org ##
-## ----------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for GL/glu.h" >&5
-echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_GL_glu_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_GL_glu_h=$ac_header_preproc
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5
 echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; }
-
-fi
 if test $ac_cv_header_GL_glu_h = yes; then
 
                 found_gl=0
@@ -36109,6 +35974,11 @@ cat >>conftest.$ac_ext <<_ACEOF
          error this gcc is too old;
          #endif
 
+         /* visibility only makes sense for ELF shared libs: */
+         #if !defined(__ELF__) && !defined(__APPLE__)
+         error this platform has no visibility;
+         #endif
+
          extern __attribute__((__visibility__("hidden"))) int hiddenvar;
          extern __attribute__((__visibility__("default"))) int exportedvar;
          extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
 
     { echo "$as_me:$LINENO: result: $wx_cv_cc_visibility" >&5
 echo "${ECHO_T}$wx_cv_cc_visibility" >&6; }
+    if test $wx_cv_cc_visibility = yes; then
+                              { 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"
+        wx_save_LDFLAGS="$LDFLAGS"
+        CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+        LDFLAGS="$LDFLAGS -shared -fPIC"
+        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 s("hello");
+            return s.length();
+
+  ;
+  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"
+        LDFLAGS="$wx_save_LDFLAGS"
+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
+        { echo "$as_me:$LINENO: checking whether we can work around it" >&5
+echo $ECHO_N "checking whether we can work around it... $ECHO_C" >&6; }
+        if test "${wx_cv_cc_visibility_workaround+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+          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.  */
+
+              #pragma GCC visibility push(default)
+              #include <string>
+              #pragma GCC visibility pop
+
+int
+main ()
+{
+
+              std::string s("hello");
+              return s.length();
+
+  ;
+  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_visibility_workaround=no
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_cc_visibility_workaround=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
+
+
+fi
+
+        { echo "$as_me:$LINENO: result: $wx_cv_cc_visibility_workaround" >&5
+echo "${ECHO_T}$wx_cv_cc_visibility_workaround" >&6; }
+
+        if test $wx_cv_cc_visibility_workaround = no; then
+                    wx_cv_cc_visibility=no
+        fi
+      fi
+    fi
+
     if test $wx_cv_cc_visibility = yes; then
       cat >>confdefs.h <<\_ACEOF
 #define HAVE_VISIBILITY 1
 _ACEOF
 
+      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=""
@@ -36321,7 +36356,6 @@ EOF
       ;;
 
       *-*-cygwin* | *-*-mingw32* )
-                        WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
         ;;
 
       *-*-hpux* )
@@ -36332,6 +36366,8 @@ EOF
     esac
     fi
 
+            WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
+
     if test $wxUSE_RPATH = "no"; then
         SAMPLES_RPATH_FLAG=''
         SAMPLES_RPATH_POSTLINK=''
@@ -36516,157 +36552,9 @@ 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
 
-fi
-
-if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
-            WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
-    WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
-
-        LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
-
-    # Extract the first word of "Rez", so it can be a program name with args.
-set dummy Rez; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_REZ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$REZ"; then
-  ac_cv_prog_REZ="$REZ" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_REZ="Rez"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
-fi
-fi
-REZ=$ac_cv_prog_REZ
-if test -n "$REZ"; then
-  { echo "$as_me:$LINENO: result: $REZ" >&5
-echo "${ECHO_T}$REZ" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
 fi
 
 
-    # Extract the first word of "DeRez", so it can be a program name with args.
-set dummy DeRez; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_DEREZ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$DEREZ"; then
-  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DEREZ="DeRez"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
-fi
-fi
-DEREZ=$ac_cv_prog_DEREZ
-if test -n "$DEREZ"; then
-  { echo "$as_me:$LINENO: result: $DEREZ" >&5
-echo "${ECHO_T}$DEREZ" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    # Extract the first word of "SetFile", so it can be a program name with args.
-set dummy SetFile; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_SETFILE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$SETFILE"; then
-  ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_SETFILE="SetFile"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
-fi
-fi
-SETFILE=$ac_cv_prog_SETFILE
-if test -n "$SETFILE"; then
-  { echo "$as_me:$LINENO: result: $SETFILE" >&5
-echo "${ECHO_T}$SETFILE" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
-    MACSETFILE="\$(SETFILE)"
-
-            if test "$wxUSE_MAC" = 1; then
-        POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
-        RESCOMP="$REZ"
-        WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
-    else
-        POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
-        RESCOMP="echo -n \| $REZ"
-        WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
-    fi
-
-else
-        MACSETFILE="@true"
-
-    if test "$wxUSE_PM" = 1; then
-        RESCOMP="emxbind"
-        WXCONFIG_RESFLAGS="-ep"
-
-                POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
-    else
-        POSTLINK_COMMAND="@true"
-    fi
-
-fi
-
-
-
 { echo "$as_me:$LINENO: checking for mode_t" >&5
 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_mode_t+set}" = set; then
@@ -38039,88 +37927,12 @@ 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
-  wx_cv_func_broken_vsnprintf_decl=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_func_broken_vsnprintf_decl=yes
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_vsnprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_vsnprintf_decl" >&6; }
-
-        if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_VSNPRINTF_DECL 1
-_ACEOF
-
-        fi
-    fi
-fi
-
-if test "$ac_cv_func_snprintf" = "yes"; then
-    { echo "$as_me:$LINENO: checking for snprintf declaration" >&5
-echo $ECHO_N "checking for snprintf declaration... $ECHO_C" >&6; }
-if test "${wx_cv_func_snprintf_decl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-            cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                    #include <stdio.h>
-                    #include <stdarg.h>
-                    #ifdef __MSL__
-                    #if __MSL__ >= 0x6000
-                    namespace std {}
-                    using namespace std;
-                    #endif
-                    #endif
-
-int
-main ()
-{
-
-                    char *buf;
-                    snprintf(buf, 10u, "%s", "wx");
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-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_compile") 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_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  wx_cv_func_snprintf_decl=yes
+  wx_cv_func_broken_vsnprintf_decl=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       wx_cv_func_snprintf_decl=no
+       wx_cv_func_broken_vsnprintf_decl=yes
 
 fi
 
@@ -38128,44 +37940,47 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_vsnprintf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_broken_vsnprintf_decl" >&6; }
 
-    if test "$wx_cv_func_snprintf_decl" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_SNPRINTF_DECL 1
+        if test "$wx_cv_func_broken_vsnprintf_decl" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define HAVE_BROKEN_VSNPRINTF_DECL 1
 _ACEOF
 
+        fi
+    fi
+fi
 
-                        { echo "$as_me:$LINENO: checking if snprintf declaration is broken" >&5
-echo $ECHO_N "checking if snprintf declaration is broken... $ECHO_C" >&6; }
-if test "${wx_cv_func_broken_snprintf_decl+set}" = set; then
+if test "$ac_cv_func_snprintf" = "yes"; then
+    { echo "$as_me:$LINENO: checking for snprintf declaration" >&5
+echo $ECHO_N "checking for snprintf declaration... $ECHO_C" >&6; }
+if test "${wx_cv_func_snprintf_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-                cat >conftest.$ac_ext <<_ACEOF
+            cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                        #include <stdio.h>
-                        #include <stdarg.h>
-                        #ifdef __MSL__
-                        #if __MSL__ >= 0x6000
-                        namespace std {}
-                        using namespace std;
-                        #endif
-                        #endif
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                    #ifdef __MSL__
+                    #if __MSL__ >= 0x6000
+                    namespace std {}
+                    using namespace std;
+                    #endif
+                    #endif
 
 int
 main ()
 {
 
-                        char *buf;
-                        const char *fmt = "%s";
-                        snprintf(buf, 10u, fmt, "wx");
+                    char *buf;
+                    snprintf(buf, 10u, "%s", "wx");
 
   ;
   return 0;
@@ -38188,12 +38003,12 @@ 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
-  wx_cv_func_broken_snprintf_decl=no
+  wx_cv_func_snprintf_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       wx_cv_func_broken_snprintf_decl=yes
+       wx_cv_func_snprintf_decl=no
 
 fi
 
@@ -38201,15 +38016,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_snprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_snprintf_decl" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; }
 
-        if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_SNPRINTF_DECL 1
+    if test "$wx_cv_func_snprintf_decl" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE_SNPRINTF_DECL 1
 _ACEOF
 
-        fi
     fi
 
     if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
 
 if test "$wxUSE_UNICODE" = yes; then
 
-
-for ac_func in swprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  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_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-    if test "$ac_cv_func_swprintf" = "yes"; then
-        { echo "$as_me:$LINENO: checking if swprintf declaration is broken" >&5
-echo $ECHO_N "checking if swprintf declaration is broken... $ECHO_C" >&6; }
-if test "${wx_cv_func_broken_swprintf_decl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                        #include <stdio.h>
-                        #include <stdarg.h>
-                        #include <wchar.h>
-
-int
-main ()
-{
-
-                        wchar_t *buf;
-                        const wchar_t *fmt = L"test";
-                        swprintf(buf, 10u, fmt);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-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_compile") 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_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  wx_cv_func_broken_swprintf_decl=no
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_func_broken_swprintf_decl=yes
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_swprintf_decl" >&5
-echo "${ECHO_T}$wx_cv_func_broken_swprintf_decl" >&6; }
-
-        if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_SWPRINTF_DECL 1
-_ACEOF
-
-        fi
-    fi
-
             wchar_headers="#include <stdio.h>
 #include <wchar.h>"
     case "${host}" in
@@ -38534,7 +38182,7 @@ done
     esac
 
 
-  for wx_func in wputc wputchar putws fputws wprintf vswprintf
+  for wx_func in putws fputws wprintf vswprintf
   do
     { echo "$as_me:$LINENO: checking for $wx_func" >&5
 echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
@@ -38604,7 +38252,7 @@ echo "${ECHO_T}$ac_res" >&6; }
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
 fi
 
-if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
-
-  for wx_func in fnmatch
-  do
-    { echo "$as_me:$LINENO: checking for $wx_func" >&5
-echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
-if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        cat >conftest.$ac_ext <<_ACEOF
-
-            /* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                #include <fnmatch.h>
-                $ac_includes_default
-
-int
-main ()
-{
-
-                #ifndef $wx_func
-                  &$wx_func;
-                #endif
-
-
-  ;
-  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_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval wx_cv_func_$wx_func=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       eval wx_cv_func_$wx_func=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-
-fi
-ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-    if eval test \$wx_cv_func_$wx_func = yes
-    then
-      cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
-_ACEOF
-
-
-    else
-      :
-
-    fi
-  done
-
-fi
-
 if test "$wxUSE_FILE" = "yes"; then
 
   for wx_func in fsync
@@ -38822,7 +38386,7 @@ echo "${ECHO_T}$ac_res" >&6; }
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
@@ -38911,7 +38475,7 @@ echo "${ECHO_T}$ac_res" >&6; }
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
@@ -40052,7 +39616,8 @@ echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;}
 fi
 
 
-for ac_func in timegm
+
+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
@@ -40141,14 +39706,13 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
-
+ break
 fi
 done
 
+if test "$ac_cv_func_setenv" = "yes"; then
 
-
-
-for ac_func in setenv putenv
+for ac_func in unsetenv
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -40237,10 +39801,11 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
- break
+
 fi
 done
 
+fi
 
 HAVE_SOME_SLEEP_FUNC=0
 if test "$USE_BEOS" = 1; then
@@ -40499,7 +40064,7 @@ echo "${ECHO_T}$ac_res" >&6; }
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
@@ -40593,7 +40158,7 @@ echo "${ECHO_T}$ac_res" >&6; }
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
@@ -40675,7 +40240,7 @@ echo "${ECHO_T}$ac_res" >&6; }
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
@@ -40758,7 +40323,7 @@ echo "${ECHO_T}$ac_res" >&6; }
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
@@ -41326,7 +40891,7 @@ echo "${ECHO_T}$ac_res" >&6; }
     if eval test \$wx_cv_func_$wx_func = yes
     then
       cat >>confdefs.h <<_ACEOF
-#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
 _ACEOF
 
 
@@ -41337,6 +40902,268 @@ _ACEOF
   done
 
 
+if test "$wxUSE_TARSTREAM" = "yes"; then
+
+  for wx_func in sysconf
+  do
+    { echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
+if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+        cat >conftest.$ac_ext <<_ACEOF
+
+            /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+                $ac_includes_default
+
+int
+main ()
+{
+
+                #ifndef $wx_func
+                  &$wx_func;
+                #endif
+
+
+  ;
+  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_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval wx_cv_func_$wx_func=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       eval wx_cv_func_$wx_func=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
+fi
+ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+    if eval test \$wx_cv_func_$wx_func = yes
+    then
+      cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
+_ACEOF
+
+
+    else
+      :
+
+    fi
+  done
+
+
+
+  for wx_func in getpwuid_r
+  do
+    { echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
+if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+        cat >conftest.$ac_ext <<_ACEOF
+
+            /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+                    #define _REENTRANT
+                    #include <pwd.h>
+
+                $ac_includes_default
+
+int
+main ()
+{
+
+                #ifndef $wx_func
+                  &$wx_func;
+                #endif
+
+                    struct passwd pw, *ppw;
+                    char buf[1024];
+                    getpwuid_r(0, &pw, buf, sizeof(buf), &ppw)
+
+
+  ;
+  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_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval wx_cv_func_$wx_func=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       eval wx_cv_func_$wx_func=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
+fi
+ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+    if eval test \$wx_cv_func_$wx_func = yes
+    then
+      cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
+_ACEOF
+
+
+    else
+      :
+
+    fi
+  done
+
+
+
+  for wx_func in getgrgid_r
+  do
+    { echo "$as_me:$LINENO: checking for $wx_func" >&5
+echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
+if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+        cat >conftest.$ac_ext <<_ACEOF
+
+            /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+                    #define _REENTRANT
+                    #include <grp.h>
+
+                $ac_includes_default
+
+int
+main ()
+{
+
+                #ifndef $wx_func
+                  &$wx_func;
+                #endif
+
+                    struct group grp, *pgrp;
+                    char buf[1024];
+                    getgrgid_r(0, &grp, buf, sizeof(buf), &pgrp)
+
+
+  ;
+  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_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval wx_cv_func_$wx_func=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       eval wx_cv_func_$wx_func=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
+fi
+ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+    if eval test \$wx_cv_func_$wx_func = yes
+    then
+      cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1
+_ACEOF
+
+
+    else
+      :
+
+    fi
+  done
+
+fi
+
 fi
 
 
@@ -43057,94 +42884,6 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for readdir_r" >&5
-echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6; }
-if test "${ac_cv_func_readdir_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define readdir_r to an innocuous variant, in case <limits.h> declares readdir_r.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define readdir_r innocuous_readdir_r
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char readdir_r (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef readdir_r
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char readdir_r ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_readdir_r || defined __stub___readdir_r
-choke me
-#endif
-
-int
-main ()
-{
-return readdir_r ();
-  ;
-  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_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_readdir_r=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_func_readdir_r=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5
-echo "${ECHO_T}$ac_cv_func_readdir_r" >&6; }
-if test $ac_cv_func_readdir_r = yes; then
-   cat >>confdefs.h <<\_ACEOF
-#define HAVE_READDIR_R 1
-_ACEOF
-
-fi
-
 
 
 
@@ -45218,6 +44957,97 @@ echo "${ECHO_T}no" >&6; }
 fi
 
     if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
+
+        if test "$wxUSE_GTKPRINT" = "yes" ; then
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GTKPRINT" >&5
+echo $ECHO_N "checking for GTKPRINT... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GTKPRINT_CFLAGS"; then
+        pkg_cv_GTKPRINT_CFLAGS="$GTKPRINT_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GTKPRINT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GTKPRINT_LIBS"; then
+        pkg_cv_GTKPRINT_LIBS="$GTKPRINT_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GTKPRINT_LIBS=`$PKG_CONFIG --libs "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"`
+        else
+               GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$GTKPRINT_PKG_ERRORS" >&5
+
+
+                        { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5
+echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;}
+                        wxUSE_GTKPRINT="no"
+
+
+elif test $pkg_failed = untried; then
+
+                        { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5
+echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;}
+                        wxUSE_GTKPRINT="no"
+
+
+else
+       GTKPRINT_CFLAGS=$pkg_cv_GTKPRINT_CFLAGS
+       GTKPRINT_LIBS=$pkg_cv_GTKPRINT_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+                        CFLAGS="$GTKPRINT_CFLAGS $CFLAGS"
+                        CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS"
+                        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_GTKPRINT 1
+_ACEOF
+
+
+fi
+        fi
+
         if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
 
 
@@ -45817,26 +45647,19 @@ _ACEOF
 for ac_header in sys/epoll.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+{ 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
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
 else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
@@ -45856,99 +45679,19 @@ 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_header_compiler=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_header_compiler=no
+       eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-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_cpp conftest.$ac_ext") 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); } >/dev/null && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwidgets.org ##
-## ----------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ 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
-  eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval echo '${'$as_ac_Header'}'`
               { echo "$as_me:$LINENO: result: $ac_res" >&5
 echo "${ECHO_T}$ac_res" >&6; }
-
-fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 
 
 
+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
@@ -47647,13 +47397,6 @@ _ACEOF
     fi
 fi
 
-if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
-  cat >>confdefs.h <<\_ACEOF
-#define wxUSE_EXPERIMENTAL_PRINTF 1
-_ACEOF
-
-fi
-
 
 if test "$wxUSE_CONSTRAINTS" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
@@ -47744,11 +47487,6 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define wxUSE_NORMALIZED_PS_FONTS 1
-_ACEOF
-
-
 if test "$wxUSE_SVG" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_SVG 1
@@ -48117,7 +47855,6 @@ if test "$wxUSE_CHECKLST" = "yes"; then
 _ACEOF
 
   USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
 if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then
@@ -48144,6 +47881,14 @@ _ACEOF
   USES_CONTROLS=1
 fi
 
+if test "$wxUSE_FILECTRL" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FILECTRL 1
+_ACEOF
+
+  USES_CONTROLS=1
+fi
+
 if test "$wxUSE_FILEPICKERCTRL" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_FILEPICKERCTRL 1
@@ -48170,7 +47915,7 @@ echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >
 #define wxUSE_DISPLAY 1
 _ACEOF
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
     fi
 fi
 
@@ -48244,7 +47989,6 @@ if test "$wxUSE_LISTBOX" = "yes"; then
 _ACEOF
 
     USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox"
 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then
@@ -48288,7 +48032,6 @@ _ACEOF
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo"
 fi
 
-
 if test "$wxUSE_RADIOBOX" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_RADIOBOX 1
@@ -48743,7 +48486,6 @@ if test "$wxUSE_MINIFRAME" = "yes"; then
 #define wxUSE_MINIFRAME 1
 _ACEOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 
 if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
 
 if test "$wxUSE_MSW" = 1 ; then
 
-if test "$wxUSE_DC_CACHEING" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_DC_CACHEING" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_DC_CACHEING 1
 _ACEOF
 
-fi
+    fi
 
-if test "$wxUSE_UXTHEME" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
+    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_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 "$USE_WIN32" = 1 ; then
+    if test "$wxUSE_INICONF" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_INICONF 1
+_ACEOF
+
+    fi
+
+    if test "$wxUSE_REGKEY" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_REGKEY 1
+_ACEOF
+
+    fi
 fi
 
 
@@ -49313,15 +49093,12 @@ _ACEOF
 STD_BASE_LIBS="base"
 STD_GUI_LIBS=""
 BUILT_WX_LIBS="base"
-ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base"
+ALL_WX_LIBS="xrc stc gl media qa html adv core xml net base"
 
 if test "$wxUSE_SOCKETS" = "yes" ; then
     STD_BASE_LIBS="net $STD_BASE_LIBS"
     BUILT_WX_LIBS="net $BUILT_WX_LIBS"
 fi
-if test "$wxUSE_ODBC" != "no" ; then
-    BUILT_WX_LIBS="odbc $BUILT_WX_LIBS"
-fi
 if test "$wxUSE_XML" = "yes" ; then
     STD_BASE_LIBS="xml $STD_BASE_LIBS"
     BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
@@ -49335,9 +49112,6 @@ if test "$wxUSE_GUI" = "yes"; then
         STD_GUI_LIBS="qa $STD_GUI_LIBS"
         BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
     fi
-    if test "$wxUSE_ODBC" != "no" ; then
-        BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS"
-    fi
     if test "$wxUSE_HTML" = "yes" ; then
         STD_GUI_LIBS="html $STD_GUI_LIBS"
         BUILT_WX_LIBS="html $BUILT_WX_LIBS"
@@ -49397,9 +49171,9 @@ if test "$wxUSE_GUI" = "yes"; then
 
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
-                     dynamic erase event exec font image minimal mobile \
-                     mobile/wxedit mobile/styles propsize render \
-                     rotate shaped svg taborder vscroll widgets"
+                     erase event exec font image minimal mobile \
+                     mobile/wxedit mobile/styles render \
+                     shaped svg taborder vscroll widgets"
 
     if test "$wxUSE_MONOLITHIC" != "yes"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
@@ -49458,7 +49232,6 @@ LIBS=`echo $LIBS`
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
-EXTRALIBS_ODBC="$ODBC_LINK"
 EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 if test "$wxUSE_GUI" = "yes"; then
     EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
@@ -49477,9 +49250,6 @@ fi
 if test "$wxUSE_EXPAT" = "builtin" ; then
     wxconfig_3rdparty="expat $wxconfig_3rdparty"
 fi
-if test "$wxUSE_ODBC" = "builtin" ; then
-    wxconfig_3rdparty="odbc $wxconfig_3rdparty"
-fi
 if test "$wxUSE_LIBTIFF" = "builtin" ; then
     wxconfig_3rdparty="tiff $wxconfig_3rdparty"
 fi
@@ -49528,7 +49298,6 @@ fi
 
 
 
-
 if test $wxUSE_MONOLITHIC = "yes" ; then
     MONOLITHIC=1
 else
@@ -49541,12 +49310,6 @@ else
     USE_PLUGINS=0
 fi
 
-if test $wxUSE_ODBC != "no" ; then
-    USE_ODBC=1
-else
-    USE_ODBC=0
-fi
-
 if test "$wxUSE_DEBUGREPORT" = "yes" ; then
     USE_QA=1
 else
@@ -49598,6 +49361,9 @@ case "$TOOLKIT" in
         TOOLKIT_DESC="GTK+"
         if test "$WXGTK20" = 1; then
             TOOLKIT_DESC="$TOOLKIT_DESC 2"
+            if test "$wxUSE_GTKPRINT" = "yes" ; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";
+            fi
             if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
                 TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint";
             fi
@@ -49627,23 +49393,6 @@ if test "$wxUSE_WINE" = "yes"; then
     BAKEFILE_FORCE_PLATFORM=win32
 fi
 
-if test "$wxUSE_MAC" = 1 ; then
-    if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
-                        if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
-            OSX_UNIV_OPTS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-        else
-                                    OSX_UNIV_OPTS=${wxUSE_UNIVERSAL_BINARY:+"-isysroot '$wxUSE_UNIVERSAL_BINARY'"}
-        fi
-        OSX_UNIV_OPTS="$OSX_UNIV_OPTS -arch ppc -arch i386"
-        CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
-        CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
-        LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
-        bk_use_pch=no
-    fi
-    # TODO: where do we add "-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" for libtool (static builds only)?
-    #       The makefile currently uses AR and RANLIB, which libtool apparently supercedes.
-fi
-
 if test "$wxUSE_UNICODE" = yes -a "$GCC" = yes -a "$bk_use_pch" != no
 then
     { echo "$as_me:$LINENO: checking for gcc precompiled header bug" >&5
@@ -52748,6 +52497,100 @@ echo "$as_me: error: Versions of Bakefile used to generate makefiles ($BAKEFILE_
     fi
 
 
+case ${INSTALL} in
+  /* ) # Absolute
+     ;;
+  ?:* ) # Drive letter, considered as absolute.
+     ;;
+  *)
+     INSTALL=`pwd`/${INSTALL} ;;
+esac
+
+if test "$wxUSE_GUI" = "yes"; then
+
+if test "$wxUSE_MSW" = 1 ; then
+    if test "x$WINDRES" = "x"; then
+        { { echo "$as_me:$LINENO: error: Required windres program not found" >&5
+echo "$as_me: error: Required windres program not found" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+
+    RESCOMP="$WINDRES"
+fi
+
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
+            WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
+    WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
+
+        LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+
+    # Extract the first word of "DeRez", so it can be a program name with args.
+set dummy DeRez; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DEREZ+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DEREZ"; then
+  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DEREZ="DeRez"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
+fi
+fi
+DEREZ=$ac_cv_prog_DEREZ
+if test -n "$DEREZ"; then
+  { echo "$as_me:$LINENO: result: $DEREZ" >&5
+echo "${ECHO_T}$DEREZ" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+    MACSETFILE="\$(SETFILE)"
+
+            if test "$wxUSE_MAC" = 1; then
+        POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
+        RESCOMP="$REZ"
+        WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
+    else
+        POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
+        RESCOMP="cat /dev/null \| $REZ"
+        WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
+    fi
+
+else
+        MACSETFILE="@true"
+
+    if test "$wxUSE_PM" = 1; then
+        RESCOMP="emxbind"
+        WXCONFIG_RESFLAGS="-ep"
+
+                POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
+    else
+        POSTLINK_COMMAND="@true"
+    fi
+fi
+
+fi
+
+
 if test $GCC_PCH = 1
 then
     if test "$wx_cv_gcc_pch_bug" = yes; then
@@ -52772,10 +52615,6 @@ if test "$wxUSE_MAC" = 1 ; then
 fi
 
 if test "$wxUSE_SHARED" = "yes"; then
-
-                            sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'`
-    EXE_LINKER=`eval echo "$sanitised_bakefile_mess"`
-
                 case "${host}" in
       *-pc-os2_emx | *-pc-os2-emx )
         SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
@@ -52784,10 +52623,6 @@ if test "$wxUSE_SHARED" = "yes"; then
         cp -p ${srcdir}/src/os2/dllar.sh .
       ;;
     esac
-else
-
-        EXE_LINKER="$CXX -o"
-
 fi
 if test "$wxUSE_OMF" = "yes"; then
     case "${host}" in
@@ -52882,7 +52717,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 
-
 
 
 { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
@@ -53824,16 +53658,7 @@ EGREP!$EGREP$ac_delim
 CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
 ac_ct_CXX!$ac_ct_CXX$ac_delim
-RANLIB!$RANLIB$ac_delim
 AR!$AR$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-STRIP!$STRIP$ac_delim
-WINDRES!$WINDRES$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim
-LN_S!$LN_S$ac_delim
 subdirs!$subdirs$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 GTK_CFLAGS!$GTK_CFLAGS$ac_delim
@@ -53854,10 +53679,19 @@ PANGOXFT_CFLAGS!$PANGOXFT_CFLAGS$ac_delim
 PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim
 CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim
 CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim
-REZ!$REZ$ac_delim
-DEREZ!$DEREZ$ac_delim
-SETFILE!$SETFILE$ac_delim
 LIBICONV!$LIBICONV$ac_delim
+SDL_CONFIG!$SDL_CONFIG$ac_delim
+SDL_CFLAGS!$SDL_CFLAGS$ac_delim
+SDL_LIBS!$SDL_LIBS$ac_delim
+GTKPRINT_CFLAGS!$GTKPRINT_CFLAGS$ac_delim
+GTKPRINT_LIBS!$GTKPRINT_LIBS$ac_delim
+LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim
+LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim
+GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
+GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
+HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
+HILDON_LIBS!$HILDON_LIBS$ac_delim
+CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -53899,16 +53733,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-SDL_CONFIG!$SDL_CONFIG$ac_delim
-SDL_CFLAGS!$SDL_CFLAGS$ac_delim
-SDL_LIBS!$SDL_LIBS$ac_delim
-LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim
-LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim
-GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
-GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
-HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
-HILDON_LIBS!$HILDON_LIBS$ac_delim
-CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
 CAIRO_LIBS!$CAIRO_LIBS$ac_delim
 GST_CFLAGS!$GST_CFLAGS$ac_delim
 GST_LIBS!$GST_LIBS$ac_delim
@@ -53919,7 +53743,6 @@ STD_GUI_LIBS!$STD_GUI_LIBS$ac_delim
 wxUSE_ZLIB!$wxUSE_ZLIB$ac_delim
 wxUSE_REGEX!$wxUSE_REGEX$ac_delim
 wxUSE_EXPAT!$wxUSE_EXPAT$ac_delim
-wxUSE_ODBC!$wxUSE_ODBC$ac_delim
 wxUSE_LIBJPEG!$wxUSE_LIBJPEG$ac_delim
 wxUSE_LIBPNG!$wxUSE_LIBPNG$ac_delim
 wxUSE_LIBTIFF!$wxUSE_LIBTIFF$ac_delim
@@ -53934,11 +53757,11 @@ CXXWARNINGS!$CXXWARNINGS$ac_delim
 EXTRALIBS!$EXTRALIBS$ac_delim
 EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim
 EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim
-EXTRALIBS_ODBC!$EXTRALIBS_ODBC$ac_delim
 EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim
 EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim
 EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim
 WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim
+EXTRALIBS_GTKPRINT!$EXTRALIBS_GTKPRINT$ac_delim
 EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
 EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim
 EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim
@@ -53953,12 +53776,19 @@ SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$ac_delim
 HOST_SUFFIX!$HOST_SUFFIX$ac_delim
 CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
 CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim
+RANLIB!$RANLIB$ac_delim
+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+INSTALL_DATA!$INSTALL_DATA$ac_delim
+LN_S!$LN_S$ac_delim
 SET_MAKE!$SET_MAKE$ac_delim
 MAKE_SET!$MAKE_SET$ac_delim
 AROPTIONS!$AROPTIONS$ac_delim
+STRIP!$STRIP$ac_delim
 NM!$NM$ac_delim
 INSTALL_DIR!$INSTALL_DIR$ac_delim
 LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim
+IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim
 PLATFORM_UNIX!$PLATFORM_UNIX$ac_delim
 PLATFORM_WIN32!$PLATFORM_WIN32$ac_delim
 PLATFORM_MSDOS!$PLATFORM_MSDOS$ac_delim
@@ -53991,11 +53821,15 @@ USE_SOSYMLINKS!$USE_SOSYMLINKS$ac_delim
 SONAME_FLAG!$SONAME_FLAG$ac_delim
 DEPS_TRACKING!$DEPS_TRACKING$ac_delim
 BK_DEPS!$BK_DEPS$ac_delim
+WINDRES!$WINDRES$ac_delim
+REZ!$REZ$ac_delim
+SETFILE!$SETFILE$ac_delim
 GCC_PCH!$GCC_PCH$ac_delim
 ICC_PCH!$ICC_PCH$ac_delim
 BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
 COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
 COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
+COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54037,7 +53871,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
 COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
 COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
 COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
@@ -54134,6 +53967,7 @@ COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_de
 COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim
 COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
 COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54175,7 +54009,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
 COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
 COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
@@ -54245,6 +54078,7 @@ COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim
 COND_WXUSE_ODBC_BUILTIN!$COND_WXUSE_ODBC_BUILTIN$ac_delim
 COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim
 COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim
+DEREZ!$DEREZ$ac_delim
 SHARED!$SHARED$ac_delim
 WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
 WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
@@ -54269,9 +54103,9 @@ WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim
 WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
 WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
 WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
-EXE_LINKER!$EXE_LINKER$ac_delim
 GUIDIST!$GUIDIST$ac_delim
 DISTDIR!$DISTDIR$ac_delim
+SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54313,7 +54147,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
 LDFLAGS_GL!$LDFLAGS_GL$ac_delim
 OPENGL_LIBS!$OPENGL_LIBS$ac_delim
 DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
@@ -54327,6 +54160,7 @@ LIBWXMACRES!$LIBWXMACRES$ac_delim
 POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
 MACSETFILE!$MACSETFILE$ac_delim
 GCC!$GCC$ac_delim
+DLLTOOL!$DLLTOOL$ac_delim
 CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
@@ -54965,7 +54799,7 @@ echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITH
 
 echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
-echo -n "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}"
+echo $ECHO_N "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}$ECHO_C"
 if test "$wxUSE_UNICODE" = "yes"; then
     if test "$wxUSE_UNICODE_UTF8" = "yes"; then
         echo " (using UTF-8)"
@@ -54981,6 +54815,7 @@ echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIB
 echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
 
 echo "  Which libraries should wxWidgets use?"
+echo "                                       STL                ${wxUSE_STL}"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
 echo "                                       png                ${wxUSE_LIBPNG-none}"
 echo "                                       regex              ${wxUSE_REGEX}"
@@ -54989,7 +54824,6 @@ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
 echo "                                       xpm                ${wxUSE_LIBXPM-none}"
 fi
 echo "                                       zlib               ${wxUSE_ZLIB}"
-echo "                                       odbc               ${wxUSE_ODBC}"
 echo "                                       expat              ${wxUSE_EXPAT}"
 echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
 echo "                                       sdl                ${wxUSE_LIBSDL}"