X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84ebfcbd18f0dee2cd5f872e2c56717ea7ff5e19..98883bca6ffdf0657ed46fbb66fc45e74fc85bc6:/configure

diff --git a/configure b/configure
index 4b347bde38..b72fffcca3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 47344 2007-07-11 21:14:05Z VZ .
+# From configure.in Id: configure.in 47467 2007-07-14 19:17:21Z PC .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -1638,13 +1638,13 @@ Optional Features:
   --enable-plugins        build parts of wxWidgets as loadable components
   --enable-official_build official build of wxWidgets (win32 DLL only)
   --enable-vendor=VENDOR  vendor name (win32 DLL only)
-  --disable-all_features  disable all optional features to build minimal library
+  --disable-all-features  disable all optional features to build minimal library
   --enable-universal      use wxWidgets GUI controls instead of native ones
   --enable-nanox          use NanoX
   --disable-gtk2          use GTK+ 1.2 instead of 2.0
   --enable-gpe            use GNOME PDA Environment features if possible
   --disable-shared        create static library instead of shared
-  --enable-optimise       create optimised code
+  --disable-optimise      create optimised code
   --enable-debug          same as debug_flag and debug_info
   --enable-stl            use STL for containers
   --enable-std_iostreams  use standard C++ stream classes
@@ -1671,6 +1671,7 @@ Optional Features:
   --disable-compat28      disable wxWidgets 2.8 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds
   --enable-objc_uniquifying enable Objective-C class name uniquifying
+  --disable-visibility    disable use of ELF symbols visibility even if supported
   --enable-intl           use internationalization system
   --enable-config         use wxConfig (and derived) classes
   --enable-protocols      use wxProtocol and derived classes
@@ -1681,6 +1682,9 @@ Optional Features:
   --enable-ole            use OLE classes (Win32 only)
   --enable-dataobj        use data object classes
   --enable-ipc            use interprocess communication (wxSocket etc.)
+  --enable-base-evtloop   use event loop in console programs too
+  --enable-epool-loop     use wxEpollDispatcher class (Linux only)
+  --enable-select-loop    use wxSelectDispatcher class
   --enable-apple_ieee     use the Apple IEEE codec
   --enable-arcstream      use wxArchive streams
   --enable-base64         use base64 encoding/decoding functions
@@ -1748,7 +1752,7 @@ Optional Features:
   --enable-clipboard      use wxClipboard class
   --enable-dnd            use Drag'n'Drop classes
   --enable-metafile       use win32 metafiles
-  --enable-controls       use all usual controls
+  --disable-controls      disable compilation of all standard controls
   --enable-accel          use accelerators
   --enable-animatectrl    use wxAnimationCtrl class
   --enable-button         use wxButton class
@@ -2973,9 +2977,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6; }
 if test "${enable_gui+set}" = set; then
   enableval=$enable_gui;
                           if test "$enableval" = yes; then
-                            ac_cv_use_gui='wxUSE_GUI=yes'
+                            wx_cv_use_gui='wxUSE_GUI=yes'
                           else
-                            ac_cv_use_gui='wxUSE_GUI=no'
+                            wx_cv_use_gui='wxUSE_GUI=no'
                           fi
 
 else
@@ -2987,14 +2991,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
+                          wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_gui"
+          eval "$wx_cv_use_gui"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gui >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gui >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3028,9 +3032,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6;
 if test "${enable_monolithic+set}" = set; then
   enableval=$enable_monolithic;
                           if test "$enableval" = yes; then
-                            ac_cv_use_monolithic='wxUSE_MONOLITHIC=yes'
+                            wx_cv_use_monolithic='wxUSE_MONOLITHIC=yes'
                           else
-                            ac_cv_use_monolithic='wxUSE_MONOLITHIC=no'
+                            wx_cv_use_monolithic='wxUSE_MONOLITHIC=no'
                           fi
 
 else
@@ -3042,14 +3046,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
+                          wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_monolithic"
+          eval "$wx_cv_use_monolithic"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_monolithic >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_monolithic >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3083,9 +3087,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6; }
 if test "${enable_plugins+set}" = set; then
   enableval=$enable_plugins;
                           if test "$enableval" = yes; then
-                            ac_cv_use_plugins='wxUSE_PLUGINS=yes'
+                            wx_cv_use_plugins='wxUSE_PLUGINS=yes'
                           else
-                            ac_cv_use_plugins='wxUSE_PLUGINS=no'
+                            wx_cv_use_plugins='wxUSE_PLUGINS=no'
                           fi
 
 else
@@ -3097,14 +3101,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
+                          wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_plugins"
+          eval "$wx_cv_use_plugins"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_plugins >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_plugins >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3130,9 +3134,9 @@ echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6; }
 if test "${with_subdirs+set}" = set; then
   withval=$with_subdirs;
                         if test "$withval" = yes; then
-                          ac_cv_use_subdirs='wxWITH_SUBDIRS=yes'
+                          wx_cv_use_subdirs='wxWITH_SUBDIRS=yes'
                         else
-                          ac_cv_use_subdirs='wxWITH_SUBDIRS=no'
+                          wx_cv_use_subdirs='wxWITH_SUBDIRS=no'
                         fi
 
 else
@@ -3144,14 +3148,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_subdirs"
+          eval "$wx_cv_use_subdirs"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_subdirs >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_subdirs >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -3191,9 +3195,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C"
 if test "${enable_official_build+set}" = set; then
   enableval=$enable_official_build;
                           if test "$enableval" = yes; then
-                            ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
+                            wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes'
                           else
-                            ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
+                            wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
                           fi
 
 else
@@ -3205,14 +3209,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
+                          wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_official_build"
+          eval "$wx_cv_use_official_build"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_official_build >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_official_build >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3248,16 +3252,16 @@ fi
               fi
           fi
 
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-all_features" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-all_features... $ECHO_C" >&6; }
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-all-features" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-all-features... $ECHO_C" >&6; }
           no_cache=0
-          # Check whether --enable-all_features was given.
+          # Check whether --enable-all-features was given.
 if test "${enable_all_features+set}" = set; then
   enableval=$enable_all_features;
                           if test "$enableval" = yes; then
-                            ac_cv_use_all_features='wxUSE_ALL_FEATURES=yes'
+                            wx_cv_use_all_features='wxUSE_ALL_FEATURES=yes'
                           else
-                            ac_cv_use_all_features='wxUSE_ALL_FEATURES=no'
+                            wx_cv_use_all_features='wxUSE_ALL_FEATURES=no'
                           fi
 
 else
@@ -3269,14 +3273,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
+                          wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_all_features"
+          eval "$wx_cv_use_all_features"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_all_features >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_all_features >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3314,9 +3318,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6;
 if test "${enable_universal+set}" = set; then
   enableval=$enable_universal;
                           if test "$enableval" = yes; then
-                            ac_cv_use_universal='wxUSE_UNIVERSAL=yes'
+                            wx_cv_use_universal='wxUSE_UNIVERSAL=yes'
                           else
-                            ac_cv_use_universal='wxUSE_UNIVERSAL=no'
+                            wx_cv_use_universal='wxUSE_UNIVERSAL=no'
                           fi
 
 else
@@ -3328,14 +3332,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
+                          wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_universal"
+          eval "$wx_cv_use_universal"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_universal >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_universal >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3444,9 +3448,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6; }
 if test "${enable_nanox+set}" = set; then
   enableval=$enable_nanox;
                           if test "$enableval" = yes; then
-                            ac_cv_use_nanox='wxUSE_NANOX=yes'
+                            wx_cv_use_nanox='wxUSE_NANOX=yes'
                           else
-                            ac_cv_use_nanox='wxUSE_NANOX=no'
+                            wx_cv_use_nanox='wxUSE_NANOX=no'
                           fi
 
 else
@@ -3458,14 +3462,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
+                          wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_nanox"
+          eval "$wx_cv_use_nanox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_nanox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_nanox >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3505,9 +3509,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6; }
 if test "${enable_gpe+set}" = set; then
   enableval=$enable_gpe;
                           if test "$enableval" = yes; then
-                            ac_cv_use_gpe='wxUSE_GPE=yes'
+                            wx_cv_use_gpe='wxUSE_GPE=yes'
                           else
-                            ac_cv_use_gpe='wxUSE_GPE=no'
+                            wx_cv_use_gpe='wxUSE_GPE=no'
                           fi
 
 else
@@ -3519,14 +3523,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
+                          wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_gpe"
+          eval "$wx_cv_use_gpe"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gpe >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gpe >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -3553,13 +3557,13 @@ echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; }
 if test "${with_libpng+set}" = set; then
   withval=$with_libpng;
                         if test "$withval" = yes; then
-                          ac_cv_use_libpng='wxUSE_LIBPNG=yes'
+                          wx_cv_use_libpng='wxUSE_LIBPNG=yes'
                         elif test "$withval" = no; then
-                          ac_cv_use_libpng='wxUSE_LIBPNG=no'
+                          wx_cv_use_libpng='wxUSE_LIBPNG=no'
                         elif test "$withval" = sys; then
-                          ac_cv_use_libpng='wxUSE_LIBPNG=sys'
+                          wx_cv_use_libpng='wxUSE_LIBPNG=sys'
                         elif test "$withval" = builtin; then
-                          ac_cv_use_libpng='wxUSE_LIBPNG=builtin'
+                          wx_cv_use_libpng='wxUSE_LIBPNG=builtin'
                         else
                           { { echo "$as_me:$LINENO: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;}
@@ -3575,14 +3579,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_libpng"
+          eval "$wx_cv_use_libpng"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_libpng >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_libpng >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_LIBPNG" = yes; then
@@ -3612,13 +3616,13 @@ echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6; }
 if test "${with_libjpeg+set}" = set; then
   withval=$with_libjpeg;
                         if test "$withval" = yes; then
-                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
+                          wx_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
                         elif test "$withval" = no; then
-                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=no'
+                          wx_cv_use_libjpeg='wxUSE_LIBJPEG=no'
                         elif test "$withval" = sys; then
-                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys'
+                          wx_cv_use_libjpeg='wxUSE_LIBJPEG=sys'
                         elif test "$withval" = builtin; then
-                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=builtin'
+                          wx_cv_use_libjpeg='wxUSE_LIBJPEG=builtin'
                         else
                           { { echo "$as_me:$LINENO: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;}
@@ -3634,14 +3638,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_libjpeg"
+          eval "$wx_cv_use_libjpeg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_LIBJPEG" = yes; then
@@ -3671,13 +3675,13 @@ echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6; }
 if test "${with_libtiff+set}" = set; then
   withval=$with_libtiff;
                         if test "$withval" = yes; then
-                          ac_cv_use_libtiff='wxUSE_LIBTIFF=yes'
+                          wx_cv_use_libtiff='wxUSE_LIBTIFF=yes'
                         elif test "$withval" = no; then
-                          ac_cv_use_libtiff='wxUSE_LIBTIFF=no'
+                          wx_cv_use_libtiff='wxUSE_LIBTIFF=no'
                         elif test "$withval" = sys; then
-                          ac_cv_use_libtiff='wxUSE_LIBTIFF=sys'
+                          wx_cv_use_libtiff='wxUSE_LIBTIFF=sys'
                         elif test "$withval" = builtin; then
-                          ac_cv_use_libtiff='wxUSE_LIBTIFF=builtin'
+                          wx_cv_use_libtiff='wxUSE_LIBTIFF=builtin'
                         else
                           { { echo "$as_me:$LINENO: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;}
@@ -3693,14 +3697,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_libtiff"
+          eval "$wx_cv_use_libtiff"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_libtiff >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_libtiff >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_LIBTIFF" = yes; then
@@ -3730,13 +3734,13 @@ echo $ECHO_N "checking for --with-libxpm... $ECHO_C" >&6; }
 if test "${with_libxpm+set}" = set; then
   withval=$with_libxpm;
                         if test "$withval" = yes; then
-                          ac_cv_use_libxpm='wxUSE_LIBXPM=yes'
+                          wx_cv_use_libxpm='wxUSE_LIBXPM=yes'
                         elif test "$withval" = no; then
-                          ac_cv_use_libxpm='wxUSE_LIBXPM=no'
+                          wx_cv_use_libxpm='wxUSE_LIBXPM=no'
                         elif test "$withval" = sys; then
-                          ac_cv_use_libxpm='wxUSE_LIBXPM=sys'
+                          wx_cv_use_libxpm='wxUSE_LIBXPM=sys'
                         elif test "$withval" = builtin; then
-                          ac_cv_use_libxpm='wxUSE_LIBXPM=builtin'
+                          wx_cv_use_libxpm='wxUSE_LIBXPM=builtin'
                         else
                           { { echo "$as_me:$LINENO: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}
@@ -3752,14 +3756,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_libxpm"
+          eval "$wx_cv_use_libxpm"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_libxpm >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_libxpm >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_LIBXPM" = yes; then
@@ -3790,9 +3794,9 @@ echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6; }
 if test "${with_libmspack+set}" = set; then
   withval=$with_libmspack;
                         if test "$withval" = yes; then
-                          ac_cv_use_libmspack='wxUSE_LIBMSPACK=yes'
+                          wx_cv_use_libmspack='wxUSE_LIBMSPACK=yes'
                         else
-                          ac_cv_use_libmspack='wxUSE_LIBMSPACK=no'
+                          wx_cv_use_libmspack='wxUSE_LIBMSPACK=no'
                         fi
 
 else
@@ -3804,14 +3808,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_libmspack"
+          eval "$wx_cv_use_libmspack"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_libmspack >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_libmspack >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -3837,9 +3841,9 @@ echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6; }
 if test "${with_gnomeprint+set}" = set; then
   withval=$with_gnomeprint;
                         if test "$withval" = yes; then
-                          ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes'
+                          wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes'
                         else
-                          ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no'
+                          wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no'
                         fi
 
 else
@@ -3851,14 +3855,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_gnomeprint"
+          eval "$wx_cv_use_gnomeprint"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -3884,9 +3888,9 @@ echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6; }
 if test "${with_gnomevfs+set}" = set; then
   withval=$with_gnomevfs;
                         if test "$withval" = yes; then
-                          ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes'
+                          wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes'
                         else
-                          ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no'
+                          wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no'
                         fi
 
 else
@@ -3898,14 +3902,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_gnomevfs"
+          eval "$wx_cv_use_gnomevfs"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -3931,9 +3935,9 @@ echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6; }
 if test "${with_hildon+set}" = set; then
   withval=$with_hildon;
                         if test "$withval" = yes; then
-                          ac_cv_use_hildon='wxUSE_LIBHILDON=yes'
+                          wx_cv_use_hildon='wxUSE_LIBHILDON=yes'
                         else
-                          ac_cv_use_hildon='wxUSE_LIBHILDON=no'
+                          wx_cv_use_hildon='wxUSE_LIBHILDON=no'
                         fi
 
 else
@@ -3945,14 +3949,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_hildon"
+          eval "$wx_cv_use_hildon"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_hildon >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_hildon >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -3978,9 +3982,9 @@ echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6; }
 if test "${with_opengl+set}" = set; then
   withval=$with_opengl;
                         if test "$withval" = yes; then
-                          ac_cv_use_opengl='wxUSE_OPENGL=yes'
+                          wx_cv_use_opengl='wxUSE_OPENGL=yes'
                         else
-                          ac_cv_use_opengl='wxUSE_OPENGL=no'
+                          wx_cv_use_opengl='wxUSE_OPENGL=no'
                         fi
 
 else
@@ -3992,14 +3996,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_opengl"
+          eval "$wx_cv_use_opengl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_opengl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -4028,9 +4032,9 @@ echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6; }
 if test "${with_dmalloc+set}" = set; then
   withval=$with_dmalloc;
                         if test "$withval" = yes; then
-                          ac_cv_use_dmalloc='wxUSE_DMALLOC=yes'
+                          wx_cv_use_dmalloc='wxUSE_DMALLOC=yes'
                         else
-                          ac_cv_use_dmalloc='wxUSE_DMALLOC=no'
+                          wx_cv_use_dmalloc='wxUSE_DMALLOC=no'
                         fi
 
 else
@@ -4042,14 +4046,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_dmalloc"
+          eval "$wx_cv_use_dmalloc"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -4075,9 +4079,9 @@ echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6; }
 if test "${with_sdl+set}" = set; then
   withval=$with_sdl;
                         if test "$withval" = yes; then
-                          ac_cv_use_sdl='wxUSE_LIBSDL=yes'
+                          wx_cv_use_sdl='wxUSE_LIBSDL=yes'
                         else
-                          ac_cv_use_sdl='wxUSE_LIBSDL=no'
+                          wx_cv_use_sdl='wxUSE_LIBSDL=no'
                         fi
 
 else
@@ -4089,14 +4093,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_sdl"
+          eval "$wx_cv_use_sdl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_sdl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_sdl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$withstring" = xwithout; then
@@ -4121,13 +4125,13 @@ echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6; }
 if test "${with_regex+set}" = set; then
   withval=$with_regex;
                         if test "$withval" = yes; then
-                          ac_cv_use_regex='wxUSE_REGEX=yes'
+                          wx_cv_use_regex='wxUSE_REGEX=yes'
                         elif test "$withval" = no; then
-                          ac_cv_use_regex='wxUSE_REGEX=no'
+                          wx_cv_use_regex='wxUSE_REGEX=no'
                         elif test "$withval" = sys; then
-                          ac_cv_use_regex='wxUSE_REGEX=sys'
+                          wx_cv_use_regex='wxUSE_REGEX=sys'
                         elif test "$withval" = builtin; then
-                          ac_cv_use_regex='wxUSE_REGEX=builtin'
+                          wx_cv_use_regex='wxUSE_REGEX=builtin'
                         else
                           { { echo "$as_me:$LINENO: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;}
@@ -4143,14 +4147,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_regex"
+          eval "$wx_cv_use_regex"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_regex >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_regex >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_REGEX" = yes; then
@@ -4180,13 +4184,13 @@ echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6; }
 if test "${with_zlib+set}" = set; then
   withval=$with_zlib;
                         if test "$withval" = yes; then
-                          ac_cv_use_zlib='wxUSE_ZLIB=yes'
+                          wx_cv_use_zlib='wxUSE_ZLIB=yes'
                         elif test "$withval" = no; then
-                          ac_cv_use_zlib='wxUSE_ZLIB=no'
+                          wx_cv_use_zlib='wxUSE_ZLIB=no'
                         elif test "$withval" = sys; then
-                          ac_cv_use_zlib='wxUSE_ZLIB=sys'
+                          wx_cv_use_zlib='wxUSE_ZLIB=sys'
                         elif test "$withval" = builtin; then
-                          ac_cv_use_zlib='wxUSE_ZLIB=builtin'
+                          wx_cv_use_zlib='wxUSE_ZLIB=builtin'
                         else
                           { { echo "$as_me:$LINENO: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;}
@@ -4202,14 +4206,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_zlib"
+          eval "$wx_cv_use_zlib"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_zlib >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_ZLIB" = yes; then
@@ -4239,13 +4243,13 @@ echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; }
 if test "${with_odbc+set}" = set; then
   withval=$with_odbc;
                         if test "$withval" = yes; then
-                          ac_cv_use_odbc='wxUSE_ODBC=yes'
+                          wx_cv_use_odbc='wxUSE_ODBC=yes'
                         elif test "$withval" = no; then
-                          ac_cv_use_odbc='wxUSE_ODBC=no'
+                          wx_cv_use_odbc='wxUSE_ODBC=no'
                         elif test "$withval" = sys; then
-                          ac_cv_use_odbc='wxUSE_ODBC=sys'
+                          wx_cv_use_odbc='wxUSE_ODBC=sys'
                         elif test "$withval" = builtin; then
-                          ac_cv_use_odbc='wxUSE_ODBC=builtin'
+                          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;}
@@ -4261,14 +4265,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_odbc"
+          eval "$wx_cv_use_odbc"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_odbc >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_ODBC" = yes; then
@@ -4298,13 +4302,13 @@ echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; }
 if test "${with_expat+set}" = set; then
   withval=$with_expat;
                         if test "$withval" = yes; then
-                          ac_cv_use_expat='wxUSE_EXPAT=yes'
+                          wx_cv_use_expat='wxUSE_EXPAT=yes'
                         elif test "$withval" = no; then
-                          ac_cv_use_expat='wxUSE_EXPAT=no'
+                          wx_cv_use_expat='wxUSE_EXPAT=no'
                         elif test "$withval" = sys; then
-                          ac_cv_use_expat='wxUSE_EXPAT=sys'
+                          wx_cv_use_expat='wxUSE_EXPAT=sys'
                         elif test "$withval" = builtin; then
-                          ac_cv_use_expat='wxUSE_EXPAT=builtin'
+                          wx_cv_use_expat='wxUSE_EXPAT=builtin'
                         else
                           { { echo "$as_me:$LINENO: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&5
 echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}
@@ -4320,14 +4324,14 @@ else
                           no_cache=1
                         fi
 
-                        ac_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
+                        wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
 
 fi
 
 
-          eval "$ac_cv_use_expat"
+          eval "$wx_cv_use_expat"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_expat >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_expat >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_EXPAT" = yes; then
@@ -4368,9 +4372,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
 if test "${enable_shared+set}" = set; then
   enableval=$enable_shared;
                           if test "$enableval" = yes; then
-                            ac_cv_use_shared='wxUSE_SHARED=yes'
+                            wx_cv_use_shared='wxUSE_SHARED=yes'
                           else
-                            ac_cv_use_shared='wxUSE_SHARED=no'
+                            wx_cv_use_shared='wxUSE_SHARED=no'
                           fi
 
 else
@@ -4382,14 +4386,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
+                          wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_shared"
+          eval "$wx_cv_use_shared"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_shared >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_shared >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4406,7 +4410,7 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
-          enablestring=
+          enablestring=disable
           defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
@@ -4423,9 +4427,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
 if test "${enable_optimise+set}" = set; then
   enableval=$enable_optimise;
                           if test "$enableval" = yes; then
-                            ac_cv_use_optimise='wxUSE_OPTIMISE=yes'
+                            wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
                           else
-                            ac_cv_use_optimise='wxUSE_OPTIMISE=no'
+                            wx_cv_use_optimise='wxUSE_OPTIMISE=no'
                           fi
 
 else
@@ -4437,14 +4441,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
+                          wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_optimise"
+          eval "$wx_cv_use_optimise"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_optimise >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_optimise >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4478,9 +4482,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; }
 if test "${enable_debug+set}" = set; then
   enableval=$enable_debug;
                           if test "$enableval" = yes; then
-                            ac_cv_use_debug='wxUSE_DEBUG=yes'
+                            wx_cv_use_debug='wxUSE_DEBUG=yes'
                           else
-                            ac_cv_use_debug='wxUSE_DEBUG=no'
+                            wx_cv_use_debug='wxUSE_DEBUG=no'
                           fi
 
 else
@@ -4492,14 +4496,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
+                          wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_debug"
+          eval "$wx_cv_use_debug"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_debug >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debug >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4533,9 +4537,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6; }
 if test "${enable_stl+set}" = set; then
   enableval=$enable_stl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_stl='wxUSE_STL=yes'
+                            wx_cv_use_stl='wxUSE_STL=yes'
                           else
-                            ac_cv_use_stl='wxUSE_STL=no'
+                            wx_cv_use_stl='wxUSE_STL=no'
                           fi
 
 else
@@ -4547,14 +4551,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
+                          wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_stl"
+          eval "$wx_cv_use_stl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_stl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_stl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4588,9 +4592,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >
 if test "${enable_std_iostreams+set}" = set; then
   enableval=$enable_std_iostreams;
                           if test "$enableval" = yes; then
-                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
+                            wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
                           else
-                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
+                            wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
                           fi
 
 else
@@ -4602,14 +4606,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
+                          wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_std_iostreams"
+          eval "$wx_cv_use_std_iostreams"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4643,9 +4647,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6;
 if test "${enable_std_string+set}" = set; then
   enableval=$enable_std_string;
                           if test "$enableval" = yes; then
-                            ac_cv_use_std_string='wxUSE_STD_STRING=yes'
+                            wx_cv_use_std_string='wxUSE_STD_STRING=yes'
                           else
-                            ac_cv_use_std_string='wxUSE_STD_STRING=no'
+                            wx_cv_use_std_string='wxUSE_STD_STRING=no'
                           fi
 
 else
@@ -4657,14 +4661,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
+                          wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_std_string"
+          eval "$wx_cv_use_std_string"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_std_string >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_std_string >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4698,9 +4702,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6; }
 if test "${enable_unicode+set}" = set; then
   enableval=$enable_unicode;
                           if test "$enableval" = yes; then
-                            ac_cv_use_unicode='wxUSE_UNICODE=yes'
+                            wx_cv_use_unicode='wxUSE_UNICODE=yes'
                           else
-                            ac_cv_use_unicode='wxUSE_UNICODE=no'
+                            wx_cv_use_unicode='wxUSE_UNICODE=no'
                           fi
 
 else
@@ -4712,14 +4716,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
+                          wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_unicode"
+          eval "$wx_cv_use_unicode"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_unicode >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4753,9 +4757,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6; }
 if test "${enable_mslu+set}" = set; then
   enableval=$enable_mslu;
                           if test "$enableval" = yes; then
-                            ac_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
+                            wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
                           else
-                            ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
+                            wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
                           fi
 
 else
@@ -4767,14 +4771,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
+                          wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_mslu"
+          eval "$wx_cv_use_mslu"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_mslu >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mslu >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4840,9 +4844,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; }
 if test "${enable_utf8only+set}" = set; then
   enableval=$enable_utf8only;
                           if test "$enableval" = yes; then
-                            ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes'
+                            wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes'
                           else
-                            ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
+                            wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
                           fi
 
 else
@@ -4854,14 +4858,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
+                          wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_utf8only"
+          eval "$wx_cv_use_utf8only"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_utf8only >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_utf8only >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4895,9 +4899,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >
 if test "${enable_extended_rtti+set}" = set; then
   enableval=$enable_extended_rtti;
                           if test "$enableval" = yes; then
-                            ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes'
+                            wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes'
                           else
-                            ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
+                            wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
                           fi
 
 else
@@ -4909,14 +4913,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
+                          wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_extended_rtti"
+          eval "$wx_cv_use_extended_rtti"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_extended_rtti >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_extended_rtti >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -4952,9 +4956,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; }
 if test "${enable_omf+set}" = set; then
   enableval=$enable_omf;
                           if test "$enableval" = yes; then
-                            ac_cv_use_omf='wxUSE_OMF=yes'
+                            wx_cv_use_omf='wxUSE_OMF=yes'
                           else
-                            ac_cv_use_omf='wxUSE_OMF=no'
+                            wx_cv_use_omf='wxUSE_OMF=no'
                           fi
 
 else
@@ -4966,14 +4970,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
+                          wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_omf"
+          eval "$wx_cv_use_omf"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_omf >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_omf >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5019,9 +5023,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6;
 if test "${enable_debug_flag+set}" = set; then
   enableval=$enable_debug_flag;
                           if test "$enableval" = yes; then
-                            ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
+                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
                           else
-                            ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
+                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                           fi
 
 else
@@ -5033,14 +5037,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
+                          wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_debug_flag"
+          eval "$wx_cv_use_debug_flag"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5074,9 +5078,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6;
 if test "${enable_debug_info+set}" = set; then
   enableval=$enable_debug_info;
                           if test "$enableval" = yes; then
-                            ac_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
+                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
                           else
-                            ac_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
+                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
                           fi
 
 else
@@ -5088,14 +5092,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
+                          wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_debug_info"
+          eval "$wx_cv_use_debug_info"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_debug_info >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debug_info >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5129,9 +5133,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6;
 if test "${enable_debug_gdb+set}" = set; then
   enableval=$enable_debug_gdb;
                           if test "$enableval" = yes; then
-                            ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
+                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
                           else
-                            ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
+                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
                           fi
 
 else
@@ -5143,14 +5147,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
+                          wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_debug_gdb"
+          eval "$wx_cv_use_debug_gdb"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5184,9 +5188,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6
 if test "${enable_debug_cntxt+set}" = set; then
   enableval=$enable_debug_cntxt;
                           if test "$enableval" = yes; then
-                            ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
+                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
                           else
-                            ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
+                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
                           fi
 
 else
@@ -5198,14 +5202,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
+                          wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_debug_cntxt"
+          eval "$wx_cv_use_debug_cntxt"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5239,9 +5243,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6
 if test "${enable_mem_tracing+set}" = set; then
   enableval=$enable_mem_tracing;
                           if test "$enableval" = yes; then
-                            ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
+                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
                           else
-                            ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
+                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
                           fi
 
 else
@@ -5253,14 +5257,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
+                          wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_mem_tracing"
+          eval "$wx_cv_use_mem_tracing"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5294,9 +5298,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6; }
 if test "${enable_profile+set}" = set; then
   enableval=$enable_profile;
                           if test "$enableval" = yes; then
-                            ac_cv_use_profile='wxUSE_PROFILE=yes'
+                            wx_cv_use_profile='wxUSE_PROFILE=yes'
                           else
-                            ac_cv_use_profile='wxUSE_PROFILE=no'
+                            wx_cv_use_profile='wxUSE_PROFILE=no'
                           fi
 
 else
@@ -5308,14 +5312,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
+                          wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_profile"
+          eval "$wx_cv_use_profile"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_profile >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_profile >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5349,9 +5353,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6; }
 if test "${enable_no_rtti+set}" = set; then
   enableval=$enable_no_rtti;
                           if test "$enableval" = yes; then
-                            ac_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
+                            wx_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
                           else
-                            ac_cv_use_no_rtti='wxUSE_NO_RTTI=no'
+                            wx_cv_use_no_rtti='wxUSE_NO_RTTI=no'
                           fi
 
 else
@@ -5363,14 +5367,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
+                          wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_no_rtti"
+          eval "$wx_cv_use_no_rtti"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5404,9 +5408,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >
 if test "${enable_no_exceptions+set}" = set; then
   enableval=$enable_no_exceptions;
                           if test "$enableval" = yes; then
-                            ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
+                            wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
                           else
-                            ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
+                            wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
                           fi
 
 else
@@ -5418,14 +5422,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
+                          wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_no_exceptions"
+          eval "$wx_cv_use_no_exceptions"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5459,9 +5463,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6;
 if test "${enable_permissive+set}" = set; then
   enableval=$enable_permissive;
                           if test "$enableval" = yes; then
-                            ac_cv_use_permissive='wxUSE_PERMISSIVE=yes'
+                            wx_cv_use_permissive='wxUSE_PERMISSIVE=yes'
                           else
-                            ac_cv_use_permissive='wxUSE_PERMISSIVE=no'
+                            wx_cv_use_permissive='wxUSE_PERMISSIVE=no'
                           fi
 
 else
@@ -5473,14 +5477,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
+                          wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_permissive"
+          eval "$wx_cv_use_permissive"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_permissive >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_permissive >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5514,9 +5518,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6; }
 if test "${enable_no_deps+set}" = set; then
   enableval=$enable_no_deps;
                           if test "$enableval" = yes; then
-                            ac_cv_use_no_deps='wxUSE_NO_DEPS=yes'
+                            wx_cv_use_no_deps='wxUSE_NO_DEPS=yes'
                           else
-                            ac_cv_use_no_deps='wxUSE_NO_DEPS=no'
+                            wx_cv_use_no_deps='wxUSE_NO_DEPS=no'
                           fi
 
 else
@@ -5528,14 +5532,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
+                          wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_no_deps"
+          eval "$wx_cv_use_no_deps"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_no_deps >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_no_deps >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5569,9 +5573,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >
 if test "${enable_vararg_macros+set}" = set; then
   enableval=$enable_vararg_macros;
                           if test "$enableval" = yes; then
-                            ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes'
+                            wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes'
                           else
-                            ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no'
+                            wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no'
                           fi
 
 else
@@ -5583,14 +5587,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
+                          wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_vararg_macros"
+          eval "$wx_cv_use_vararg_macros"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5657,9 +5661,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; }
 if test "${enable_compat26+set}" = set; then
   enableval=$enable_compat26;
                           if test "$enableval" = yes; then
-                            ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes'
+                            wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes'
                           else
-                            ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no'
+                            wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no'
                           fi
 
 else
@@ -5671,14 +5675,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
+                          wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_compat26"
+          eval "$wx_cv_use_compat26"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_compat26 >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_compat26 >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5712,9 +5716,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; }
 if test "${enable_compat28+set}" = set; then
   enableval=$enable_compat28;
                           if test "$enableval" = yes; then
-                            ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes'
+                            wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes'
                           else
-                            ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
+                            wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
                           fi
 
 else
@@ -5726,14 +5730,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
+                          wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_compat28"
+          eval "$wx_cv_use_compat28"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_compat28 >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_compat28 >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5768,9 +5772,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6; }
 if test "${enable_rpath+set}" = set; then
   enableval=$enable_rpath;
                           if test "$enableval" = yes; then
-                            ac_cv_use_rpath='wxUSE_RPATH=yes'
+                            wx_cv_use_rpath='wxUSE_RPATH=yes'
                           else
-                            ac_cv_use_rpath='wxUSE_RPATH=no'
+                            wx_cv_use_rpath='wxUSE_RPATH=no'
                           fi
 
 else
@@ -5782,14 +5786,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
+                          wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_rpath"
+          eval "$wx_cv_use_rpath"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_rpath >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_rpath >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5824,9 +5828,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C
 if test "${enable_objc_uniquifying+set}" = set; then
   enableval=$enable_objc_uniquifying;
                           if test "$enableval" = yes; then
-                            ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes'
+                            wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes'
                           else
-                            ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no'
+                            wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no'
                           fi
 
 else
@@ -5838,14 +5842,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
+                          wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_objc_uniquifying"
+          eval "$wx_cv_use_objc_uniquifying"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_objc_uniquifying >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_objc_uniquifying >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5863,6 +5867,62 @@ echo "${ECHO_T}$result" >&6; }
 
 
 
+          enablestring=disable
+          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}-visibility" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-visibility was given.
+if test "${enable_visibility+set}" = set; then
+  enableval=$enable_visibility;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_visibility='wxUSE_VISIBILITY=yes'
+                          else
+                            wx_cv_use_visibility='wxUSE_VISIBILITY=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_visibility"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_visibility >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_VISIBILITY = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_VISIBILITY
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+
 
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
@@ -5881,9 +5941,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6; }
 if test "${enable_intl+set}" = set; then
   enableval=$enable_intl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_intl='wxUSE_INTL=yes'
+                            wx_cv_use_intl='wxUSE_INTL=yes'
                           else
-                            ac_cv_use_intl='wxUSE_INTL=no'
+                            wx_cv_use_intl='wxUSE_INTL=no'
                           fi
 
 else
@@ -5895,14 +5955,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
+                          wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_intl"
+          eval "$wx_cv_use_intl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_intl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_intl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5936,9 +5996,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6; }
 if test "${enable_config+set}" = set; then
   enableval=$enable_config;
                           if test "$enableval" = yes; then
-                            ac_cv_use_config='wxUSE_CONFIG=yes'
+                            wx_cv_use_config='wxUSE_CONFIG=yes'
                           else
-                            ac_cv_use_config='wxUSE_CONFIG=no'
+                            wx_cv_use_config='wxUSE_CONFIG=no'
                           fi
 
 else
@@ -5950,14 +6010,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
+                          wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_config"
+          eval "$wx_cv_use_config"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_config >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_config >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5992,9 +6052,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6;
 if test "${enable_protocols+set}" = set; then
   enableval=$enable_protocols;
                           if test "$enableval" = yes; then
-                            ac_cv_use_protocols='wxUSE_PROTOCOL=yes'
+                            wx_cv_use_protocols='wxUSE_PROTOCOL=yes'
                           else
-                            ac_cv_use_protocols='wxUSE_PROTOCOL=no'
+                            wx_cv_use_protocols='wxUSE_PROTOCOL=no'
                           fi
 
 else
@@ -6006,14 +6066,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
+                          wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_protocols"
+          eval "$wx_cv_use_protocols"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_protocols >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_protocols >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6047,9 +6107,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6; }
 if test "${enable_ftp+set}" = set; then
   enableval=$enable_ftp;
                           if test "$enableval" = yes; then
-                            ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
+                            wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else
-                            ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
+                            wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
 
 else
@@ -6061,14 +6121,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
+                          wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_ftp"
+          eval "$wx_cv_use_ftp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_ftp >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_ftp >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6102,9 +6162,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6; }
 if test "${enable_http+set}" = set; then
   enableval=$enable_http;
                           if test "$enableval" = yes; then
-                            ac_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
+                            wx_cv_use_http='wxUSE_PROTOCOL_HTTP=yes'
                           else
-                            ac_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
+                            wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
 
 else
@@ -6116,14 +6176,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
+                          wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_http"
+          eval "$wx_cv_use_http"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_http >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_http >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6157,9 +6217,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6;
 if test "${enable_fileproto+set}" = set; then
   enableval=$enable_fileproto;
                           if test "$enableval" = yes; then
-                            ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
+                            wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes'
                           else
-                            ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
+                            wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
                           fi
 
 else
@@ -6171,14 +6231,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
+                          wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_fileproto"
+          eval "$wx_cv_use_fileproto"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fileproto >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fileproto >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6212,9 +6272,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6; }
 if test "${enable_sockets+set}" = set; then
   enableval=$enable_sockets;
                           if test "$enableval" = yes; then
-                            ac_cv_use_sockets='wxUSE_SOCKETS=yes'
+                            wx_cv_use_sockets='wxUSE_SOCKETS=yes'
                           else
-                            ac_cv_use_sockets='wxUSE_SOCKETS=no'
+                            wx_cv_use_sockets='wxUSE_SOCKETS=no'
                           fi
 
 else
@@ -6226,14 +6286,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
+                          wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_sockets"
+          eval "$wx_cv_use_sockets"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_sockets >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_sockets >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6267,9 +6327,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6; }
 if test "${enable_ole+set}" = set; then
   enableval=$enable_ole;
                           if test "$enableval" = yes; then
-                            ac_cv_use_ole='wxUSE_OLE=yes'
+                            wx_cv_use_ole='wxUSE_OLE=yes'
                           else
-                            ac_cv_use_ole='wxUSE_OLE=no'
+                            wx_cv_use_ole='wxUSE_OLE=no'
                           fi
 
 else
@@ -6281,14 +6341,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
+                          wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_ole"
+          eval "$wx_cv_use_ole"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_ole >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_ole >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6322,9 +6382,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6; }
 if test "${enable_dataobj+set}" = set; then
   enableval=$enable_dataobj;
                           if test "$enableval" = yes; then
-                            ac_cv_use_dataobj='wxUSE_DATAOBJ=yes'
+                            wx_cv_use_dataobj='wxUSE_DATAOBJ=yes'
                           else
-                            ac_cv_use_dataobj='wxUSE_DATAOBJ=no'
+                            wx_cv_use_dataobj='wxUSE_DATAOBJ=no'
                           fi
 
 else
@@ -6336,14 +6396,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
+                          wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_dataobj"
+          eval "$wx_cv_use_dataobj"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dataobj >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dataobj >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6378,9 +6438,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6; }
 if test "${enable_ipc+set}" = set; then
   enableval=$enable_ipc;
                           if test "$enableval" = yes; then
-                            ac_cv_use_ipc='wxUSE_IPC=yes'
+                            wx_cv_use_ipc='wxUSE_IPC=yes'
                           else
-                            ac_cv_use_ipc='wxUSE_IPC=no'
+                            wx_cv_use_ipc='wxUSE_IPC=no'
                           fi
 
 else
@@ -6392,14 +6452,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
+                          wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_ipc"
+          eval "$wx_cv_use_ipc"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_ipc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_ipc >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6417,6 +6477,172 @@ 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}-baseevtloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-baseevtloop... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-baseevtloop was given.
+if test "${enable_baseevtloop+set}" = set; then
+  enableval=$enable_baseevtloop;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes'
+                          else
+                            wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_baseevtloop"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_baseevtloop >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_CONSOLE_EVENTLOOP = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_CONSOLE_EVENTLOOP
+          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}-epoolloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-epoolloop... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-epoolloop was given.
+if test "${enable_epoolloop+set}" = set; then
+  enableval=$enable_epoolloop;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes'
+                          else
+                            wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_epoolloop"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_epoolloop >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_EPOLL_DISPATCHER = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_EPOLL_DISPATCHER
+          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}-selectloop" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-selectloop... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-selectloop was given.
+if test "${enable_selectloop+set}" = set; then
+  enableval=$enable_selectloop;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes'
+                          else
+                            wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_selectloop"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_selectloop >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SELECT_DISPATCHER = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_SELECT_DISPATCHER
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -6434,9 +6660,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6;
 if test "${enable_apple_ieee+set}" = set; then
   enableval=$enable_apple_ieee;
                           if test "$enableval" = yes; then
-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
+                            wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
                           else
-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+                            wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
                           fi
 
 else
@@ -6448,14 +6674,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
+                          wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_apple_ieee"
+          eval "$wx_cv_use_apple_ieee"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6489,9 +6715,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6;
 if test "${enable_arcstream+set}" = set; then
   enableval=$enable_arcstream;
                           if test "$enableval" = yes; then
-                            ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes'
+                            wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes'
                           else
-                            ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'
+                            wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'
                           fi
 
 else
@@ -6503,14 +6729,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
+                          wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_arcstream"
+          eval "$wx_cv_use_arcstream"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_arcstream >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_arcstream >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6544,9 +6770,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-base64... $ECHO_C" >&6; }
 if test "${enable_base64+set}" = set; then
   enableval=$enable_base64;
                           if test "$enableval" = yes; then
-                            ac_cv_use_base64='wxUSE_BASE64=yes'
+                            wx_cv_use_base64='wxUSE_BASE64=yes'
                           else
-                            ac_cv_use_base64='wxUSE_BASE64=no'
+                            wx_cv_use_base64='wxUSE_BASE64=no'
                           fi
 
 else
@@ -6558,14 +6784,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
+                          wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_base64"
+          eval "$wx_cv_use_base64"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_base64 >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_base64 >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6599,9 +6825,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6;
 if test "${enable_backtrace+set}" = set; then
   enableval=$enable_backtrace;
                           if test "$enableval" = yes; then
-                            ac_cv_use_backtrace='wxUSE_STACKWALKER=yes'
+                            wx_cv_use_backtrace='wxUSE_STACKWALKER=yes'
                           else
-                            ac_cv_use_backtrace='wxUSE_STACKWALKER=no'
+                            wx_cv_use_backtrace='wxUSE_STACKWALKER=no'
                           fi
 
 else
@@ -6613,14 +6839,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
+                          wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_backtrace"
+          eval "$wx_cv_use_backtrace"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_backtrace >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_backtrace >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6654,9 +6880,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6
 if test "${enable_catch_segvs+set}" = set; then
   enableval=$enable_catch_segvs;
                           if test "$enableval" = yes; then
-                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
+                            wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
                           else
-                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
+                            wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
                           fi
 
 else
@@ -6668,14 +6894,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
+                          wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_catch_segvs"
+          eval "$wx_cv_use_catch_segvs"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6709,9 +6935,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6; }
 if test "${enable_cmdline+set}" = set; then
   enableval=$enable_cmdline;
                           if test "$enableval" = yes; then
-                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
+                            wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
                           else
-                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
+                            wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
                           fi
 
 else
@@ -6723,14 +6949,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
+                          wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_cmdline"
+          eval "$wx_cv_use_cmdline"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6764,9 +6990,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6; }
 if test "${enable_datetime+set}" = set; then
   enableval=$enable_datetime;
                           if test "$enableval" = yes; then
-                            ac_cv_use_datetime='wxUSE_DATETIME=yes'
+                            wx_cv_use_datetime='wxUSE_DATETIME=yes'
                           else
-                            ac_cv_use_datetime='wxUSE_DATETIME=no'
+                            wx_cv_use_datetime='wxUSE_DATETIME=no'
                           fi
 
 else
@@ -6778,14 +7004,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
+                          wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_datetime"
+          eval "$wx_cv_use_datetime"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_datetime >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6819,9 +7045,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6
 if test "${enable_debugreport+set}" = set; then
   enableval=$enable_debugreport;
                           if test "$enableval" = yes; then
-                            ac_cv_use_debugreport='wxUSE_DEBUGREPORT=yes'
+                            wx_cv_use_debugreport='wxUSE_DEBUGREPORT=yes'
                           else
-                            ac_cv_use_debugreport='wxUSE_DEBUGREPORT=no'
+                            wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no'
                           fi
 
 else
@@ -6833,14 +7059,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
+                          wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_debugreport"
+          eval "$wx_cv_use_debugreport"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_debugreport >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_debugreport >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6874,9 +7100,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6;
 if test "${enable_dialupman+set}" = set; then
   enableval=$enable_dialupman;
                           if test "$enableval" = yes; then
-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
+                            wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
                           else
-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+                            wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
                           fi
 
 else
@@ -6888,14 +7114,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
+                          wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_dialupman"
+          eval "$wx_cv_use_dialupman"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6929,9 +7155,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6; }
 if test "${enable_dynlib+set}" = set; then
   enableval=$enable_dynlib;
                           if test "$enableval" = yes; then
-                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
+                            wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
                           else
-                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
+                            wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
                           fi
 
 else
@@ -6943,14 +7169,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
+                          wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_dynlib"
+          eval "$wx_cv_use_dynlib"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -6984,9 +7210,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >
 if test "${enable_dynamicloader+set}" = set; then
   enableval=$enable_dynamicloader;
                           if test "$enableval" = yes; then
-                            ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
+                            wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
                           else
-                            ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
+                            wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
                           fi
 
 else
@@ -6998,14 +7224,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
+                          wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_dynamicloader"
+          eval "$wx_cv_use_dynamicloader"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7039,9 +7265,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6;
 if test "${enable_exceptions+set}" = set; then
   enableval=$enable_exceptions;
                           if test "$enableval" = yes; then
-                            ac_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'
+                            wx_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'
                           else
-                            ac_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
+                            wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
                           fi
 
 else
@@ -7053,14 +7279,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
+                          wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_exceptions"
+          eval "$wx_cv_use_exceptions"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_exceptions >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_exceptions >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7094,9 +7320,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6; }
 if test "${enable_ffile+set}" = set; then
   enableval=$enable_ffile;
                           if test "$enableval" = yes; then
-                            ac_cv_use_ffile='wxUSE_FFILE=yes'
+                            wx_cv_use_ffile='wxUSE_FFILE=yes'
                           else
-                            ac_cv_use_ffile='wxUSE_FFILE=no'
+                            wx_cv_use_ffile='wxUSE_FFILE=no'
                           fi
 
 else
@@ -7108,14 +7334,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
+                          wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_ffile"
+          eval "$wx_cv_use_ffile"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_ffile >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7149,9 +7375,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6; }
 if test "${enable_file+set}" = set; then
   enableval=$enable_file;
                           if test "$enableval" = yes; then
-                            ac_cv_use_file='wxUSE_FILE=yes'
+                            wx_cv_use_file='wxUSE_FILE=yes'
                           else
-                            ac_cv_use_file='wxUSE_FILE=no'
+                            wx_cv_use_file='wxUSE_FILE=no'
                           fi
 
 else
@@ -7163,14 +7389,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
+                          wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_file"
+          eval "$wx_cv_use_file"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_file >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7204,9 +7430,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6;
 if test "${enable_filesystem+set}" = set; then
   enableval=$enable_filesystem;
                           if test "$enableval" = yes; then
-                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
+                            wx_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
                           else
-                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
+                            wx_cv_use_filesystem='wxUSE_FILESYSTEM=no'
                           fi
 
 else
@@ -7218,14 +7444,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
+                          wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_filesystem"
+          eval "$wx_cv_use_filesystem"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7259,9 +7485,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6; }
 if test "${enable_fontmap+set}" = set; then
   enableval=$enable_fontmap;
                           if test "$enableval" = yes; then
-                            ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
+                            wx_cv_use_fontmap='wxUSE_FONTMAP=yes'
                           else
-                            ac_cv_use_fontmap='wxUSE_FONTMAP=no'
+                            wx_cv_use_fontmap='wxUSE_FONTMAP=no'
                           fi
 
 else
@@ -7273,14 +7499,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
+                          wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_fontmap"
+          eval "$wx_cv_use_fontmap"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7314,9 +7540,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6;
 if test "${enable_fs_archive+set}" = set; then
   enableval=$enable_fs_archive;
                           if test "$enableval" = yes; then
-                            ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes'
+                            wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes'
                           else
-                            ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no'
+                            wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no'
                           fi
 
 else
@@ -7328,14 +7554,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
+                          wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_fs_archive"
+          eval "$wx_cv_use_fs_archive"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7369,9 +7595,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6; }
 if test "${enable_fs_inet+set}" = set; then
   enableval=$enable_fs_inet;
                           if test "$enableval" = yes; then
-                            ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
+                            wx_cv_use_fs_inet='wxUSE_FS_INET=yes'
                           else
-                            ac_cv_use_fs_inet='wxUSE_FS_INET=no'
+                            wx_cv_use_fs_inet='wxUSE_FS_INET=no'
                           fi
 
 else
@@ -7383,14 +7609,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
+                          wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_fs_inet"
+          eval "$wx_cv_use_fs_inet"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7424,9 +7650,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6; }
 if test "${enable_fs_zip+set}" = set; then
   enableval=$enable_fs_zip;
                           if test "$enableval" = yes; then
-                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
+                            wx_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
                           else
-                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
+                            wx_cv_use_fs_zip='wxUSE_FS_ZIP=no'
                           fi
 
 else
@@ -7438,14 +7664,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
+                          wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_fs_zip"
+          eval "$wx_cv_use_fs_zip"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7479,9 +7705,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6; }
 if test "${enable_geometry+set}" = set; then
   enableval=$enable_geometry;
                           if test "$enableval" = yes; then
-                            ac_cv_use_geometry='wxUSE_GEOMETRY=yes'
+                            wx_cv_use_geometry='wxUSE_GEOMETRY=yes'
                           else
-                            ac_cv_use_geometry='wxUSE_GEOMETRY=no'
+                            wx_cv_use_geometry='wxUSE_GEOMETRY=no'
                           fi
 
 else
@@ -7493,14 +7719,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
+                          wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_geometry"
+          eval "$wx_cv_use_geometry"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_geometry >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7534,9 +7760,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6; }
 if test "${enable_log+set}" = set; then
   enableval=$enable_log;
                           if test "$enableval" = yes; then
-                            ac_cv_use_log='wxUSE_LOG=yes'
+                            wx_cv_use_log='wxUSE_LOG=yes'
                           else
-                            ac_cv_use_log='wxUSE_LOG=no'
+                            wx_cv_use_log='wxUSE_LOG=no'
                           fi
 
 else
@@ -7548,14 +7774,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
+                          wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_log"
+          eval "$wx_cv_use_log"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_log >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7589,9 +7815,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6; }
 if test "${enable_longlong+set}" = set; then
   enableval=$enable_longlong;
                           if test "$enableval" = yes; then
-                            ac_cv_use_longlong='wxUSE_LONGLONG=yes'
+                            wx_cv_use_longlong='wxUSE_LONGLONG=yes'
                           else
-                            ac_cv_use_longlong='wxUSE_LONGLONG=no'
+                            wx_cv_use_longlong='wxUSE_LONGLONG=no'
                           fi
 
 else
@@ -7603,14 +7829,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
+                          wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_longlong"
+          eval "$wx_cv_use_longlong"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_longlong >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7644,9 +7870,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6; }
 if test "${enable_mimetype+set}" = set; then
   enableval=$enable_mimetype;
                           if test "$enableval" = yes; then
-                            ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
+                            wx_cv_use_mimetype='wxUSE_MIMETYPE=yes'
                           else
-                            ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
+                            wx_cv_use_mimetype='wxUSE_MIMETYPE=no'
                           fi
 
 else
@@ -7658,14 +7884,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
+                          wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_mimetype"
+          eval "$wx_cv_use_mimetype"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7699,9 +7925,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6; }
 if test "${enable_snglinst+set}" = set; then
   enableval=$enable_snglinst;
                           if test "$enableval" = yes; then
-                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
+                            wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
                           else
-                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
+                            wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
                           fi
 
 else
@@ -7713,14 +7939,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
+                          wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_snglinst"
+          eval "$wx_cv_use_snglinst"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7754,9 +7980,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6; }
 if test "${enable_stdpaths+set}" = set; then
   enableval=$enable_stdpaths;
                           if test "$enableval" = yes; then
-                            ac_cv_use_stdpaths='wxUSE_STDPATHS=yes'
+                            wx_cv_use_stdpaths='wxUSE_STDPATHS=yes'
                           else
-                            ac_cv_use_stdpaths='wxUSE_STDPATHS=no'
+                            wx_cv_use_stdpaths='wxUSE_STDPATHS=no'
                           fi
 
 else
@@ -7768,14 +7994,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
+                          wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_stdpaths"
+          eval "$wx_cv_use_stdpaths"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7809,9 +8035,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6;
 if test "${enable_stopwatch+set}" = set; then
   enableval=$enable_stopwatch;
                           if test "$enableval" = yes; then
-                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
+                            wx_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
                           else
-                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
+                            wx_cv_use_stopwatch='wxUSE_STOPWATCH=no'
                           fi
 
 else
@@ -7823,14 +8049,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
+                          wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_stopwatch"
+          eval "$wx_cv_use_stopwatch"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7864,9 +8090,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6; }
 if test "${enable_streams+set}" = set; then
   enableval=$enable_streams;
                           if test "$enableval" = yes; then
-                            ac_cv_use_streams='wxUSE_STREAMS=yes'
+                            wx_cv_use_streams='wxUSE_STREAMS=yes'
                           else
-                            ac_cv_use_streams='wxUSE_STREAMS=no'
+                            wx_cv_use_streams='wxUSE_STREAMS=no'
                           fi
 
 else
@@ -7878,14 +8104,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
+                          wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_streams"
+          eval "$wx_cv_use_streams"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_streams >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7919,9 +8145,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C"
 if test "${enable_system_options+set}" = set; then
   enableval=$enable_system_options;
                           if test "$enableval" = yes; then
-                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
+                            wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
                           else
-                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
+                            wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
                           fi
 
 else
@@ -7933,14 +8159,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
+                          wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_system_options"
+          eval "$wx_cv_use_system_options"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_system_options >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -7974,9 +8200,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6;
 if test "${enable_tarstream+set}" = set; then
   enableval=$enable_tarstream;
                           if test "$enableval" = yes; then
-                            ac_cv_use_tarstream='wxUSE_TARSTREAM=yes'
+                            wx_cv_use_tarstream='wxUSE_TARSTREAM=yes'
                           else
-                            ac_cv_use_tarstream='wxUSE_TARSTREAM=no'
+                            wx_cv_use_tarstream='wxUSE_TARSTREAM=no'
                           fi
 
 else
@@ -7988,14 +8214,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
+                          wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_tarstream"
+          eval "$wx_cv_use_tarstream"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tarstream >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tarstream >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8029,9 +8255,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6; }
 if test "${enable_textbuf+set}" = set; then
   enableval=$enable_textbuf;
                           if test "$enableval" = yes; then
-                            ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
+                            wx_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
                           else
-                            ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
+                            wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
                           fi
 
 else
@@ -8043,14 +8269,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
+                          wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_textbuf"
+          eval "$wx_cv_use_textbuf"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8084,9 +8310,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6; }
 if test "${enable_textfile+set}" = set; then
   enableval=$enable_textfile;
                           if test "$enableval" = yes; then
-                            ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
+                            wx_cv_use_textfile='wxUSE_TEXTFILE=yes'
                           else
-                            ac_cv_use_textfile='wxUSE_TEXTFILE=no'
+                            wx_cv_use_textfile='wxUSE_TEXTFILE=no'
                           fi
 
 else
@@ -8098,14 +8324,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
+                          wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_textfile"
+          eval "$wx_cv_use_textfile"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_textfile >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8139,9 +8365,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6; }
 if test "${enable_timer+set}" = set; then
   enableval=$enable_timer;
                           if test "$enableval" = yes; then
-                            ac_cv_use_timer='wxUSE_TIMER=yes'
+                            wx_cv_use_timer='wxUSE_TIMER=yes'
                           else
-                            ac_cv_use_timer='wxUSE_TIMER=no'
+                            wx_cv_use_timer='wxUSE_TIMER=no'
                           fi
 
 else
@@ -8153,14 +8379,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
+                          wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_timer"
+          eval "$wx_cv_use_timer"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_timer >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8194,9 +8420,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; }
 if test "${enable_sound+set}" = set; then
   enableval=$enable_sound;
                           if test "$enableval" = yes; then
-                            ac_cv_use_sound='wxUSE_SOUND=yes'
+                            wx_cv_use_sound='wxUSE_SOUND=yes'
                           else
-                            ac_cv_use_sound='wxUSE_SOUND=no'
+                            wx_cv_use_sound='wxUSE_SOUND=no'
                           fi
 
 else
@@ -8208,14 +8434,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
+                          wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_sound"
+          eval "$wx_cv_use_sound"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_sound >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_sound >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8249,9 +8475,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6;
 if test "${enable_mediactrl+set}" = set; then
   enableval=$enable_mediactrl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
+                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
                           else
-                            ac_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
+                            wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
                           fi
 
 else
@@ -8263,14 +8489,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
+                          wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_mediactrl"
+          eval "$wx_cv_use_mediactrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_mediactrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mediactrl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8304,9 +8530,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6;
 if test "${enable_gstreamer8+set}" = set; then
   enableval=$enable_gstreamer8;
                           if test "$enableval" = yes; then
-                            ac_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
+                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
                           else
-                            ac_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
+                            wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
                           fi
 
 else
@@ -8318,14 +8544,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
+                          wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_gstreamer8"
+          eval "$wx_cv_use_gstreamer8"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gstreamer8 >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gstreamer8 >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8359,9 +8585,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C"
 if test "${enable_printfposparam+set}" = set; then
   enableval=$enable_printfposparam;
                           if test "$enableval" = yes; then
-                            ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
+                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
                           else
-                            ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
+                            wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
                           fi
 
 else
@@ -8373,14 +8599,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
+                          wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_printfposparam"
+          eval "$wx_cv_use_printfposparam"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_printfposparam >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_printfposparam >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8414,9 +8640,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6;
 if test "${enable_zipstream+set}" = set; then
   enableval=$enable_zipstream;
                           if test "$enableval" = yes; then
-                            ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
+                            wx_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
                           else
-                            ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
+                            wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
                           fi
 
 else
@@ -8428,14 +8654,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
+                          wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_zipstream"
+          eval "$wx_cv_use_zipstream"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8470,9 +8696,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6; }
 if test "${enable_url+set}" = set; then
   enableval=$enable_url;
                           if test "$enableval" = yes; then
-                            ac_cv_use_url='wxUSE_URL=yes'
+                            wx_cv_use_url='wxUSE_URL=yes'
                           else
-                            ac_cv_use_url='wxUSE_URL=no'
+                            wx_cv_use_url='wxUSE_URL=no'
                           fi
 
 else
@@ -8484,14 +8710,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
+                          wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_url"
+          eval "$wx_cv_use_url"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_url >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_url >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8525,9 +8751,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; }
 if test "${enable_variant+set}" = set; then
   enableval=$enable_variant;
                           if test "$enableval" = yes; then
-                            ac_cv_use_variant='wxUSE_VARIANT=yes'
+                            wx_cv_use_variant='wxUSE_VARIANT=yes'
                           else
-                            ac_cv_use_variant='wxUSE_VARIANT=no'
+                            wx_cv_use_variant='wxUSE_VARIANT=no'
                           fi
 
 else
@@ -8539,14 +8765,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
+                          wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_variant"
+          eval "$wx_cv_use_variant"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_variant >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_variant >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8580,9 +8806,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6; }
 if test "${enable_protocol+set}" = set; then
   enableval=$enable_protocol;
                           if test "$enableval" = yes; then
-                            ac_cv_use_protocol='wxUSE_PROTOCOL=yes'
+                            wx_cv_use_protocol='wxUSE_PROTOCOL=yes'
                           else
-                            ac_cv_use_protocol='wxUSE_PROTOCOL=no'
+                            wx_cv_use_protocol='wxUSE_PROTOCOL=no'
                           fi
 
 else
@@ -8594,14 +8820,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
+                          wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_protocol"
+          eval "$wx_cv_use_protocol"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_protocol >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_protocol >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8635,9 +8861,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >
 if test "${enable_protocol_http+set}" = set; then
   enableval=$enable_protocol_http;
                           if test "$enableval" = yes; then
-                            ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
+                            wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes'
                           else
-                            ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
+                            wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
                           fi
 
 else
@@ -8649,14 +8875,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
+                          wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_protocol_http"
+          eval "$wx_cv_use_protocol_http"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8690,9 +8916,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&
 if test "${enable_protocol_ftp+set}" = set; then
   enableval=$enable_protocol_ftp;
                           if test "$enableval" = yes; then
-                            ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
+                            wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes'
                           else
-                            ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
+                            wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
                           fi
 
 else
@@ -8704,14 +8930,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
+                          wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_protocol_ftp"
+          eval "$wx_cv_use_protocol_ftp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8745,9 +8971,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >
 if test "${enable_protocol_file+set}" = set; then
   enableval=$enable_protocol_file;
                           if test "$enableval" = yes; then
-                            ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
+                            wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes'
                           else
-                            ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
+                            wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
                           fi
 
 else
@@ -8759,14 +8985,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
+                          wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_protocol_file"
+          eval "$wx_cv_use_protocol_file"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8801,9 +9027,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6; }
 if test "${enable_threads+set}" = set; then
   enableval=$enable_threads;
                           if test "$enableval" = yes; then
-                            ac_cv_use_threads='wxUSE_THREADS=yes'
+                            wx_cv_use_threads='wxUSE_THREADS=yes'
                           else
-                            ac_cv_use_threads='wxUSE_THREADS=no'
+                            wx_cv_use_threads='wxUSE_THREADS=no'
                           fi
 
 else
@@ -8815,14 +9041,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
+                          wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_threads"
+          eval "$wx_cv_use_threads"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_threads >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8860,9 +9086,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6; }
 if test "${enable_docview+set}" = set; then
   enableval=$enable_docview;
                           if test "$enableval" = yes; then
-                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
+                            wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
                           else
-                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
+                            wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
                           fi
 
 else
@@ -8874,14 +9100,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
+                          wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_docview"
+          eval "$wx_cv_use_docview"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_docview >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8915,9 +9141,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6; }
 if test "${enable_help+set}" = set; then
   enableval=$enable_help;
                           if test "$enableval" = yes; then
-                            ac_cv_use_help='wxUSE_HELP=yes'
+                            wx_cv_use_help='wxUSE_HELP=yes'
                           else
-                            ac_cv_use_help='wxUSE_HELP=no'
+                            wx_cv_use_help='wxUSE_HELP=no'
                           fi
 
 else
@@ -8929,14 +9155,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
+                          wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_help"
+          eval "$wx_cv_use_help"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_help >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -8970,9 +9196,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6;
 if test "${enable_mshtmlhelp+set}" = set; then
   enableval=$enable_mshtmlhelp;
                           if test "$enableval" = yes; then
-                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
+                            wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
                           else
-                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
+                            wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
                           fi
 
 else
@@ -8984,14 +9210,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
+                          wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_mshtmlhelp"
+          eval "$wx_cv_use_mshtmlhelp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9025,9 +9251,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6; }
 if test "${enable_html+set}" = set; then
   enableval=$enable_html;
                           if test "$enableval" = yes; then
-                            ac_cv_use_html='wxUSE_HTML=yes'
+                            wx_cv_use_html='wxUSE_HTML=yes'
                           else
-                            ac_cv_use_html='wxUSE_HTML=no'
+                            wx_cv_use_html='wxUSE_HTML=no'
                           fi
 
 else
@@ -9039,14 +9265,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
+                          wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_html"
+          eval "$wx_cv_use_html"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_html >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9080,9 +9306,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6; }
 if test "${enable_htmlhelp+set}" = set; then
   enableval=$enable_htmlhelp;
                           if test "$enableval" = yes; then
-                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
+                            wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
                           else
-                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
+                            wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
                           fi
 
 else
@@ -9094,14 +9320,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
+                          wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_htmlhelp"
+          eval "$wx_cv_use_htmlhelp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9135,9 +9361,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6; }
 if test "${enable_xrc+set}" = set; then
   enableval=$enable_xrc;
                           if test "$enableval" = yes; then
-                            ac_cv_use_xrc='wxUSE_XRC=yes'
+                            wx_cv_use_xrc='wxUSE_XRC=yes'
                           else
-                            ac_cv_use_xrc='wxUSE_XRC=no'
+                            wx_cv_use_xrc='wxUSE_XRC=no'
                           fi
 
 else
@@ -9149,14 +9375,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
+                          wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_xrc"
+          eval "$wx_cv_use_xrc"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_xrc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_xrc >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9190,9 +9416,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6; }
 if test "${enable_aui+set}" = set; then
   enableval=$enable_aui;
                           if test "$enableval" = yes; then
-                            ac_cv_use_aui='wxUSE_AUI=yes'
+                            wx_cv_use_aui='wxUSE_AUI=yes'
                           else
-                            ac_cv_use_aui='wxUSE_AUI=no'
+                            wx_cv_use_aui='wxUSE_AUI=no'
                           fi
 
 else
@@ -9204,14 +9430,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
+                          wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_aui"
+          eval "$wx_cv_use_aui"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_aui >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_aui >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9245,9 +9471,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; }
 if test "${enable_stc+set}" = set; then
   enableval=$enable_stc;
                           if test "$enableval" = yes; then
-                            ac_cv_use_stc='wxUSE_STC=yes'
+                            wx_cv_use_stc='wxUSE_STC=yes'
                           else
-                            ac_cv_use_stc='wxUSE_STC=no'
+                            wx_cv_use_stc='wxUSE_STC=no'
                           fi
 
 else
@@ -9259,14 +9485,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
+                          wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_stc"
+          eval "$wx_cv_use_stc"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_stc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_stc >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9300,9 +9526,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6
 if test "${enable_constraints+set}" = set; then
   enableval=$enable_constraints;
                           if test "$enableval" = yes; then
-                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
+                            wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
                           else
-                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
+                            wx_cv_use_constraints='wxUSE_CONSTRAINTS=no'
                           fi
 
 else
@@ -9314,14 +9540,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
+                          wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_constraints"
+          eval "$wx_cv_use_constraints"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_constraints >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9355,9 +9581,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6;
 if test "${enable_printarch+set}" = set; then
   enableval=$enable_printarch;
                           if test "$enableval" = yes; then
-                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
                           else
-                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+                            wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
                           fi
 
 else
@@ -9369,14 +9595,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
+                          wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_printarch"
+          eval "$wx_cv_use_printarch"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_printarch >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9410,9 +9636,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; }
 if test "${enable_mdi+set}" = set; then
   enableval=$enable_mdi;
                           if test "$enableval" = yes; then
-                            ac_cv_use_mdi='wxUSE_MDI=yes'
+                            wx_cv_use_mdi='wxUSE_MDI=yes'
                           else
-                            ac_cv_use_mdi='wxUSE_MDI=no'
+                            wx_cv_use_mdi='wxUSE_MDI=no'
                           fi
 
 else
@@ -9424,14 +9650,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
+                          wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_mdi"
+          eval "$wx_cv_use_mdi"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mdi >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9465,9 +9691,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; }
 if test "${enable_mdidoc+set}" = set; then
   enableval=$enable_mdidoc;
                           if test "$enableval" = yes; then
-                            ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
+                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
                           else
-                            ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
+                            wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
                           fi
 
 else
@@ -9479,14 +9705,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
+                          wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_mdidoc"
+          eval "$wx_cv_use_mdidoc"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9520,9 +9746,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; }
 if test "${enable_loggui+set}" = set; then
   enableval=$enable_loggui;
                           if test "$enableval" = yes; then
-                            ac_cv_use_loggui='wxUSE_LOGGUI=yes'
+                            wx_cv_use_loggui='wxUSE_LOGGUI=yes'
                           else
-                            ac_cv_use_loggui='wxUSE_LOGGUI=no'
+                            wx_cv_use_loggui='wxUSE_LOGGUI=no'
                           fi
 
 else
@@ -9534,14 +9760,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
+                          wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_loggui"
+          eval "$wx_cv_use_loggui"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_loggui >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9575,9 +9801,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; }
 if test "${enable_logwin+set}" = set; then
   enableval=$enable_logwin;
                           if test "$enableval" = yes; then
-                            ac_cv_use_logwin='wxUSE_LOGWINDOW=yes'
+                            wx_cv_use_logwin='wxUSE_LOGWINDOW=yes'
                           else
-                            ac_cv_use_logwin='wxUSE_LOGWINDOW=no'
+                            wx_cv_use_logwin='wxUSE_LOGWINDOW=no'
                           fi
 
 else
@@ -9589,14 +9815,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
+                          wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_logwin"
+          eval "$wx_cv_use_logwin"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_logwin >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9630,9 +9856,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6;
 if test "${enable_logdialog+set}" = set; then
   enableval=$enable_logdialog;
                           if test "$enableval" = yes; then
-                            ac_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
+                            wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
                           else
-                            ac_cv_use_logdialog='wxUSE_LOGDIALOG=no'
+                            wx_cv_use_logdialog='wxUSE_LOGDIALOG=no'
                           fi
 
 else
@@ -9644,14 +9870,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
+                          wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_logdialog"
+          eval "$wx_cv_use_logdialog"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_logdialog >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_logdialog >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9685,9 +9911,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; }
 if test "${enable_webkit+set}" = set; then
   enableval=$enable_webkit;
                           if test "$enableval" = yes; then
-                            ac_cv_use_webkit='wxUSE_WEBKIT=yes'
+                            wx_cv_use_webkit='wxUSE_WEBKIT=yes'
                           else
-                            ac_cv_use_webkit='wxUSE_WEBKIT=no'
+                            wx_cv_use_webkit='wxUSE_WEBKIT=no'
                           fi
 
 else
@@ -9699,14 +9925,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
+                          wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_webkit"
+          eval "$wx_cv_use_webkit"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_webkit >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_webkit >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9740,9 +9966,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6; }
 if test "${enable_richtext+set}" = set; then
   enableval=$enable_richtext;
                           if test "$enableval" = yes; then
-                            ac_cv_use_richtext='wxUSE_RICHTEXT=yes'
+                            wx_cv_use_richtext='wxUSE_RICHTEXT=yes'
                           else
-                            ac_cv_use_richtext='wxUSE_RICHTEXT=no'
+                            wx_cv_use_richtext='wxUSE_RICHTEXT=no'
                           fi
 
 else
@@ -9754,14 +9980,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
+                          wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_richtext"
+          eval "$wx_cv_use_richtext"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_richtext >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_richtext >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9795,9 +10021,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&
 if test "${enable_graphics_ctx+set}" = set; then
   enableval=$enable_graphics_ctx;
                           if test "$enableval" = yes; then
-                            ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
+                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
                           else
-                            ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
+                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
                           fi
 
 else
@@ -9809,14 +10035,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
+                          wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_graphics_ctx"
+          eval "$wx_cv_use_graphics_ctx"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9850,9 +10076,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6;
 if test "${enable_postscript+set}" = set; then
   enableval=$enable_postscript;
                           if test "$enableval" = yes; then
-                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
+                            wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
                           else
-                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
+                            wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
                           fi
 
 else
@@ -9864,14 +10090,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
+                          wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_postscript"
+          eval "$wx_cv_use_postscript"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_postscript >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9905,9 +10131,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; }
 if test "${enable_svg+set}" = set; then
   enableval=$enable_svg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_svg='wxUSE_SVG=yes'
+                            wx_cv_use_svg='wxUSE_SVG=yes'
                           else
-                            ac_cv_use_svg='wxUSE_SVG=no'
+                            wx_cv_use_svg='wxUSE_SVG=no'
                           fi
 
 else
@@ -9919,14 +10145,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
+                          wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_svg"
+          eval "$wx_cv_use_svg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_svg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_svg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -9962,9 +10188,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6;
 if test "${enable_clipboard+set}" = set; then
   enableval=$enable_clipboard;
                           if test "$enableval" = yes; then
-                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
+                            wx_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
                           else
-                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=no'
+                            wx_cv_use_clipboard='wxUSE_CLIPBOARD=no'
                           fi
 
 else
@@ -9976,14 +10202,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
+                          wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_clipboard"
+          eval "$wx_cv_use_clipboard"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10017,9 +10243,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6; }
 if test "${enable_dnd+set}" = set; then
   enableval=$enable_dnd;
                           if test "$enableval" = yes; then
-                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
+                            wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
                           else
-                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
+                            wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
                           fi
 
 else
@@ -10031,14 +10257,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
+                          wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_dnd"
+          eval "$wx_cv_use_dnd"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dnd >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10072,9 +10298,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
 if test "${enable_metafile+set}" = set; then
   enableval=$enable_metafile;
                           if test "$enableval" = yes; then
-                            ac_cv_use_metafile='wxUSE_METAFILE=yes'
+                            wx_cv_use_metafile='wxUSE_METAFILE=yes'
                           else
-                            ac_cv_use_metafile='wxUSE_METAFILE=no'
+                            wx_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
 
 else
@@ -10086,14 +10312,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
+                          wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_metafile"
+          eval "$wx_cv_use_metafile"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10111,9 +10337,10 @@ echo "${ECHO_T}$result" >&6; }
 
 
 
+DEFAULT_wxUSE_CONTROLS=none
 
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
+          enablestring=disable
+          defaultval=
           if test -z "$defaultval"; then
               if test x"$enablestring" = xdisable; then
                   defaultval=yes
@@ -10129,9 +10356,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6; }
 if test "${enable_controls+set}" = set; then
   enableval=$enable_controls;
                           if test "$enableval" = yes; then
-                            ac_cv_use_controls='wxUSE_CONTROLS=yes'
+                            wx_cv_use_controls='wxUSE_CONTROLS=yes'
                           else
-                            ac_cv_use_controls='wxUSE_CONTROLS=no'
+                            wx_cv_use_controls='wxUSE_CONTROLS=no'
                           fi
 
 else
@@ -10143,14 +10370,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
+                          wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_controls"
+          eval "$wx_cv_use_controls"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_controls >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10293,9 +10520,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6; }
 if test "${enable_accel+set}" = set; then
   enableval=$enable_accel;
                           if test "$enableval" = yes; then
-                            ac_cv_use_accel='wxUSE_ACCEL=yes'
+                            wx_cv_use_accel='wxUSE_ACCEL=yes'
                           else
-                            ac_cv_use_accel='wxUSE_ACCEL=no'
+                            wx_cv_use_accel='wxUSE_ACCEL=no'
                           fi
 
 else
@@ -10307,14 +10534,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
+                          wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_accel"
+          eval "$wx_cv_use_accel"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_accel >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10348,9 +10575,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6
 if test "${enable_animatectrl+set}" = set; then
   enableval=$enable_animatectrl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes'
+                            wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes'
                           else
-                            ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no'
+                            wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no'
                           fi
 
 else
@@ -10362,14 +10589,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
+                          wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_animatectrl"
+          eval "$wx_cv_use_animatectrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10403,9 +10630,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; }
 if test "${enable_button+set}" = set; then
   enableval=$enable_button;
                           if test "$enableval" = yes; then
-                            ac_cv_use_button='wxUSE_BUTTON=yes'
+                            wx_cv_use_button='wxUSE_BUTTON=yes'
                           else
-                            ac_cv_use_button='wxUSE_BUTTON=no'
+                            wx_cv_use_button='wxUSE_BUTTON=no'
                           fi
 
 else
@@ -10417,14 +10644,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
+                          wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_button"
+          eval "$wx_cv_use_button"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_button >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10458,9 +10685,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6;
 if test "${enable_bmpbutton+set}" = set; then
   enableval=$enable_bmpbutton;
                           if test "$enableval" = yes; then
-                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
+                            wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
                           else
-                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
+                            wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
                           fi
 
 else
@@ -10472,14 +10699,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
+                          wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_bmpbutton"
+          eval "$wx_cv_use_bmpbutton"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10513,9 +10740,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6
 if test "${enable_bmpcombobox+set}" = set; then
   enableval=$enable_bmpcombobox;
                           if test "$enableval" = yes; then
-                            ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
+                            wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
                           else
-                            ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
+                            wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
                           fi
 
 else
@@ -10527,14 +10754,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
+                          wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_bmpcombobox"
+          eval "$wx_cv_use_bmpcombobox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10568,9 +10795,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6; }
 if test "${enable_calendar+set}" = set; then
   enableval=$enable_calendar;
                           if test "$enableval" = yes; then
-                            ac_cv_use_calendar='wxUSE_CALCTRL=yes'
+                            wx_cv_use_calendar='wxUSE_CALCTRL=yes'
                           else
-                            ac_cv_use_calendar='wxUSE_CALCTRL=no'
+                            wx_cv_use_calendar='wxUSE_CALCTRL=no'
                           fi
 
 else
@@ -10582,14 +10809,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
+                          wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_calendar"
+          eval "$wx_cv_use_calendar"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_calendar >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_calendar >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10623,9 +10850,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6; }
 if test "${enable_caret+set}" = set; then
   enableval=$enable_caret;
                           if test "$enableval" = yes; then
-                            ac_cv_use_caret='wxUSE_CARET=yes'
+                            wx_cv_use_caret='wxUSE_CARET=yes'
                           else
-                            ac_cv_use_caret='wxUSE_CARET=no'
+                            wx_cv_use_caret='wxUSE_CARET=no'
                           fi
 
 else
@@ -10637,14 +10864,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
+                          wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_caret"
+          eval "$wx_cv_use_caret"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_caret >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10678,9 +10905,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6; }
 if test "${enable_checkbox+set}" = set; then
   enableval=$enable_checkbox;
                           if test "$enableval" = yes; then
-                            ac_cv_use_checkbox='wxUSE_CHECKBOX=yes'
+                            wx_cv_use_checkbox='wxUSE_CHECKBOX=yes'
                           else
-                            ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
+                            wx_cv_use_checkbox='wxUSE_CHECKBOX=no'
                           fi
 
 else
@@ -10692,14 +10919,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
+                          wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_checkbox"
+          eval "$wx_cv_use_checkbox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10733,9 +10960,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6; }
 if test "${enable_checklst+set}" = set; then
   enableval=$enable_checklst;
                           if test "$enableval" = yes; then
-                            ac_cv_use_checklst='wxUSE_CHECKLST=yes'
+                            wx_cv_use_checklst='wxUSE_CHECKLST=yes'
                           else
-                            ac_cv_use_checklst='wxUSE_CHECKLST=no'
+                            wx_cv_use_checklst='wxUSE_CHECKLST=no'
                           fi
 
 else
@@ -10747,14 +10974,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
+                          wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_checklst"
+          eval "$wx_cv_use_checklst"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_checklst >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10788,9 +11015,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6; }
 if test "${enable_choice+set}" = set; then
   enableval=$enable_choice;
                           if test "$enableval" = yes; then
-                            ac_cv_use_choice='wxUSE_CHOICE=yes'
+                            wx_cv_use_choice='wxUSE_CHOICE=yes'
                           else
-                            ac_cv_use_choice='wxUSE_CHOICE=no'
+                            wx_cv_use_choice='wxUSE_CHOICE=no'
                           fi
 
 else
@@ -10802,14 +11029,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
+                          wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_choice"
+          eval "$wx_cv_use_choice"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_choice >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10843,9 +11070,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6;
 if test "${enable_choicebook+set}" = set; then
   enableval=$enable_choicebook;
                           if test "$enableval" = yes; then
-                            ac_cv_use_choicebook='wxUSE_CHOICEBOOK=yes'
+                            wx_cv_use_choicebook='wxUSE_CHOICEBOOK=yes'
                           else
-                            ac_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
+                            wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
                           fi
 
 else
@@ -10857,14 +11084,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
+                          wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_choicebook"
+          eval "$wx_cv_use_choicebook"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_choicebook >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_choicebook >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10898,9 +11125,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6; }
 if test "${enable_collpane+set}" = set; then
   enableval=$enable_collpane;
                           if test "$enableval" = yes; then
-                            ac_cv_use_collpane='wxUSE_COLLPANE=yes'
+                            wx_cv_use_collpane='wxUSE_COLLPANE=yes'
                           else
-                            ac_cv_use_collpane='wxUSE_COLLPANE=no'
+                            wx_cv_use_collpane='wxUSE_COLLPANE=no'
                           fi
 
 else
@@ -10912,14 +11139,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
+                          wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_collpane"
+          eval "$wx_cv_use_collpane"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_collpane >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_collpane >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -10953,9 +11180,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&
 if test "${enable_colourpicker+set}" = set; then
   enableval=$enable_colourpicker;
                           if test "$enableval" = yes; then
-                            ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes'
+                            wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes'
                           else
-                            ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no'
+                            wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no'
                           fi
 
 else
@@ -10967,14 +11194,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
+                          wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_colourpicker"
+          eval "$wx_cv_use_colourpicker"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11008,9 +11235,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6; }
 if test "${enable_combobox+set}" = set; then
   enableval=$enable_combobox;
                           if test "$enableval" = yes; then
-                            ac_cv_use_combobox='wxUSE_COMBOBOX=yes'
+                            wx_cv_use_combobox='wxUSE_COMBOBOX=yes'
                           else
-                            ac_cv_use_combobox='wxUSE_COMBOBOX=no'
+                            wx_cv_use_combobox='wxUSE_COMBOBOX=no'
                           fi
 
 else
@@ -11022,14 +11249,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
+                          wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_combobox"
+          eval "$wx_cv_use_combobox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_combobox >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11063,9 +11290,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6;
 if test "${enable_comboctrl+set}" = set; then
   enableval=$enable_comboctrl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_comboctrl='wxUSE_COMBOCTRL=yes'
+                            wx_cv_use_comboctrl='wxUSE_COMBOCTRL=yes'
                           else
-                            ac_cv_use_comboctrl='wxUSE_COMBOCTRL=no'
+                            wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no'
                           fi
 
 else
@@ -11077,14 +11304,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
+                          wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_comboctrl"
+          eval "$wx_cv_use_comboctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11118,9 +11345,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; }
 if test "${enable_datepick+set}" = set; then
   enableval=$enable_datepick;
                           if test "$enableval" = yes; then
-                            ac_cv_use_datepick='wxUSE_DATEPICKCTRL=yes'
+                            wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes'
                           else
-                            ac_cv_use_datepick='wxUSE_DATEPICKCTRL=no'
+                            wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no'
                           fi
 
 else
@@ -11132,14 +11359,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
+                          wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_datepick"
+          eval "$wx_cv_use_datepick"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_datepick >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_datepick >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11173,9 +11400,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6;
 if test "${enable_dirpicker+set}" = set; then
   enableval=$enable_dirpicker;
                           if test "$enableval" = yes; then
-                            ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes'
+                            wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes'
                           else
-                            ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
+                            wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
                           fi
 
 else
@@ -11187,14 +11414,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
+                          wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_dirpicker"
+          eval "$wx_cv_use_dirpicker"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11228,9 +11455,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; }
 if test "${enable_display+set}" = set; then
   enableval=$enable_display;
                           if test "$enableval" = yes; then
-                            ac_cv_use_display='wxUSE_DISPLAY=yes'
+                            wx_cv_use_display='wxUSE_DISPLAY=yes'
                           else
-                            ac_cv_use_display='wxUSE_DISPLAY=no'
+                            wx_cv_use_display='wxUSE_DISPLAY=no'
                           fi
 
 else
@@ -11242,14 +11469,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
+                          wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_display"
+          eval "$wx_cv_use_display"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_display >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_display >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11283,9 +11510,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6;
 if test "${enable_detect_sm+set}" = set; then
   enableval=$enable_detect_sm;
                           if test "$enableval" = yes; then
-                            ac_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
+                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
                           else
-                            ac_cv_use_detect_sm='wxUSE_DETECT_SM=no'
+                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
                           fi
 
 else
@@ -11297,14 +11524,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
+                          wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_detect_sm"
+          eval "$wx_cv_use_detect_sm"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_detect_sm >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_detect_sm >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11338,9 +11565,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6
 if test "${enable_editablebox+set}" = set; then
   enableval=$enable_editablebox;
                           if test "$enableval" = yes; then
-                            ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes'
+                            wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes'
                           else
-                            ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
+                            wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
                           fi
 
 else
@@ -11352,14 +11579,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
+                          wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_editablebox"
+          eval "$wx_cv_use_editablebox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_editablebox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_editablebox >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11393,9 +11620,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6;
 if test "${enable_filepicker+set}" = set; then
   enableval=$enable_filepicker;
                           if test "$enableval" = yes; then
-                            ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
+                            wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
                           else
-                            ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
+                            wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
                           fi
 
 else
@@ -11407,14 +11634,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
+                          wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_filepicker"
+          eval "$wx_cv_use_filepicker"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_filepicker >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_filepicker >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11448,9 +11675,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6;
 if test "${enable_fontpicker+set}" = set; then
   enableval=$enable_fontpicker;
                           if test "$enableval" = yes; then
-                            ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes'
+                            wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes'
                           else
-                            ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no'
+                            wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no'
                           fi
 
 else
@@ -11462,14 +11689,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
+                          wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_fontpicker"
+          eval "$wx_cv_use_fontpicker"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11503,9 +11730,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6; }
 if test "${enable_gauge+set}" = set; then
   enableval=$enable_gauge;
                           if test "$enableval" = yes; then
-                            ac_cv_use_gauge='wxUSE_GAUGE=yes'
+                            wx_cv_use_gauge='wxUSE_GAUGE=yes'
                           else
-                            ac_cv_use_gauge='wxUSE_GAUGE=no'
+                            wx_cv_use_gauge='wxUSE_GAUGE=no'
                           fi
 
 else
@@ -11517,14 +11744,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
+                          wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_gauge"
+          eval "$wx_cv_use_gauge"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gauge >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11558,9 +11785,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6; }
 if test "${enable_grid+set}" = set; then
   enableval=$enable_grid;
                           if test "$enableval" = yes; then
-                            ac_cv_use_grid='wxUSE_GRID=yes'
+                            wx_cv_use_grid='wxUSE_GRID=yes'
                           else
-                            ac_cv_use_grid='wxUSE_GRID=no'
+                            wx_cv_use_grid='wxUSE_GRID=no'
                           fi
 
 else
@@ -11572,14 +11799,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
+                          wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_grid"
+          eval "$wx_cv_use_grid"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_grid >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11613,9 +11840,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&
 if test "${enable_dataviewctrl+set}" = set; then
   enableval=$enable_dataviewctrl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
+                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
                           else
-                            ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
+                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
                           fi
 
 else
@@ -11627,14 +11854,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
+                          wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_dataviewctrl"
+          eval "$wx_cv_use_dataviewctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11668,9 +11895,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6;
 if test "${enable_hyperlink+set}" = set; then
   enableval=$enable_hyperlink;
                           if test "$enableval" = yes; then
-                            ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes'
+                            wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes'
                           else
-                            ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no'
+                            wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no'
                           fi
 
 else
@@ -11682,14 +11909,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
+                          wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_hyperlink"
+          eval "$wx_cv_use_hyperlink"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11723,9 +11950,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6; }
 if test "${enable_imaglist+set}" = set; then
   enableval=$enable_imaglist;
                           if test "$enableval" = yes; then
-                            ac_cv_use_imaglist='wxUSE_IMAGLIST=yes'
+                            wx_cv_use_imaglist='wxUSE_IMAGLIST=yes'
                           else
-                            ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
+                            wx_cv_use_imaglist='wxUSE_IMAGLIST=no'
                           fi
 
 else
@@ -11737,14 +11964,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
+                          wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_imaglist"
+          eval "$wx_cv_use_imaglist"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11778,9 +12005,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6; }
 if test "${enable_listbook+set}" = set; then
   enableval=$enable_listbook;
                           if test "$enableval" = yes; then
-                            ac_cv_use_listbook='wxUSE_LISTBOOK=yes'
+                            wx_cv_use_listbook='wxUSE_LISTBOOK=yes'
                           else
-                            ac_cv_use_listbook='wxUSE_LISTBOOK=no'
+                            wx_cv_use_listbook='wxUSE_LISTBOOK=no'
                           fi
 
 else
@@ -11792,14 +12019,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
+                          wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_listbook"
+          eval "$wx_cv_use_listbook"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_listbook >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_listbook >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11833,9 +12060,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6; }
 if test "${enable_listbox+set}" = set; then
   enableval=$enable_listbox;
                           if test "$enableval" = yes; then
-                            ac_cv_use_listbox='wxUSE_LISTBOX=yes'
+                            wx_cv_use_listbox='wxUSE_LISTBOX=yes'
                           else
-                            ac_cv_use_listbox='wxUSE_LISTBOX=no'
+                            wx_cv_use_listbox='wxUSE_LISTBOX=no'
                           fi
 
 else
@@ -11847,14 +12074,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
+                          wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_listbox"
+          eval "$wx_cv_use_listbox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_listbox >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11888,9 +12115,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6; }
 if test "${enable_listctrl+set}" = set; then
   enableval=$enable_listctrl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_listctrl='wxUSE_LISTCTRL=yes'
+                            wx_cv_use_listctrl='wxUSE_LISTCTRL=yes'
                           else
-                            ac_cv_use_listctrl='wxUSE_LISTCTRL=no'
+                            wx_cv_use_listctrl='wxUSE_LISTCTRL=no'
                           fi
 
 else
@@ -11902,14 +12129,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
+                          wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_listctrl"
+          eval "$wx_cv_use_listctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11943,9 +12170,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6; }
 if test "${enable_notebook+set}" = set; then
   enableval=$enable_notebook;
                           if test "$enableval" = yes; then
-                            ac_cv_use_notebook='wxUSE_NOTEBOOK=yes'
+                            wx_cv_use_notebook='wxUSE_NOTEBOOK=yes'
                           else
-                            ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
+                            wx_cv_use_notebook='wxUSE_NOTEBOOK=no'
                           fi
 
 else
@@ -11957,14 +12184,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
+                          wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_notebook"
+          eval "$wx_cv_use_notebook"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_notebook >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -11998,9 +12225,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6;
 if test "${enable_odcombobox+set}" = set; then
   enableval=$enable_odcombobox;
                           if test "$enableval" = yes; then
-                            ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes'
+                            wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes'
                           else
-                            ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no'
+                            wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no'
                           fi
 
 else
@@ -12012,14 +12239,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
+                          wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_odcombobox"
+          eval "$wx_cv_use_odcombobox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12053,9 +12280,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6; }
 if test "${enable_radiobox+set}" = set; then
   enableval=$enable_radiobox;
                           if test "$enableval" = yes; then
-                            ac_cv_use_radiobox='wxUSE_RADIOBOX=yes'
+                            wx_cv_use_radiobox='wxUSE_RADIOBOX=yes'
                           else
-                            ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
+                            wx_cv_use_radiobox='wxUSE_RADIOBOX=no'
                           fi
 
 else
@@ -12067,14 +12294,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
+                          wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_radiobox"
+          eval "$wx_cv_use_radiobox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12108,9 +12335,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6; }
 if test "${enable_radiobtn+set}" = set; then
   enableval=$enable_radiobtn;
                           if test "$enableval" = yes; then
-                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
+                            wx_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
                           else
-                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
+                            wx_cv_use_radiobtn='wxUSE_RADIOBTN=no'
                           fi
 
 else
@@ -12122,14 +12349,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
+                          wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_radiobtn"
+          eval "$wx_cv_use_radiobtn"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12163,9 +12390,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6; }
 if test "${enable_sash+set}" = set; then
   enableval=$enable_sash;
                           if test "$enableval" = yes; then
-                            ac_cv_use_sash='wxUSE_SASH=yes'
+                            wx_cv_use_sash='wxUSE_SASH=yes'
                           else
-                            ac_cv_use_sash='wxUSE_SASH=no'
+                            wx_cv_use_sash='wxUSE_SASH=no'
                           fi
 
 else
@@ -12177,14 +12404,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
+                          wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_sash"
+          eval "$wx_cv_use_sash"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_sash >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12218,9 +12445,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6;
 if test "${enable_scrollbar+set}" = set; then
   enableval=$enable_scrollbar;
                           if test "$enableval" = yes; then
-                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
+                            wx_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
                           else
-                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
+                            wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
                           fi
 
 else
@@ -12232,14 +12459,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
+                          wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_scrollbar"
+          eval "$wx_cv_use_scrollbar"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12273,9 +12500,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6;
 if test "${enable_searchctrl+set}" = set; then
   enableval=$enable_searchctrl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
+                            wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
                           else
-                            ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
+                            wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
                           fi
 
 else
@@ -12287,14 +12514,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
+                          wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_searchctrl"
+          eval "$wx_cv_use_searchctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12328,9 +12555,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6; }
 if test "${enable_slider+set}" = set; then
   enableval=$enable_slider;
                           if test "$enableval" = yes; then
-                            ac_cv_use_slider='wxUSE_SLIDER=yes'
+                            wx_cv_use_slider='wxUSE_SLIDER=yes'
                           else
-                            ac_cv_use_slider='wxUSE_SLIDER=no'
+                            wx_cv_use_slider='wxUSE_SLIDER=no'
                           fi
 
 else
@@ -12342,14 +12569,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
+                          wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_slider"
+          eval "$wx_cv_use_slider"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_slider >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12383,9 +12610,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6; }
 if test "${enable_spinbtn+set}" = set; then
   enableval=$enable_spinbtn;
                           if test "$enableval" = yes; then
-                            ac_cv_use_spinbtn='wxUSE_SPINBTN=yes'
+                            wx_cv_use_spinbtn='wxUSE_SPINBTN=yes'
                           else
-                            ac_cv_use_spinbtn='wxUSE_SPINBTN=no'
+                            wx_cv_use_spinbtn='wxUSE_SPINBTN=no'
                           fi
 
 else
@@ -12397,14 +12624,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
+                          wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_spinbtn"
+          eval "$wx_cv_use_spinbtn"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12438,9 +12665,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6; }
 if test "${enable_spinctrl+set}" = set; then
   enableval=$enable_spinctrl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
+                            wx_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
                           else
-                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
+                            wx_cv_use_spinctrl='wxUSE_SPINCTRL=no'
                           fi
 
 else
@@ -12452,14 +12679,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
+                          wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_spinctrl"
+          eval "$wx_cv_use_spinctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12493,9 +12720,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6; }
 if test "${enable_splitter+set}" = set; then
   enableval=$enable_splitter;
                           if test "$enableval" = yes; then
-                            ac_cv_use_splitter='wxUSE_SPLITTER=yes'
+                            wx_cv_use_splitter='wxUSE_SPLITTER=yes'
                           else
-                            ac_cv_use_splitter='wxUSE_SPLITTER=no'
+                            wx_cv_use_splitter='wxUSE_SPLITTER=no'
                           fi
 
 else
@@ -12507,14 +12734,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
+                          wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_splitter"
+          eval "$wx_cv_use_splitter"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_splitter >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12548,9 +12775,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6; }
 if test "${enable_statbmp+set}" = set; then
   enableval=$enable_statbmp;
                           if test "$enableval" = yes; then
-                            ac_cv_use_statbmp='wxUSE_STATBMP=yes'
+                            wx_cv_use_statbmp='wxUSE_STATBMP=yes'
                           else
-                            ac_cv_use_statbmp='wxUSE_STATBMP=no'
+                            wx_cv_use_statbmp='wxUSE_STATBMP=no'
                           fi
 
 else
@@ -12562,14 +12789,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
+                          wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_statbmp"
+          eval "$wx_cv_use_statbmp"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12603,9 +12830,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6; }
 if test "${enable_statbox+set}" = set; then
   enableval=$enable_statbox;
                           if test "$enableval" = yes; then
-                            ac_cv_use_statbox='wxUSE_STATBOX=yes'
+                            wx_cv_use_statbox='wxUSE_STATBOX=yes'
                           else
-                            ac_cv_use_statbox='wxUSE_STATBOX=no'
+                            wx_cv_use_statbox='wxUSE_STATBOX=no'
                           fi
 
 else
@@ -12617,14 +12844,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
+                          wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_statbox"
+          eval "$wx_cv_use_statbox"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_statbox >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12658,9 +12885,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6; }
 if test "${enable_statline+set}" = set; then
   enableval=$enable_statline;
                           if test "$enableval" = yes; then
-                            ac_cv_use_statline='wxUSE_STATLINE=yes'
+                            wx_cv_use_statline='wxUSE_STATLINE=yes'
                           else
-                            ac_cv_use_statline='wxUSE_STATLINE=no'
+                            wx_cv_use_statline='wxUSE_STATLINE=no'
                           fi
 
 else
@@ -12672,14 +12899,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
+                          wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_statline"
+          eval "$wx_cv_use_statline"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_statline >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12713,9 +12940,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6; }
 if test "${enable_stattext+set}" = set; then
   enableval=$enable_stattext;
                           if test "$enableval" = yes; then
-                            ac_cv_use_stattext='wxUSE_STATTEXT=yes'
+                            wx_cv_use_stattext='wxUSE_STATTEXT=yes'
                           else
-                            ac_cv_use_stattext='wxUSE_STATTEXT=no'
+                            wx_cv_use_stattext='wxUSE_STATTEXT=no'
                           fi
 
 else
@@ -12727,14 +12954,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
+                          wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_stattext"
+          eval "$wx_cv_use_stattext"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_stattext >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12768,9 +12995,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6;
 if test "${enable_statusbar+set}" = set; then
   enableval=$enable_statusbar;
                           if test "$enableval" = yes; then
-                            ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
+                            wx_cv_use_statusbar='wxUSE_STATUSBAR=yes'
                           else
-                            ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
+                            wx_cv_use_statusbar='wxUSE_STATUSBAR=no'
                           fi
 
 else
@@ -12782,14 +13009,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
+                          wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_statusbar"
+          eval "$wx_cv_use_statusbar"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12823,9 +13050,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6;
 if test "${enable_tabdialog+set}" = set; then
   enableval=$enable_tabdialog;
                           if test "$enableval" = yes; then
-                            ac_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes'
+                            wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes'
                           else
-                            ac_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
+                            wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
                           fi
 
 else
@@ -12837,14 +13064,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
+                          wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_tabdialog"
+          eval "$wx_cv_use_tabdialog"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12878,9 +13105,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; }
 if test "${enable_textctrl+set}" = set; then
   enableval=$enable_textctrl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
+                            wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
                           else
-                            ac_cv_use_textctrl='wxUSE_TEXTCTRL=no'
+                            wx_cv_use_textctrl='wxUSE_TEXTCTRL=no'
                           fi
 
 else
@@ -12892,14 +13119,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
+                          wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_textctrl"
+          eval "$wx_cv_use_textctrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12933,9 +13160,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6;
 if test "${enable_togglebtn+set}" = set; then
   enableval=$enable_togglebtn;
                           if test "$enableval" = yes; then
-                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
+                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
                           else
-                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
+                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                           fi
 
 else
@@ -12947,14 +13174,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
+                          wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_togglebtn"
+          eval "$wx_cv_use_togglebtn"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -12988,9 +13215,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; }
 if test "${enable_toolbar+set}" = set; then
   enableval=$enable_toolbar;
                           if test "$enableval" = yes; then
-                            ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+                            wx_cv_use_toolbar='wxUSE_TOOLBAR=yes'
                           else
-                            ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
+                            wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
                           fi
 
 else
@@ -13002,14 +13229,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
+                          wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_toolbar"
+          eval "$wx_cv_use_toolbar"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13043,9 +13270,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6;
 if test "${enable_tbarnative+set}" = set; then
   enableval=$enable_tbarnative;
                           if test "$enableval" = yes; then
-                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
                           else
-                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                           fi
 
 else
@@ -13057,14 +13284,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
+                          wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_tbarnative"
+          eval "$wx_cv_use_tbarnative"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13098,9 +13325,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; }
 if test "${enable_treebook+set}" = set; then
   enableval=$enable_treebook;
                           if test "$enableval" = yes; then
-                            ac_cv_use_treebook='wxUSE_TREEBOOK=yes'
+                            wx_cv_use_treebook='wxUSE_TREEBOOK=yes'
                           else
-                            ac_cv_use_treebook='wxUSE_TREEBOOK=no'
+                            wx_cv_use_treebook='wxUSE_TREEBOOK=no'
                           fi
 
 else
@@ -13112,14 +13339,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
+                          wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_treebook"
+          eval "$wx_cv_use_treebook"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_treebook >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_treebook >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13153,9 +13380,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6; }
 if test "${enable_toolbook+set}" = set; then
   enableval=$enable_toolbook;
                           if test "$enableval" = yes; then
-                            ac_cv_use_toolbook='wxUSE_TOOLBOOK=yes'
+                            wx_cv_use_toolbook='wxUSE_TOOLBOOK=yes'
                           else
-                            ac_cv_use_toolbook='wxUSE_TOOLBOOK=no'
+                            wx_cv_use_toolbook='wxUSE_TOOLBOOK=no'
                           fi
 
 else
@@ -13167,14 +13394,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
+                          wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_toolbook"
+          eval "$wx_cv_use_toolbook"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_toolbook >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_toolbook >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13208,9 +13435,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; }
 if test "${enable_treectrl+set}" = set; then
   enableval=$enable_treectrl;
                           if test "$enableval" = yes; then
-                            ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
+                            wx_cv_use_treectrl='wxUSE_TREECTRL=yes'
                           else
-                            ac_cv_use_treectrl='wxUSE_TREECTRL=no'
+                            wx_cv_use_treectrl='wxUSE_TREECTRL=no'
                           fi
 
 else
@@ -13222,14 +13449,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
+                          wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_treectrl"
+          eval "$wx_cv_use_treectrl"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13263,9 +13490,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6;
 if test "${enable_tipwindow+set}" = set; then
   enableval=$enable_tipwindow;
                           if test "$enableval" = yes; then
-                            ac_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
+                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
                           else
-                            ac_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
+                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
                           fi
 
 else
@@ -13277,14 +13504,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
+                          wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_tipwindow"
+          eval "$wx_cv_use_tipwindow"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13318,9 +13545,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; }
 if test "${enable_popupwin+set}" = set; then
   enableval=$enable_popupwin;
                           if test "$enableval" = yes; then
-                            ac_cv_use_popupwin='wxUSE_POPUPWIN=yes'
+                            wx_cv_use_popupwin='wxUSE_POPUPWIN=yes'
                           else
-                            ac_cv_use_popupwin='wxUSE_POPUPWIN=no'
+                            wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
                           fi
 
 else
@@ -13332,14 +13559,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
+                          wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_popupwin"
+          eval "$wx_cv_use_popupwin"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_popupwin >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13375,9 +13602,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6;
 if test "${enable_commondlg+set}" = set; then
   enableval=$enable_commondlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
+                            wx_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
                           else
-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
+                            wx_cv_use_commondlg='wxUSE_COMMONDLGS=no'
                           fi
 
 else
@@ -13389,14 +13616,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
+                          wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_commondlg"
+          eval "$wx_cv_use_commondlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13430,9 +13657,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6; }
 if test "${enable_aboutdlg+set}" = set; then
   enableval=$enable_aboutdlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes'
+                            wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes'
                           else
-                            ac_cv_use_aboutdlg='wxUSE_ABOUTDLG=no'
+                            wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no'
                           fi
 
 else
@@ -13444,14 +13671,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
+                          wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_aboutdlg"
+          eval "$wx_cv_use_aboutdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13485,9 +13712,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6;
 if test "${enable_choicedlg+set}" = set; then
   enableval=$enable_choicedlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
+                            wx_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
                           else
-                            ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
+                            wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
                           fi
 
 else
@@ -13499,14 +13726,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
+                          wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_choicedlg"
+          eval "$wx_cv_use_choicedlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13540,9 +13767,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6; }
 if test "${enable_coldlg+set}" = set; then
   enableval=$enable_coldlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_coldlg='wxUSE_COLOURDLG=yes'
+                            wx_cv_use_coldlg='wxUSE_COLOURDLG=yes'
                           else
-                            ac_cv_use_coldlg='wxUSE_COLOURDLG=no'
+                            wx_cv_use_coldlg='wxUSE_COLOURDLG=no'
                           fi
 
 else
@@ -13554,14 +13781,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
+                          wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_coldlg"
+          eval "$wx_cv_use_coldlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13595,9 +13822,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6; }
 if test "${enable_filedlg+set}" = set; then
   enableval=$enable_filedlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_filedlg='wxUSE_FILEDLG=yes'
+                            wx_cv_use_filedlg='wxUSE_FILEDLG=yes'
                           else
-                            ac_cv_use_filedlg='wxUSE_FILEDLG=no'
+                            wx_cv_use_filedlg='wxUSE_FILEDLG=no'
                           fi
 
 else
@@ -13609,14 +13836,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
+                          wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_filedlg"
+          eval "$wx_cv_use_filedlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13650,9 +13877,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6; }
 if test "${enable_finddlg+set}" = set; then
   enableval=$enable_finddlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
+                            wx_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
                           else
-                            ac_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
+                            wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
                           fi
 
 else
@@ -13664,14 +13891,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
+                          wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_finddlg"
+          eval "$wx_cv_use_finddlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_finddlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_finddlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13705,9 +13932,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6; }
 if test "${enable_fontdlg+set}" = set; then
   enableval=$enable_fontdlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_fontdlg='wxUSE_FONTDLG=yes'
+                            wx_cv_use_fontdlg='wxUSE_FONTDLG=yes'
                           else
-                            ac_cv_use_fontdlg='wxUSE_FONTDLG=no'
+                            wx_cv_use_fontdlg='wxUSE_FONTDLG=no'
                           fi
 
 else
@@ -13719,14 +13946,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
+                          wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_fontdlg"
+          eval "$wx_cv_use_fontdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13760,9 +13987,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6; }
 if test "${enable_dirdlg+set}" = set; then
   enableval=$enable_dirdlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
+                            wx_cv_use_dirdlg='wxUSE_DIRDLG=yes'
                           else
-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
+                            wx_cv_use_dirdlg='wxUSE_DIRDLG=no'
                           fi
 
 else
@@ -13774,14 +14001,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
+                          wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_dirdlg"
+          eval "$wx_cv_use_dirdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13815,9 +14042,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6; }
 if test "${enable_msgdlg+set}" = set; then
   enableval=$enable_msgdlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'
+                            wx_cv_use_msgdlg='wxUSE_MSGDLG=yes'
                           else
-                            ac_cv_use_msgdlg='wxUSE_MSGDLG=no'
+                            wx_cv_use_msgdlg='wxUSE_MSGDLG=no'
                           fi
 
 else
@@ -13829,14 +14056,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
+                          wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_msgdlg"
+          eval "$wx_cv_use_msgdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13870,9 +14097,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6;
 if test "${enable_numberdlg+set}" = set; then
   enableval=$enable_numberdlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
+                            wx_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
                           else
-                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
+                            wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
                           fi
 
 else
@@ -13884,14 +14111,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
+                          wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_numberdlg"
+          eval "$wx_cv_use_numberdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13925,9 +14152,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6; }
 if test "${enable_splash+set}" = set; then
   enableval=$enable_splash;
                           if test "$enableval" = yes; then
-                            ac_cv_use_splash='wxUSE_SPLASH=yes'
+                            wx_cv_use_splash='wxUSE_SPLASH=yes'
                           else
-                            ac_cv_use_splash='wxUSE_SPLASH=no'
+                            wx_cv_use_splash='wxUSE_SPLASH=no'
                           fi
 
 else
@@ -13939,14 +14166,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
+                          wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_splash"
+          eval "$wx_cv_use_splash"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_splash >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_splash >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -13980,9 +14207,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6; }
 if test "${enable_textdlg+set}" = set; then
   enableval=$enable_textdlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_textdlg='wxUSE_TEXTDLG=yes'
+                            wx_cv_use_textdlg='wxUSE_TEXTDLG=yes'
                           else
-                            ac_cv_use_textdlg='wxUSE_TEXTDLG=no'
+                            wx_cv_use_textdlg='wxUSE_TEXTDLG=no'
                           fi
 
 else
@@ -13994,14 +14221,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
+                          wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_textdlg"
+          eval "$wx_cv_use_textdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14035,9 +14262,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6; }
 if test "${enable_tipdlg+set}" = set; then
   enableval=$enable_tipdlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
+                            wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
                           else
-                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
+                            wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
                           fi
 
 else
@@ -14049,14 +14276,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
+                          wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_tipdlg"
+          eval "$wx_cv_use_tipdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14090,9 +14317,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6
 if test "${enable_progressdlg+set}" = set; then
   enableval=$enable_progressdlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
+                            wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
                           else
-                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
+                            wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
                           fi
 
 else
@@ -14104,14 +14331,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
+                          wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_progressdlg"
+          eval "$wx_cv_use_progressdlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14145,9 +14372,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6;
 if test "${enable_wizarddlg+set}" = set; then
   enableval=$enable_wizarddlg;
                           if test "$enableval" = yes; then
-                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
+                            wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
                           else
-                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
+                            wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
                           fi
 
 else
@@ -14159,14 +14386,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
+                          wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_wizarddlg"
+          eval "$wx_cv_use_wizarddlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14202,9 +14429,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6; }
 if test "${enable_menus+set}" = set; then
   enableval=$enable_menus;
                           if test "$enableval" = yes; then
-                            ac_cv_use_menus='wxUSE_MENUS=yes'
+                            wx_cv_use_menus='wxUSE_MENUS=yes'
                           else
-                            ac_cv_use_menus='wxUSE_MENUS=no'
+                            wx_cv_use_menus='wxUSE_MENUS=no'
                           fi
 
 else
@@ -14216,14 +14443,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
+                          wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_menus"
+          eval "$wx_cv_use_menus"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_menus >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14257,9 +14484,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6;
 if test "${enable_miniframe+set}" = set; then
   enableval=$enable_miniframe;
                           if test "$enableval" = yes; then
-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
+                            wx_cv_use_miniframe='wxUSE_MINIFRAME=yes'
                           else
-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
+                            wx_cv_use_miniframe='wxUSE_MINIFRAME=no'
                           fi
 
 else
@@ -14271,14 +14498,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
+                          wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_miniframe"
+          eval "$wx_cv_use_miniframe"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14312,9 +14539,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6; }
 if test "${enable_tooltips+set}" = set; then
   enableval=$enable_tooltips;
                           if test "$enableval" = yes; then
-                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
+                            wx_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
                           else
-                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'
+                            wx_cv_use_tooltips='wxUSE_TOOLTIPS=no'
                           fi
 
 else
@@ -14326,14 +14553,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
+                          wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_tooltips"
+          eval "$wx_cv_use_tooltips"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14367,9 +14594,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6; }
 if test "${enable_splines+set}" = set; then
   enableval=$enable_splines;
                           if test "$enableval" = yes; then
-                            ac_cv_use_splines='wxUSE_SPLINES=yes'
+                            wx_cv_use_splines='wxUSE_SPLINES=yes'
                           else
-                            ac_cv_use_splines='wxUSE_SPLINES=no'
+                            wx_cv_use_splines='wxUSE_SPLINES=no'
                           fi
 
 else
@@ -14381,14 +14608,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
+                          wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_splines"
+          eval "$wx_cv_use_splines"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_splines >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14422,9 +14649,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6;
 if test "${enable_mousewheel+set}" = set; then
   enableval=$enable_mousewheel;
                           if test "$enableval" = yes; then
-                            ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes'
+                            wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes'
                           else
-                            ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no'
+                            wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no'
                           fi
 
 else
@@ -14436,14 +14663,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
+                          wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_mousewheel"
+          eval "$wx_cv_use_mousewheel"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14477,9 +14704,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6;
 if test "${enable_validators+set}" = set; then
   enableval=$enable_validators;
                           if test "$enableval" = yes; then
-                            ac_cv_use_validators='wxUSE_VALIDATORS=yes'
+                            wx_cv_use_validators='wxUSE_VALIDATORS=yes'
                           else
-                            ac_cv_use_validators='wxUSE_VALIDATORS=no'
+                            wx_cv_use_validators='wxUSE_VALIDATORS=no'
                           fi
 
 else
@@ -14491,14 +14718,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
+                          wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_validators"
+          eval "$wx_cv_use_validators"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_validators >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14532,9 +14759,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6; }
 if test "${enable_busyinfo+set}" = set; then
   enableval=$enable_busyinfo;
                           if test "$enableval" = yes; then
-                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
+                            wx_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
                           else
-                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'
+                            wx_cv_use_busyinfo='wxUSE_BUSYINFO=no'
                           fi
 
 else
@@ -14546,14 +14773,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
+                          wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_busyinfo"
+          eval "$wx_cv_use_busyinfo"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14587,9 +14814,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6; }
 if test "${enable_joystick+set}" = set; then
   enableval=$enable_joystick;
                           if test "$enableval" = yes; then
-                            ac_cv_use_joystick='wxUSE_JOYSTICK=yes'
+                            wx_cv_use_joystick='wxUSE_JOYSTICK=yes'
                           else
-                            ac_cv_use_joystick='wxUSE_JOYSTICK=no'
+                            wx_cv_use_joystick='wxUSE_JOYSTICK=no'
                           fi
 
 else
@@ -14601,14 +14828,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
+                          wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_joystick"
+          eval "$wx_cv_use_joystick"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_joystick >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14642,9 +14869,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; }
 if test "${enable_metafile+set}" = set; then
   enableval=$enable_metafile;
                           if test "$enableval" = yes; then
-                            ac_cv_use_metafile='wxUSE_METAFILE=yes'
+                            wx_cv_use_metafile='wxUSE_METAFILE=yes'
                           else
-                            ac_cv_use_metafile='wxUSE_METAFILE=no'
+                            wx_cv_use_metafile='wxUSE_METAFILE=no'
                           fi
 
 else
@@ -14656,14 +14883,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
+                          wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_metafile"
+          eval "$wx_cv_use_metafile"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14697,9 +14924,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6;
 if test "${enable_dragimage+set}" = set; then
   enableval=$enable_dragimage;
                           if test "$enableval" = yes; then
-                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
+                            wx_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
                           else
-                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
+                            wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
                           fi
 
 else
@@ -14711,14 +14938,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
+                          wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_dragimage"
+          eval "$wx_cv_use_dragimage"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dragimage >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14752,9 +14979,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >
 if test "${enable_accessibility+set}" = set; then
   enableval=$enable_accessibility;
                           if test "$enableval" = yes; then
-                            ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
+                            wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes'
                           else
-                            ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
+                            wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
                           fi
 
 else
@@ -14766,14 +14993,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
+                          wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_accessibility"
+          eval "$wx_cv_use_accessibility"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_accessibility >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_accessibility >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14809,9 +15036,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; }
 if test "${enable_dccache+set}" = set; then
   enableval=$enable_dccache;
                           if test "$enableval" = yes; then
-                            ac_cv_use_dccache='wxUSE_DC_CACHEING=yes'
+                            wx_cv_use_dccache='wxUSE_DC_CACHEING=yes'
                           else
-                            ac_cv_use_dccache='wxUSE_DC_CACHEING=no'
+                            wx_cv_use_dccache='wxUSE_DC_CACHEING=no'
                           fi
 
 else
@@ -14823,14 +15050,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
+                          wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_dccache"
+          eval "$wx_cv_use_dccache"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_dccache >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_dccache >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14867,9 +15094,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6; }
 if test "${enable_palette+set}" = set; then
   enableval=$enable_palette;
                           if test "$enableval" = yes; then
-                            ac_cv_use_palette='wxUSE_PALETTE=yes'
+                            wx_cv_use_palette='wxUSE_PALETTE=yes'
                           else
-                            ac_cv_use_palette='wxUSE_PALETTE=no'
+                            wx_cv_use_palette='wxUSE_PALETTE=no'
                           fi
 
 else
@@ -14881,14 +15108,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
+                          wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_palette"
+          eval "$wx_cv_use_palette"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_palette >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_palette >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14922,9 +15149,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6; }
 if test "${enable_image+set}" = set; then
   enableval=$enable_image;
                           if test "$enableval" = yes; then
-                            ac_cv_use_image='wxUSE_IMAGE=yes'
+                            wx_cv_use_image='wxUSE_IMAGE=yes'
                           else
-                            ac_cv_use_image='wxUSE_IMAGE=no'
+                            wx_cv_use_image='wxUSE_IMAGE=no'
                           fi
 
 else
@@ -14936,14 +15163,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
+                          wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_image"
+          eval "$wx_cv_use_image"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_image >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -14977,9 +15204,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6; }
 if test "${enable_gif+set}" = set; then
   enableval=$enable_gif;
                           if test "$enableval" = yes; then
-                            ac_cv_use_gif='wxUSE_GIF=yes'
+                            wx_cv_use_gif='wxUSE_GIF=yes'
                           else
-                            ac_cv_use_gif='wxUSE_GIF=no'
+                            wx_cv_use_gif='wxUSE_GIF=no'
                           fi
 
 else
@@ -14991,14 +15218,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
+                          wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_gif"
+          eval "$wx_cv_use_gif"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_gif >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15032,9 +15259,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6; }
 if test "${enable_pcx+set}" = set; then
   enableval=$enable_pcx;
                           if test "$enableval" = yes; then
-                            ac_cv_use_pcx='wxUSE_PCX=yes'
+                            wx_cv_use_pcx='wxUSE_PCX=yes'
                           else
-                            ac_cv_use_pcx='wxUSE_PCX=no'
+                            wx_cv_use_pcx='wxUSE_PCX=no'
                           fi
 
 else
@@ -15046,14 +15273,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
+                          wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_pcx"
+          eval "$wx_cv_use_pcx"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_pcx >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15087,9 +15314,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6; }
 if test "${enable_tga+set}" = set; then
   enableval=$enable_tga;
                           if test "$enableval" = yes; then
-                            ac_cv_use_tga='wxUSE_TGA=yes'
+                            wx_cv_use_tga='wxUSE_TGA=yes'
                           else
-                            ac_cv_use_tga='wxUSE_TGA=no'
+                            wx_cv_use_tga='wxUSE_TGA=no'
                           fi
 
 else
@@ -15101,14 +15328,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
+                          wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_tga"
+          eval "$wx_cv_use_tga"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_tga >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_tga >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15142,9 +15369,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6; }
 if test "${enable_iff+set}" = set; then
   enableval=$enable_iff;
                           if test "$enableval" = yes; then
-                            ac_cv_use_iff='wxUSE_IFF=yes'
+                            wx_cv_use_iff='wxUSE_IFF=yes'
                           else
-                            ac_cv_use_iff='wxUSE_IFF=no'
+                            wx_cv_use_iff='wxUSE_IFF=no'
                           fi
 
 else
@@ -15156,14 +15383,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
+                          wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_iff"
+          eval "$wx_cv_use_iff"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_iff >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_iff >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15197,9 +15424,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6; }
 if test "${enable_pnm+set}" = set; then
   enableval=$enable_pnm;
                           if test "$enableval" = yes; then
-                            ac_cv_use_pnm='wxUSE_PNM=yes'
+                            wx_cv_use_pnm='wxUSE_PNM=yes'
                           else
-                            ac_cv_use_pnm='wxUSE_PNM=no'
+                            wx_cv_use_pnm='wxUSE_PNM=no'
                           fi
 
 else
@@ -15211,14 +15438,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
+                          wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_pnm"
+          eval "$wx_cv_use_pnm"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_pnm >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15252,9 +15479,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6; }
 if test "${enable_xpm+set}" = set; then
   enableval=$enable_xpm;
                           if test "$enableval" = yes; then
-                            ac_cv_use_xpm='wxUSE_XPM=yes'
+                            wx_cv_use_xpm='wxUSE_XPM=yes'
                           else
-                            ac_cv_use_xpm='wxUSE_XPM=no'
+                            wx_cv_use_xpm='wxUSE_XPM=no'
                           fi
 
 else
@@ -15266,14 +15493,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
+                          wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_xpm"
+          eval "$wx_cv_use_xpm"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_xpm >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_xpm >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -15307,9 +15534,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6; }
 if test "${enable_ico_cur+set}" = set; then
   enableval=$enable_ico_cur;
                           if test "$enableval" = yes; then
-                            ac_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
+                            wx_cv_use_ico_cur='wxUSE_ICO_CUR=yes'
                           else
-                            ac_cv_use_ico_cur='wxUSE_ICO_CUR=no'
+                            wx_cv_use_ico_cur='wxUSE_ICO_CUR=no'
                           fi
 
 else
@@ -15321,14 +15548,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
+                          wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_ico_cur"
+          eval "$wx_cv_use_ico_cur"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -20965,152 +21192,6 @@ echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; }
 fi
 
 
-for ac_header in sys/epoll.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-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_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ----------------------------------------- ##
-## Report this to wx-dev@lists.wxwidgets.org ##
-## ----------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
 { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
 if test "${ac_cv_c_const+set}" = set; then
@@ -35683,6 +35764,7 @@ echo "${ECHO_T}$wx_cv_version_script" >&6; }
     esac
 
 
+            if test "$wxUSE_VISIBILITY" != "no"; then
 
 
   if test -n "$GCC"; then
@@ -35781,6 +35863,7 @@ _ACEOF
 
   fi
 
+    fi
 
         if test "x$SUNCXX" = xyes; then
         SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib"
@@ -45379,6 +45462,180 @@ _ACEOF
 fi
 
 
+if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_CONSOLE_EVENTLOOP 1
+_ACEOF
+
+
+    if test "$wxUSE_UNIX" = "yes"; then
+        if test "$wxUSE_SELECT_DISPATCHER" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define wxUSE_SELECT_DISPATCHER 1
+_ACEOF
+
+        fi
+
+        if test "$wxUSE_EPOLL_DISPATCHER" = "yes"; then
+
+for ac_header in sys/epoll.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to wx-dev@lists.wxwidgets.org ##
+## ----------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+            if test "$ac_cv_header_sys_epoll_h" = "yes"; then
+                cat >>confdefs.h <<\_ACEOF
+#define wxUSE_EPOLL_DISPATCHER 1
+_ACEOF
+
+            else
+                { echo "$as_me:$LINENO: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5
+echo "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;}
+            fi
+        fi
+    fi
+fi
+
+
 if test "$wxUSE_DATETIME" = "yes"; then
         { echo "$as_me:$LINENO: checking for strptime" >&5
 echo $ECHO_N "checking for strptime... $ECHO_C" >&6; }