]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
reverted unrelated changes accidentally committed as part of r49411
[wxWidgets.git] / configure
index cf6e413b3e472f52ca02474c95384cf205822a39..d74a1b7d371718193f89bde72c882ead0a39a05e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 47765 2007-07-28 00:08:01Z VZ .
+# From configure.in Id: configure.in 49376 2007-10-23 22:19:34Z VZ .
 # 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
@@ -830,9 +829,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
-COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1
 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
 COND_MONOLITHIC_0_SHARED_0_USE_STC_1
 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
@@ -841,19 +838,15 @@ COND_MONOLITHIC_0_SHARED_1_USE_AUI_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
-COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1
 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
 COND_MONOLITHIC_0_SHARED_1_USE_STC_1
 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
 COND_MONOLITHIC_0_USE_AUI_1
 COND_MONOLITHIC_0_USE_GUI_1
 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1
-COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1
 COND_MONOLITHIC_0_USE_HTML_1
 COND_MONOLITHIC_0_USE_MEDIA_1
-COND_MONOLITHIC_0_USE_ODBC_1
 COND_MONOLITHIC_0_USE_QA_1
 COND_MONOLITHIC_0_USE_RICHTEXT_1
 COND_MONOLITHIC_0_USE_STC_1
@@ -876,8 +869,6 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11
 COND_PLATFORM_MACOSX_1_USE_GUI_1
 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
 COND_PLATFORM_MACOS_1
-COND_PLATFORM_MAC_1
-COND_PLATFORM_MSDOS_0
 COND_PLATFORM_MSDOS_1
 COND_PLATFORM_OS2_1
 COND_PLATFORM_UNIX_0
@@ -889,22 +880,16 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0
 COND_PLATFORM_WIN32_0
 COND_PLATFORM_WIN32_1
 COND_SHARED_0
-COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
-COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
-COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
 COND_SHARED_0_USE_STC_1
-COND_SHARED_0_USE_XRC_1
 COND_SHARED_0_WXUSE_EXPAT_BUILTIN
-COND_SHARED_0_WXUSE_ODBC_BUILTIN
 COND_SHARED_0_WXUSE_REGEX_BUILTIN
 COND_SHARED_0_WXUSE_ZLIB_BUILTIN
 COND_SHARED_1
 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
-COND_SHARED_1_USE_XRC_1
 COND_TOOLKIT_
 COND_TOOLKIT_COCOA
 COND_TOOLKIT_COCOA_USE_GUI_1
@@ -951,8 +936,6 @@ COND_USE_GUI_1_WXUNIV_1
 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
 COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
 COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
-COND_USE_ODBC_1
-COND_USE_OPENGL_1
 COND_USE_PCH_1
 COND_USE_PLUGINS_0
 COND_USE_RTTI_0
@@ -974,9 +957,9 @@ COND_WXUSE_EXPAT_BUILTIN
 COND_WXUSE_LIBJPEG_BUILTIN
 COND_WXUSE_LIBPNG_BUILTIN
 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 +984,6 @@ WXCONFIG_LIBS
 WXCONFIG_RPATH
 WXCONFIG_LDFLAGS_GUI
 WXCONFIG_RESFLAGS
-EXE_LINKER
 GUIDIST
 DISTDIR
 SAMPLES_SUBDIRS
@@ -1018,6 +1000,7 @@ LIBWXMACRES
 POSTLINK_COMMAND
 MACSETFILE
 GCC
+DLLTOOL
 CPPUNIT_CONFIG
 LIBOBJS
 LTLIBOBJS'
@@ -1044,6 +1027,8 @@ PANGOFT2_CFLAGS
 PANGOFT2_LIBS
 PANGOXFT_CFLAGS
 PANGOXFT_LIBS
+GTKPRINT_CFLAGS
+GTKPRINT_LIBS
 LIBGNOMEPRINTUI_CFLAGS
 LIBGNOMEPRINTUI_LIBS
 GNOMEVFS_CFLAGS
@@ -1054,7 +1039,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 +1652,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  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 +1669,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 +1716,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 +1763,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,10 +1836,8 @@ 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-iniconf        use wxIniConfig (Win32 only)
   --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)
   --enable-ownerdrawn     use owner drawn controls (Win32 only)
-  --enable-regkey         use wxRegKey class (Win32 only)
   --enable-uxtheme        enable support for Windows XP themed look (Win32 only)
   --enable-wxdib          use wxDIB class (Win32 only)
   --disable-largefile     omit support for large files
@@ -1886,6 +1873,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
@@ -1894,7 +1882,6 @@ 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
@@ -1935,6 +1922,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
@@ -2933,7 +2924,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
@@ -2996,10 +2986,12 @@ if test "${enable_gui+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
@@ -3050,10 +3042,12 @@ if test "${enable_monolithic+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
@@ -3104,10 +3098,12 @@ if test "${enable_plugins+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
@@ -3158,10 +3154,12 @@ if test "${with_subdirs+set}" = set; then
 
 else
 
-                        cache=no
                         LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
@@ -3218,10 +3216,12 @@ if test "${enable_official_build+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
@@ -3281,10 +3281,12 @@ if test "${enable_all_features+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
@@ -3339,10 +3341,12 @@ if test "${enable_universal+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
@@ -3468,10 +3472,12 @@ if test "${enable_nanox+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
@@ -3528,10 +3534,12 @@ if test "${enable_gpe+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
@@ -3583,10 +3591,12 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
@@ -3641,10 +3651,12 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
@@ -3699,10 +3711,12 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
@@ -3757,10 +3771,12 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
@@ -3816,10 +3832,12 @@ if test "${with_libmspack+set}" = set; then
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
@@ -3846,6 +3864,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
@@ -3870,10 +3944,12 @@ if test "${with_gnomeprint+set}" = set; then
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
@@ -3924,10 +4000,12 @@ if test "${with_gnomevfs+set}" = set; then
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
@@ -3978,10 +4056,12 @@ if test "${with_hildon+set}" = set; then
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
@@ -4032,10 +4112,12 @@ if test "${with_opengl+set}" = set; then
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
@@ -4089,10 +4171,12 @@ if test "${with_dmalloc+set}" = set; then
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
@@ -4143,10 +4227,12 @@ if test "${with_sdl+set}" = set; then
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
@@ -4196,10 +4282,12 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
@@ -4254,10 +4342,12 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
@@ -4289,64 +4379,6 @@ 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; }
-
-# 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
-                        cache=yes
-
-else
-
-                        cache=no
-                        LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        fi
-
-                        wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
-
-fi
-
-
-          eval "$wx_cv_use_odbc"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_ODBC=$wxUSE_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; }
 
@@ -4370,10 +4402,12 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or
 
 else
 
-                        cache=no
                         LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}`
                         if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
+                            eval "DEFAULT_$LINE"
+                            cache=yes
+                        else
+                            cache=no
                         fi
 
                         wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
@@ -4484,10 +4518,12 @@ if test "${enable_shared+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
@@ -4538,10 +4574,12 @@ if test "${enable_optimise+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
@@ -4592,10 +4630,12 @@ if test "${enable_debug+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
@@ -4646,10 +4686,12 @@ if test "${enable_stl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
@@ -4700,10 +4742,12 @@ if test "${enable_std_iostreams+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
@@ -4754,10 +4798,12 @@ if test "${enable_std_string+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
@@ -4808,10 +4854,12 @@ if test "${enable_unicode+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
@@ -4862,10 +4910,12 @@ if test "${enable_mslu+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
@@ -4903,10 +4953,12 @@ if test "${enable_utf8+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
+                            cache=yes
+                          else
+                            cache=no
                           fi
 
                           wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
@@ -4947,10 +4999,12 @@ if test "${enable_utf8only+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
@@ -5001,10 +5055,12 @@ if test "${enable_extended_rtti+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
@@ -5057,10 +5113,12 @@ if test "${enable_omf+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
@@ -5123,10 +5181,12 @@ if test "${enable_debug_flag+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
@@ -5177,10 +5237,12 @@ if test "${enable_debug_info+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
@@ -5231,10 +5293,12 @@ if test "${enable_debug_gdb+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
@@ -5285,10 +5349,12 @@ if test "${enable_debug_cntxt+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
@@ -5339,10 +5405,12 @@ if test "${enable_mem_tracing+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
@@ -5393,10 +5461,12 @@ if test "${enable_profile+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
@@ -5447,10 +5517,12 @@ if test "${enable_no_rtti+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
@@ -5501,10 +5573,12 @@ if test "${enable_no_exceptions+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
@@ -5555,10 +5629,12 @@ if test "${enable_permissive+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
@@ -5609,10 +5685,12 @@ if test "${enable_no_deps+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
@@ -5663,10 +5741,12 @@ if test "${enable_vararg_macros+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
@@ -5704,10 +5784,12 @@ if test "${enable_universal_binary+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
+                            cache=yes
+                          else
+                            cache=no
                           fi
 
                           wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
@@ -5749,10 +5831,12 @@ if test "${enable_compat26+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
@@ -5803,10 +5887,12 @@ if test "${enable_compat28+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
@@ -5858,10 +5944,12 @@ if test "${enable_rpath+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
@@ -5913,10 +6001,12 @@ if test "${enable_objc_uniquifying+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
@@ -5968,10 +6058,12 @@ if test "${enable_visibility+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
@@ -6024,10 +6116,12 @@ if test "${enable_intl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
@@ -6078,10 +6172,12 @@ if test "${enable_config+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
@@ -6133,10 +6229,12 @@ if test "${enable_protocols+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
@@ -6187,10 +6285,12 @@ if test "${enable_ftp+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
@@ -6241,10 +6341,12 @@ if test "${enable_http+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
@@ -6295,10 +6397,12 @@ if test "${enable_fileproto+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
@@ -6349,10 +6453,12 @@ if test "${enable_sockets+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
@@ -6403,10 +6509,12 @@ if test "${enable_ole+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
@@ -6457,10 +6565,12 @@ if test "${enable_dataobj+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
@@ -6512,10 +6622,12 @@ if test "${enable_ipc+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
@@ -6567,10 +6679,12 @@ if test "${enable_baseevtloop+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
@@ -6607,32 +6721,34 @@ 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; }
-          # 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
 
-                          cache=no
                           LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
-                          wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
+                          wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
 
 fi
 
 
-          eval "$wx_cv_use_epoolloop"
+          eval "$wx_cv_use_epollloop"
           if test "x$cache" = xyes; then
             echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${wx_arg_cache_file}.tmp
           fi
@@ -6675,10 +6791,12 @@ if test "${enable_selectloop+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
@@ -6730,10 +6848,12 @@ if test "${enable_apple_ieee+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
@@ -6784,10 +6904,12 @@ if test "${enable_arcstream+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
@@ -6838,10 +6960,12 @@ if test "${enable_base64+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
@@ -6892,10 +7016,12 @@ if test "${enable_backtrace+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
@@ -6946,10 +7072,12 @@ if test "${enable_catch_segvs+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
@@ -7000,10 +7128,12 @@ if test "${enable_cmdline+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
@@ -7054,10 +7184,12 @@ if test "${enable_datetime+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
@@ -7108,10 +7240,12 @@ if test "${enable_debugreport+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
@@ -7162,10 +7296,12 @@ if test "${enable_dialupman+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
@@ -7216,10 +7352,12 @@ if test "${enable_dynlib+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
@@ -7270,10 +7408,12 @@ if test "${enable_dynamicloader+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
@@ -7324,10 +7464,12 @@ if test "${enable_exceptions+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
@@ -7378,10 +7520,12 @@ if test "${enable_ffile+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
@@ -7432,10 +7576,12 @@ if test "${enable_file+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
@@ -7486,10 +7632,12 @@ if test "${enable_filesystem+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
@@ -7540,10 +7688,12 @@ if test "${enable_fontenum+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}"
@@ -7594,10 +7744,12 @@ if test "${enable_fontmap+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
@@ -7648,10 +7800,12 @@ if test "${enable_fs_archive+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
@@ -7702,10 +7856,12 @@ if test "${enable_fs_inet+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
@@ -7756,10 +7912,12 @@ if test "${enable_fs_zip+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
@@ -7810,10 +7968,12 @@ if test "${enable_geometry+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
@@ -7864,10 +8024,12 @@ if test "${enable_log+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
@@ -7918,10 +8080,12 @@ if test "${enable_longlong+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
@@ -7972,10 +8136,12 @@ if test "${enable_mimetype+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
@@ -8026,10 +8192,12 @@ if test "${enable_snglinst+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
@@ -8080,10 +8248,12 @@ if test "${enable_stdpaths+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
@@ -8134,10 +8304,12 @@ if test "${enable_stopwatch+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
@@ -8188,10 +8360,12 @@ if test "${enable_streams+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
@@ -8242,10 +8416,12 @@ if test "${enable_system_options+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
@@ -8296,10 +8472,12 @@ if test "${enable_tarstream+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
@@ -8350,10 +8528,12 @@ if test "${enable_textbuf+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
@@ -8404,10 +8584,12 @@ if test "${enable_textfile+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
@@ -8458,10 +8640,12 @@ if test "${enable_timer+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
@@ -8512,10 +8696,12 @@ if test "${enable_sound+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
@@ -8566,10 +8752,12 @@ if test "${enable_mediactrl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
@@ -8620,10 +8808,12 @@ if test "${enable_gstreamer8+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
@@ -8674,10 +8864,12 @@ if test "${enable_printfposparam+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
@@ -8728,10 +8920,12 @@ if test "${enable_zipstream+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
@@ -8783,10 +8977,12 @@ if test "${enable_url+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
@@ -8837,10 +9033,12 @@ if test "${enable_variant+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
@@ -8891,10 +9089,12 @@ if test "${enable_protocol+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
@@ -8945,10 +9145,12 @@ if test "${enable_protocol_http+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
@@ -8999,10 +9201,12 @@ if test "${enable_protocol_ftp+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
@@ -9053,10 +9257,12 @@ if test "${enable_protocol_file+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
@@ -9108,10 +9314,12 @@ if test "${enable_threads+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
@@ -9138,6 +9346,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
 
 
@@ -9166,10 +9487,12 @@ if test "${enable_docview+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
@@ -9220,10 +9543,12 @@ if test "${enable_help+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
@@ -9274,10 +9599,12 @@ if test "${enable_mshtmlhelp+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
@@ -9328,10 +9655,12 @@ if test "${enable_html+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
@@ -9382,10 +9711,12 @@ if test "${enable_htmlhelp+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
@@ -9436,10 +9767,12 @@ if test "${enable_xrc+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
@@ -9490,10 +9823,12 @@ if test "${enable_aui+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
@@ -9544,10 +9879,12 @@ if test "${enable_stc+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
@@ -9598,10 +9935,12 @@ if test "${enable_constraints+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
@@ -9652,10 +9991,12 @@ if test "${enable_printarch+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
@@ -9706,10 +10047,12 @@ if test "${enable_mdi+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
@@ -9760,10 +10103,12 @@ if test "${enable_mdidoc+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
@@ -9814,10 +10159,12 @@ if test "${enable_loggui+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
@@ -9868,10 +10215,12 @@ if test "${enable_logwin+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
@@ -9922,10 +10271,12 @@ if test "${enable_logdialog+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
@@ -9976,10 +10327,12 @@ if test "${enable_webkit+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
@@ -10030,10 +10383,12 @@ if test "${enable_richtext+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
@@ -10084,10 +10439,12 @@ if test "${enable_graphics_ctx+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
@@ -10138,10 +10495,12 @@ if test "${enable_postscript+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
@@ -10192,10 +10551,12 @@ if test "${enable_svg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
@@ -10248,10 +10609,12 @@ if test "${enable_clipboard+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
@@ -10302,10 +10665,12 @@ if test "${enable_dnd+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
@@ -10356,10 +10721,12 @@ if test "${enable_metafile+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
@@ -10413,10 +10780,12 @@ if test "${enable_controls+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
@@ -10462,6 +10831,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
@@ -10515,6 +10885,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
@@ -10576,10 +10947,12 @@ if test "${enable_accel+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
@@ -10630,10 +11003,12 @@ if test "${enable_animatectrl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
@@ -10684,10 +11059,12 @@ if test "${enable_button+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
@@ -10738,10 +11115,12 @@ if test "${enable_bmpbutton+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
@@ -10792,10 +11171,12 @@ if test "${enable_bmpcombobox+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
@@ -10846,10 +11227,12 @@ if test "${enable_calendar+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
@@ -10900,10 +11283,12 @@ if test "${enable_caret+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
@@ -10954,10 +11339,12 @@ if test "${enable_checkbox+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
@@ -11008,10 +11395,12 @@ if test "${enable_checklst+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
@@ -11062,10 +11451,12 @@ if test "${enable_choice+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
@@ -11116,10 +11507,12 @@ if test "${enable_choicebook+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
@@ -11170,10 +11563,12 @@ if test "${enable_collpane+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
@@ -11224,10 +11619,12 @@ if test "${enable_colourpicker+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
@@ -11278,10 +11675,12 @@ if test "${enable_combobox+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
@@ -11332,10 +11731,12 @@ if test "${enable_comboctrl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
@@ -11386,10 +11787,12 @@ if test "${enable_datepick+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
@@ -11440,10 +11843,12 @@ if test "${enable_dirpicker+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
@@ -11494,10 +11899,12 @@ if test "${enable_display+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
@@ -11548,10 +11955,12 @@ if test "${enable_detect_sm+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
@@ -11602,10 +12011,12 @@ if test "${enable_editablebox+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
@@ -11656,10 +12067,12 @@ if test "${enable_filepicker+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
 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
@@ -11710,10 +12179,12 @@ if test "${enable_fontpicker+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
@@ -11764,10 +12235,12 @@ if test "${enable_gauge+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
@@ -11818,10 +12291,12 @@ if test "${enable_grid+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
@@ -11872,10 +12347,12 @@ if test "${enable_dataviewctrl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
@@ -11926,10 +12403,12 @@ if test "${enable_hyperlink+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
@@ -11980,10 +12459,12 @@ if test "${enable_imaglist+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
@@ -12034,10 +12515,12 @@ if test "${enable_listbook+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
@@ -12088,10 +12571,12 @@ if test "${enable_listbox+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
@@ -12142,10 +12627,12 @@ if test "${enable_listctrl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
@@ -12196,10 +12683,12 @@ if test "${enable_notebook+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
@@ -12250,10 +12739,12 @@ if test "${enable_odcombobox+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
@@ -12304,10 +12795,12 @@ if test "${enable_radiobox+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
@@ -12358,10 +12851,12 @@ if test "${enable_radiobtn+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
@@ -12412,10 +12907,12 @@ if test "${enable_sash+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
@@ -12466,10 +12963,12 @@ if test "${enable_scrollbar+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
@@ -12520,10 +13019,12 @@ if test "${enable_searchctrl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
@@ -12574,10 +13075,12 @@ if test "${enable_slider+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
@@ -12628,10 +13131,12 @@ if test "${enable_spinbtn+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
@@ -12682,10 +13187,12 @@ if test "${enable_spinctrl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
@@ -12736,10 +13243,12 @@ if test "${enable_splitter+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
@@ -12790,10 +13299,12 @@ if test "${enable_statbmp+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
@@ -12844,10 +13355,12 @@ if test "${enable_statbox+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
@@ -12898,10 +13411,12 @@ if test "${enable_statline+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
@@ -12952,10 +13467,12 @@ if test "${enable_stattext+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
@@ -13006,10 +13523,12 @@ if test "${enable_statusbar+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
@@ -13060,10 +13579,12 @@ if test "${enable_tabdialog+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
@@ -13114,10 +13635,12 @@ if test "${enable_taskbaricon+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
@@ -13168,10 +13691,12 @@ if test "${enable_textctrl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
@@ -13222,10 +13747,12 @@ if test "${enable_togglebtn+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
@@ -13276,10 +13803,12 @@ if test "${enable_toolbar+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
@@ -13330,10 +13859,12 @@ if test "${enable_tbarnative+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
@@ -13384,10 +13915,12 @@ if test "${enable_treebook+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
@@ -13438,10 +13971,12 @@ if test "${enable_toolbook+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
@@ -13492,10 +14027,12 @@ if test "${enable_treectrl+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
@@ -13546,10 +14083,12 @@ if test "${enable_tipwindow+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
@@ -13600,10 +14139,12 @@ if test "${enable_popupwin+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
@@ -13656,10 +14197,12 @@ if test "${enable_commondlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
@@ -13710,10 +14253,12 @@ if test "${enable_aboutdlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
@@ -13764,10 +14309,12 @@ if test "${enable_choicedlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
@@ -13818,10 +14365,12 @@ if test "${enable_coldlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
@@ -13872,10 +14421,12 @@ if test "${enable_filedlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
@@ -13926,10 +14477,12 @@ if test "${enable_finddlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
@@ -13980,10 +14533,12 @@ if test "${enable_fontdlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
@@ -14034,10 +14589,12 @@ if test "${enable_dirdlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
@@ -14088,10 +14645,12 @@ if test "${enable_msgdlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
@@ -14142,10 +14701,12 @@ if test "${enable_numberdlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
@@ -14196,10 +14757,12 @@ if test "${enable_splash+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
@@ -14250,10 +14813,12 @@ if test "${enable_textdlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
@@ -14304,10 +14869,12 @@ if test "${enable_tipdlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
@@ -14358,10 +14925,12 @@ if test "${enable_progressdlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
@@ -14412,10 +14981,12 @@ if test "${enable_wizarddlg+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
@@ -14468,10 +15039,12 @@ if test "${enable_menus+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
@@ -14522,10 +15095,12 @@ if test "${enable_miniframe+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
@@ -14576,10 +15151,12 @@ if test "${enable_tooltips+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
@@ -14630,10 +15207,12 @@ if test "${enable_splines+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
@@ -14684,10 +15263,12 @@ if test "${enable_mousewheel+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
@@ -14738,10 +15319,12 @@ if test "${enable_validators+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
@@ -14792,10 +15375,12 @@ if test "${enable_busyinfo+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
@@ -14846,10 +15431,12 @@ if test "${enable_joystick+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
@@ -14900,10 +15487,12 @@ if test "${enable_metafile+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
@@ -14954,10 +15543,12 @@ if test "${enable_dragimage+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
@@ -15008,10 +15599,12 @@ if test "${enable_accessibility+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
@@ -15064,10 +15657,12 @@ if test "${enable_palette+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
@@ -15118,10 +15713,12 @@ if test "${enable_image+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
@@ -15172,10 +15769,12 @@ if test "${enable_gif+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
@@ -15226,10 +15825,12 @@ if test "${enable_pcx+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
@@ -15280,10 +15881,12 @@ if test "${enable_tga+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
@@ -15334,10 +15937,12 @@ if test "${enable_iff+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
@@ -15388,10 +15993,12 @@ if test "${enable_pnm+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
@@ -15442,10 +16049,12 @@ if test "${enable_xpm+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
@@ -15496,10 +16105,12 @@ if test "${enable_ico_cur+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
@@ -15552,10 +16163,12 @@ if test "${enable_dccache+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
 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
-
-                          cache=no
-                          LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          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
@@ -15660,10 +16219,12 @@ if test "${enable_ps_in_msw+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}"
@@ -15714,10 +16275,12 @@ if test "${enable_ownerdrawn+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}"
 echo "${ECHO_T}$result" >&6; }
 
 
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-regkey" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6; }
-          # Check whether --enable-regkey was given.
-if test "${enable_regkey+set}" = set; then
-  enableval=$enable_regkey;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_regkey='wxUSE_REGKEY=yes'
-                          else
-                            wx_cv_use_regkey='wxUSE_REGKEY=no'
-                          fi
-                          cache=yes
-
-else
-
-                          cache=no
-                          LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          fi
-
-                          wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_regkey"
-          if test "x$cache" = xyes; then
-            echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_REGKEY = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_REGKEY
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -15822,10 +16331,12 @@ if test "${enable_uxtheme+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}"
@@ -15876,10 +16387,12 @@ if test "${enable_wxdib+set}" = set; then
 
 else
 
-                          cache=no
                           LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
+                              eval "DEFAULT_$LINE"
+                              cache=yes
+                          else
+                              cache=no
                           fi
 
                           wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}"
@@ -19722,103 +20235,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.
@@ -19923,96 +20339,6 @@ 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
-
 retest_macosx_linking=no
 
 #if test "$wxUSE_MAC" = 1; then
@@ -20096,6 +20422,13 @@ echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6; }
 
         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
+
+            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
+
         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
@@ -20257,495 +20590,6 @@ case "${host}" in
         ;;
 esac
 
-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
-
-
-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 "$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
-
-
-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
-
-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
-
-  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"
-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; }
-fi
-
-
-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
-
-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
-
-  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"
-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.
-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
-
-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; }
-fi
-
-
-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
-
-  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
-
-        ;;
-    esac
-fi
-
-{ 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
-else
-
-    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="#"
-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
-
-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
-
-
-
 
 if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
     CXXFLAGS="-qunique $CXXFLAGS"
@@ -21587,11 +21431,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
@@ -27694,35 +27534,103 @@ 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_class_gnuhashmapset=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       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_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
+_ACEOF
+
+    fi
+fi
+
+
+
+  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
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+          int value=0;
+          __sync_fetch_and_add(&value, 1);
+          __sync_sub_and_fetch(&value, 1);
+
+  ;
+  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_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'
@@ -28538,7 +28446,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
 
 
@@ -28620,7 +28528,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
 
 
@@ -29250,8 +29158,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
 
 
@@ -30070,6 +29976,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"
 
@@ -35265,9 +35164,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
 
 
 
-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
-  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 <sql.h>
-_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
-  ac_cv_header_sql_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_header_sql_h=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.  */
-_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
-
-    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
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
         { echo "$as_me:$LINENO: checking for Xinerama" >&5
@@ -36353,6 +35957,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
-      cat >>confdefs.h <<\_ACEOF
-#define HAVE_VISIBILITY 1
-_ACEOF
-
-
-                  { echo "$as_me:$LINENO: checking for broken libstdc++ visibility" >&5
+                              { 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'
@@ -36439,7 +36045,8 @@ int
 main ()
 {
 
-            std::string x;
+            std::string s("hello");
+            return s.length();
 
   ;
   return 0;
@@ -36480,17 +36087,104 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 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=""
@@ -36645,7 +36339,6 @@ EOF
       ;;
 
       *-*-cygwin* | *-*-mingw32* )
-                        WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
         ;;
 
       *-*-hpux* )
@@ -36656,6 +36349,8 @@ EOF
     esac
     fi
 
+            WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
+
     if test $wxUSE_RPATH = "no"; then
         SAMPLES_RPATH_FLAG=''
         SAMPLES_RPATH_POSTLINK=''
@@ -36842,154 +36537,6 @@ 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; }
@@ -38363,88 +37910,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
 
@@ -38452,44 +37923,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;
@@ -38512,12 +37986,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
 
@@ -38525,15 +37999,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
@@ -38858,7 +38165,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; }
@@ -38928,7 +38235,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
@@ -39146,7 +38369,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
 
 
@@ -39235,7 +38458,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
 
 
@@ -40376,7 +39599,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
@@ -40465,14 +39689,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
@@ -40561,10 +39784,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
@@ -40823,7 +40047,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
 
 
@@ -40917,7 +40141,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
 
 
@@ -40999,7 +40223,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
 
 
@@ -41082,7 +40306,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
 
 
@@ -41650,7 +40874,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
 
 
@@ -41661,6 +40885,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
 
 
@@ -43381,94 +42867,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
-
 
 
 
@@ -45542,6 +44940,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
 
 
@@ -48349,7 +47838,6 @@ if test "$wxUSE_CHECKLST" = "yes"; then
 _ACEOF
 
   USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
 if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then
@@ -48376,6 +47864,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
@@ -48402,7 +47898,7 @@ echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >
 #define wxUSE_DISPLAY 1
 _ACEOF
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
     fi
 fi
 
@@ -48476,7 +47972,6 @@ if test "$wxUSE_LISTBOX" = "yes"; then
 _ACEOF
 
     USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox"
 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then
@@ -48974,7 +48469,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
-
-if test "$wxUSE_INICONF" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_INICONF 1
-_ACEOF
-
-fi
+    fi
 
-if test "$wxUSE_DIB" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_DIB" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_WXDIB 1
 _ACEOF
 
-fi
+    fi
 
-if test "$wxUSE_OWNER_DRAWN" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
+    if test "$wxUSE_OWNER_DRAWN" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_OWNER_DRAWN 1
 _ACEOF
 
-fi
+    fi
 
-if test "$wxUSE_REGKEY" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_REGKEY 1
+    if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 _ACEOF
 
-fi
+    fi
 
-if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+    if test "$wxUSE_UXTHEME" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_UXTHEME 1
 _ACEOF
 
+    fi
+
 fi
 
-if test "$wxUSE_UXTHEME" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_UXTHEME 1
+
+if test "$USE_WIN32" = 1 ; then
+    if test "$wxUSE_INICONF" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_INICONF 1
 _ACEOF
 
-fi
+    fi
+
+    if test "$wxUSE_REGKEY" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_REGKEY 1
+_ACEOF
 
+    fi
 fi
 
 
@@ -49579,15 +49076,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"
@@ -49601,9 +49095,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"
@@ -49663,9 +49154,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"
@@ -49693,7 +49184,7 @@ fi
 if test "x$INTELCXX" = "xyes" ; then
                                                             CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
 elif test "$GXX" = yes ; then
-        CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy"
+        CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
 fi
 
 
@@ -49724,7 +49215,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`
@@ -49743,9 +49233,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
@@ -49794,7 +49281,6 @@ fi
 
 
 
-
 if test $wxUSE_MONOLITHIC = "yes" ; then
     MONOLITHIC=1
 else
@@ -49807,12 +49293,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
@@ -49864,6 +49344,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
@@ -52247,21 +51730,11 @@ EOF
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1=""
     fi
 
-    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
-    fi
-
     COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
     fi
 
-    COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1=""
-    fi
-
     COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
@@ -52302,21 +51775,11 @@ EOF
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1=""
     fi
 
-    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
-    fi
-
     COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
     fi
 
-    COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1=""
-    fi
-
     COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
@@ -52347,11 +51810,6 @@ EOF
         COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1=""
     fi
 
-    COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1=""
-    fi
-
     COND_MONOLITHIC_0_USE_HTML_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then
         COND_MONOLITHIC_0_USE_HTML_1=""
@@ -52362,11 +51820,6 @@ EOF
         COND_MONOLITHIC_0_USE_MEDIA_1=""
     fi
 
-    COND_MONOLITHIC_0_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_USE_ODBC_1=""
-    fi
-
     COND_MONOLITHIC_0_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_USE_QA_1=""
@@ -52477,16 +51930,6 @@ EOF
         COND_PLATFORM_MACOS_1=""
     fi
 
-    COND_PLATFORM_MAC_1="#"
-    if test "x$PLATFORM_MAC" = "x1" ; then
-        COND_PLATFORM_MAC_1=""
-    fi
-
-    COND_PLATFORM_MSDOS_0="#"
-    if test "x$PLATFORM_MSDOS" = "x0" ; then
-        COND_PLATFORM_MSDOS_0=""
-    fi
-
     COND_PLATFORM_MSDOS_1="#"
     if test "x$PLATFORM_MSDOS" = "x1" ; then
         COND_PLATFORM_MSDOS_1=""
@@ -52542,21 +51985,6 @@ EOF
         COND_SHARED_0=""
     fi
 
-    COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="#"
-    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
-        COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0=""
-    fi
-
-    COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="#"
-    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
-        COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
-    fi
-
-    COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
-    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
-        COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
-    fi
-
     COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
     if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
         COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
@@ -52582,21 +52010,11 @@ EOF
         COND_SHARED_0_USE_STC_1=""
     fi
 
-    COND_SHARED_0_USE_XRC_1="#"
-    if test "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
-        COND_SHARED_0_USE_XRC_1=""
-    fi
-
     COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
     if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
         COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
     fi
 
-    COND_SHARED_0_WXUSE_ODBC_BUILTIN="#"
-    if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_ODBC_BUILTIN=""
-    fi
-
     COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
     if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
         COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
@@ -52617,11 +52035,6 @@ EOF
         COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
     fi
 
-    COND_SHARED_1_USE_XRC_1="#"
-    if test "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then
-        COND_SHARED_1_USE_XRC_1=""
-    fi
-
     COND_TOOLKIT_="#"
     if test "x$TOOLKIT" = "x" ; then
         COND_TOOLKIT_=""
@@ -52852,16 +52265,6 @@ EOF
         COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
-    COND_USE_ODBC_1="#"
-    if test "x$USE_ODBC" = "x1" ; then
-        COND_USE_ODBC_1=""
-    fi
-
-    COND_USE_OPENGL_1="#"
-    if test "x$USE_OPENGL" = "x1" ; then
-        COND_USE_OPENGL_1=""
-    fi
-
     COND_USE_PCH_1="#"
     if test "x$USE_PCH" = "x1" ; then
         COND_USE_PCH_1=""
@@ -52967,11 +52370,6 @@ EOF
         COND_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
-    COND_WXUSE_ODBC_BUILTIN="#"
-    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_WXUSE_ODBC_BUILTIN=""
-    fi
-
     COND_WXUSE_REGEX_BUILTIN="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
         COND_WXUSE_REGEX_BUILTIN=""
@@ -52997,6 +52395,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
@@ -53021,10 +52513,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"
@@ -53033,10 +52521,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
@@ -53053,7 +52537,7 @@ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
 
 case "${host}" in
     *-*-solaris2* )
-                        if "$GCC" = yes; then
+                        if test "$GCC" = yes; then
             CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'`
             LIBS=`echo $LIBS | sed 's/-mt//'`
             EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'`
@@ -53131,7 +52615,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 
-
 
 
 { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
@@ -54073,16 +53556,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
@@ -54103,10 +53577,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
@@ -54148,16 +53631,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
@@ -54168,7 +53641,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
@@ -54183,11 +53655,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
@@ -54202,12 +53674,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
@@ -54240,11 +53719,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
@@ -54286,7 +53769,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
@@ -54306,9 +53788,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_AUI_1$ac_de
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
@@ -54317,19 +53797,15 @@ COND_MONOLITHIC_0_SHARED_1_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_AUI_1$ac_de
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
-COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
 COND_MONOLITHIC_0_USE_AUI_1!$COND_MONOLITHIC_0_USE_AUI_1$ac_delim
 COND_MONOLITHIC_0_USE_GUI_1!$COND_MONOLITHIC_0_USE_GUI_1$ac_delim
 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1$ac_delim
 COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
 COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
-COND_MONOLITHIC_0_USE_ODBC_1!$COND_MONOLITHIC_0_USE_ODBC_1$ac_delim
 COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
 COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
@@ -54352,8 +53828,6 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim
 COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
 COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim
-COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim
-COND_PLATFORM_MSDOS_0!$COND_PLATFORM_MSDOS_0$ac_delim
 COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
 COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
 COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
@@ -54365,24 +53839,33 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim
 COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
 COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
 COND_SHARED_0!$COND_SHARED_0$ac_delim
-COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
-COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
-COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
 COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
 COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
-COND_SHARED_0_USE_XRC_1!$COND_SHARED_0_USE_XRC_1$ac_delim
 COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_ODBC_BUILTIN!$COND_SHARED_0_WXUSE_ODBC_BUILTIN$ac_delim
 COND_SHARED_0_WXUSE_REGEX_BUILTIN!$COND_SHARED_0_WXUSE_REGEX_BUILTIN$ac_delim
 COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim
 COND_SHARED_1!$COND_SHARED_1$ac_delim
 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
-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
+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
+COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
+COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
+COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
+COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54424,21 +53907,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
-COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
-COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
-COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
-COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
 COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
 COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
 COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
@@ -54468,8 +53936,6 @@ COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim
 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
 COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
 COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
-COND_USE_ODBC_1!$COND_USE_ODBC_1$ac_delim
-COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
 COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
 COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
 COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
@@ -54491,9 +53957,9 @@ COND_WXUSE_EXPAT_BUILTIN!$COND_WXUSE_EXPAT_BUILTIN$ac_delim
 COND_WXUSE_LIBJPEG_BUILTIN!$COND_WXUSE_LIBJPEG_BUILTIN$ac_delim
 COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim
 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
@@ -54518,50 +53984,8 @@ 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
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_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
@@ -54576,12 +54000,13 @@ 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
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -54599,8 +54024,8 @@ if test -n "$ac_eof"; then
 fi
 
 cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 _ACEOF
 sed '
 s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -54613,8 +54038,6 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
 ' >>$CONFIG_STATUS <conf$$subs.sed
 rm -f conf$$subs.sed
 cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
 CEOF$ac_eof
 _ACEOF
 
@@ -54862,7 +54285,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed 's/|#_!!_#|//g' >$tmp/out
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
@@ -55214,7 +54637,7 @@ echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITH
 
 echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
-echo -n "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}"
+echo $ECHO_N "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}$ECHO_C"
 if test "$wxUSE_UNICODE" = "yes"; then
     if test "$wxUSE_UNICODE_UTF8" = "yes"; then
         echo " (using UTF-8)"
@@ -55230,7 +54653,7 @@ echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIB
 echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
 
 echo "  Which libraries should wxWidgets use?"
-echo "                                       STL               ${wxUSE_STL}"
+echo "                                       STL                ${wxUSE_STL}"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
 echo "                                       png                ${wxUSE_LIBPNG-none}"
 echo "                                       regex              ${wxUSE_REGEX}"
@@ -55239,7 +54662,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}"