]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
added wxUSE_TASKBARICON; corrected condition for generating the taskbar sample makefi...
[wxWidgets.git] / configure
index fd4323c2993e8a48532098fc3be8ca96b2dd9c43..dec4e288dc8cd1e9d1bf63c1b69a349f0006f1f9 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 47419 2007-07-13 09:13:55Z VS .
+# From configure.in Id: configure.in 47544 2007-07-18 12:58:28Z VZ .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
 #
@@ -1638,7 +1638,7 @@ 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
@@ -1682,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-baseevtloop    use event loop in console programs too
+  --enable-epoolloop      use wxEpollDispatcher class (Linux only)
+  --enable-selectloop     use wxSelectDispatcher class
   --enable-apple_ieee     use the Apple IEEE codec
   --enable-arcstream      use wxArchive streams
   --enable-base64         use base64 encoding/decoding functions
@@ -1749,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
@@ -1797,6 +1800,7 @@ Optional Features:
   --enable-stattext       use wxStaticText class
   --enable-statusbar      use wxStatusBar class
   --enable-tabdialog      use wxTabControl class
+  --enable-taskbaricon    use wxTaskBarIcon class
   --enable-textctrl       use wxTextCtrl class
   --enable-togglebtn      use wxToggleButton class
   --enable-toolbar        use wxToolBar class
@@ -2974,9 +2978,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
@@ -2988,14 +2992,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
@@ -3029,9 +3033,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
@@ -3043,14 +3047,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
@@ -3084,9 +3088,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
@@ -3098,14 +3102,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
@@ -3123,6 +3127,14 @@ echo "${ECHO_T}$result" >&6; }
 
 
           withstring=without
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-subdirs" >&5
 echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6; }
           no_cache=0
@@ -3131,9 +3143,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
@@ -3145,14 +3157,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":-$defaultval}"
 
 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
@@ -3192,9 +3204,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
@@ -3206,14 +3218,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
@@ -3249,16 +3261,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
@@ -3270,14 +3282,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
@@ -3315,9 +3327,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
@@ -3329,14 +3341,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
@@ -3445,9 +3457,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
@@ -3459,14 +3471,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
@@ -3506,9 +3518,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
@@ -3520,14 +3532,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
@@ -3554,13 +3566,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;}
@@ -3576,14 +3588,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
@@ -3613,13 +3625,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;}
@@ -3635,14 +3647,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
@@ -3672,13 +3684,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;}
@@ -3694,14 +3706,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
@@ -3731,13 +3743,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;}
@@ -3753,14 +3765,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
@@ -3783,6 +3795,14 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or
 
 
           withstring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-libmspack" >&5
 echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6; }
           no_cache=0
@@ -3791,9 +3811,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
@@ -3805,14 +3825,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":-$defaultval}"
 
 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
@@ -3830,6 +3850,14 @@ echo "${ECHO_T}$result" >&6; }
 
 
           withstring=without
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5
 echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6; }
           no_cache=0
@@ -3838,9 +3866,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
@@ -3852,14 +3880,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":-$defaultval}"
 
 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
@@ -3877,6 +3905,14 @@ echo "${ECHO_T}$result" >&6; }
 
 
           withstring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomevfs" >&5
 echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6; }
           no_cache=0
@@ -3885,9 +3921,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
@@ -3899,14 +3935,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":-$defaultval}"
 
 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
@@ -3924,6 +3960,14 @@ echo "${ECHO_T}$result" >&6; }
 
 
           withstring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-hildon" >&5
 echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6; }
           no_cache=0
@@ -3932,9 +3976,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
@@ -3946,14 +3990,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":-$defaultval}"
 
 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
@@ -3971,6 +4015,14 @@ echo "${ECHO_T}$result" >&6; }
 
 
           withstring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5
 echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6; }
           no_cache=0
@@ -3979,9 +4031,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
@@ -3993,14 +4045,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":-$defaultval}"
 
 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
@@ -4021,6 +4073,14 @@ fi
 
 
           withstring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-dmalloc" >&5
 echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6; }
           no_cache=0
@@ -4029,9 +4089,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
@@ -4043,14 +4103,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":-$defaultval}"
 
 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
@@ -4068,6 +4128,14 @@ echo "${ECHO_T}$result" >&6; }
 
 
           withstring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$withstring" = xwithout; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
           { echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5
 echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6; }
           no_cache=0
@@ -4076,9 +4144,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
@@ -4090,14 +4158,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":-$defaultval}"
 
 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
@@ -4122,13 +4190,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;}
@@ -4144,14 +4212,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
@@ -4181,13 +4249,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;}
@@ -4203,14 +4271,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
@@ -4240,13 +4308,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;}
@@ -4262,14 +4330,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
@@ -4299,13 +4367,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;}
@@ -4321,14 +4389,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
@@ -4369,9 +4437,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
@@ -4383,14 +4451,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
@@ -4424,9 +4492,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
@@ -4438,14 +4506,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
@@ -4479,9 +4547,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
@@ -4493,14 +4561,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
@@ -4534,9 +4602,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
@@ -4548,14 +4616,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
@@ -4589,9 +4657,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
@@ -4603,14 +4671,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
@@ -4644,9 +4712,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
@@ -4658,14 +4726,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
@@ -4699,9 +4767,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
@@ -4713,14 +4781,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
@@ -4754,9 +4822,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
@@ -4768,14 +4836,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
@@ -4841,9 +4909,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
@@ -4855,14 +4923,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
@@ -4896,9 +4964,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
@@ -4910,14 +4978,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
@@ -4953,9 +5021,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
@@ -4967,14 +5035,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
@@ -5020,9 +5088,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
@@ -5034,14 +5102,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
@@ -5075,9 +5143,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
@@ -5089,14 +5157,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
@@ -5130,9 +5198,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
@@ -5144,14 +5212,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
@@ -5185,9 +5253,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
@@ -5199,14 +5267,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
@@ -5240,9 +5308,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
@@ -5254,14 +5322,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
@@ -5295,9 +5363,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
@@ -5309,14 +5377,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
@@ -5350,9 +5418,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
@@ -5364,14 +5432,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
@@ -5405,9 +5473,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
@@ -5419,14 +5487,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
@@ -5460,9 +5528,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
@@ -5474,14 +5542,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
@@ -5515,9 +5583,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
@@ -5529,14 +5597,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
@@ -5570,9 +5638,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
@@ -5584,14 +5652,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
@@ -5658,9 +5726,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
@@ -5672,14 +5740,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
@@ -5713,9 +5781,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
@@ -5727,14 +5795,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
@@ -5769,9 +5837,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
@@ -5783,14 +5851,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
@@ -5825,9 +5893,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
@@ -5839,14 +5907,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
@@ -5881,9 +5949,9 @@ echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6;
 if test "${enable_visibility+set}" = set; then
   enableval=$enable_visibility;
                           if test "$enableval" = yes; then
-                            ac_cv_use_visibility='wxUSE_VISIBILITY=yes'
+                            wx_cv_use_visibility='wxUSE_VISIBILITY=yes'
                           else
-                            ac_cv_use_visibility='wxUSE_VISIBILITY=no'
+                            wx_cv_use_visibility='wxUSE_VISIBILITY=no'
                           fi
 
 else
@@ -5895,14 +5963,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
+                          wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
 
 fi
 
 
-          eval "$ac_cv_use_visibility"
+          eval "$wx_cv_use_visibility"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_visibility >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_visibility >> ${wx_arg_cache_file}.tmp
           fi
 
           if test x"$enablestring" = xdisable; then
@@ -5938,9 +6006,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
@@ -5952,14 +6020,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
@@ -5993,9 +6061,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
@@ -6007,14 +6075,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
@@ -6049,9 +6117,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
@@ -6063,14 +6131,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
@@ -6104,9 +6172,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
@@ -6118,14 +6186,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
@@ -6159,9 +6227,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
@@ -6173,14 +6241,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
@@ -6214,9 +6282,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
@@ -6228,14 +6296,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
@@ -6269,9 +6337,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
@@ -6283,14 +6351,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
@@ -6324,9 +6392,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
@@ -6338,14 +6406,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
@@ -6379,9 +6447,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
@@ -6393,14 +6461,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
@@ -6435,9 +6503,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
@@ -6449,14 +6517,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
@@ -6474,6 +6542,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
@@ -6491,9 +6725,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
@@ -6505,14 +6739,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
@@ -6546,9 +6780,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
@@ -6560,14 +6794,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
@@ -6601,9 +6835,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
@@ -6615,14 +6849,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
@@ -6656,9 +6890,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
@@ -6670,14 +6904,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
@@ -6711,9 +6945,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
@@ -6725,14 +6959,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
@@ -6766,9 +7000,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
@@ -6780,14 +7014,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
@@ -6821,9 +7055,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
@@ -6835,14 +7069,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
@@ -6876,9 +7110,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
@@ -6890,14 +7124,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
@@ -6931,9 +7165,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
@@ -6945,14 +7179,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
@@ -6986,9 +7220,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
@@ -7000,14 +7234,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
@@ -7041,9 +7275,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
@@ -7055,14 +7289,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
@@ -7096,9 +7330,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
@@ -7110,14 +7344,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
@@ -7151,9 +7385,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
@@ -7165,14 +7399,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
@@ -7206,9 +7440,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
@@ -7220,14 +7454,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
@@ -7261,9 +7495,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
@@ -7275,14 +7509,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
@@ -7316,9 +7550,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
@@ -7330,14 +7564,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
@@ -7371,9 +7605,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
@@ -7385,14 +7619,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
@@ -7426,9 +7660,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
@@ -7440,14 +7674,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
@@ -7481,9 +7715,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
@@ -7495,14 +7729,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
@@ -7536,9 +7770,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
@@ -7550,14 +7784,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
@@ -7591,9 +7825,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
@@ -7605,14 +7839,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
@@ -7646,9 +7880,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
@@ -7660,14 +7894,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
@@ -7701,9 +7935,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
@@ -7715,14 +7949,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
@@ -7756,9 +7990,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
@@ -7770,14 +8004,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
@@ -7811,9 +8045,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
@@ -7825,14 +8059,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
@@ -7866,9 +8100,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
@@ -7880,14 +8114,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
@@ -7921,9 +8155,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
@@ -7935,14 +8169,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
@@ -7976,9 +8210,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
@@ -7990,14 +8224,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
@@ -8031,9 +8265,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
@@ -8045,14 +8279,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
@@ -8086,9 +8320,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
@@ -8100,14 +8334,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
@@ -8141,9 +8375,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
@@ -8155,14 +8389,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
@@ -8196,9 +8430,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
@@ -8210,14 +8444,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
@@ -8251,9 +8485,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
@@ -8265,14 +8499,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
@@ -8306,9 +8540,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
@@ -8320,14 +8554,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
@@ -8361,9 +8595,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
@@ -8375,14 +8609,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
@@ -8416,9 +8650,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
@@ -8430,14 +8664,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
@@ -8471,9 +8705,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
@@ -8485,14 +8719,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
@@ -8527,9 +8761,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
@@ -8541,14 +8775,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
@@ -8582,9 +8816,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
@@ -8596,14 +8830,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
@@ -8637,9 +8871,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
@@ -8651,14 +8885,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
@@ -8692,9 +8926,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
@@ -8706,14 +8940,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
@@ -8747,9 +8981,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
@@ -8761,14 +8995,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
@@ -8802,9 +9036,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
@@ -8816,14 +9050,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
@@ -8858,9 +9092,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
@@ -8872,14 +9106,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
@@ -8917,9 +9151,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
@@ -8931,14 +9165,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
@@ -8972,9 +9206,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
@@ -8986,14 +9220,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
@@ -9027,9 +9261,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
@@ -9041,14 +9275,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
@@ -9082,9 +9316,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
@@ -9096,14 +9330,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
@@ -9137,9 +9371,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
@@ -9151,14 +9385,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
@@ -9192,9 +9426,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
@@ -9206,14 +9440,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
@@ -9247,9 +9481,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
@@ -9261,14 +9495,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
@@ -9302,9 +9536,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
@@ -9316,14 +9550,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
@@ -9357,9 +9591,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
@@ -9371,14 +9605,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
@@ -9412,9 +9646,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
@@ -9426,14 +9660,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
@@ -9467,9 +9701,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
@@ -9481,14 +9715,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
@@ -9522,9 +9756,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
@@ -9536,14 +9770,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
@@ -9577,9 +9811,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
@@ -9591,14 +9825,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
@@ -9632,9 +9866,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
@@ -9646,14 +9880,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
@@ -9687,9 +9921,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
@@ -9701,14 +9935,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
@@ -9742,9 +9976,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
@@ -9756,14 +9990,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
@@ -9797,9 +10031,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
@@ -9811,14 +10045,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
@@ -9852,9 +10086,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
@@ -9866,14 +10100,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
@@ -9907,9 +10141,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
@@ -9921,14 +10155,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
@@ -9962,9 +10196,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
@@ -9976,14 +10210,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
@@ -10019,9 +10253,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
@@ -10033,14 +10267,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
@@ -10074,9 +10308,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
@@ -10088,14 +10322,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
@@ -10129,9 +10363,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
@@ -10143,14 +10377,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
@@ -10168,9 +10402,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
@@ -10186,9 +10421,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
@@ -10200,14 +10435,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
@@ -10350,9 +10585,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
@@ -10364,14 +10599,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
@@ -10405,9 +10640,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
@@ -10419,14 +10654,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
@@ -10460,9 +10695,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
@@ -10474,14 +10709,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
@@ -10515,9 +10750,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
@@ -10529,14 +10764,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
@@ -10570,9 +10805,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
@@ -10584,14 +10819,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
@@ -10625,9 +10860,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
@@ -10639,14 +10874,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
@@ -10680,9 +10915,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
@@ -10694,14 +10929,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
@@ -10735,9 +10970,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
@@ -10749,14 +10984,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
@@ -10790,9 +11025,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
@@ -10804,14 +11039,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
@@ -10845,9 +11080,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
@@ -10859,14 +11094,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
@@ -10900,9 +11135,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
@@ -10914,14 +11149,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
@@ -10955,9 +11190,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
@@ -10969,14 +11204,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
@@ -11010,9 +11245,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
@@ -11024,14 +11259,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
@@ -11065,9 +11300,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
@@ -11079,14 +11314,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
@@ -11120,9 +11355,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
@@ -11134,14 +11369,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
@@ -11175,9 +11410,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
@@ -11189,14 +11424,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
@@ -11230,9 +11465,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
@@ -11244,14 +11479,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
@@ -11285,9 +11520,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
@@ -11299,14 +11534,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
@@ -11340,9 +11575,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
@@ -11354,14 +11589,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
@@ -11395,9 +11630,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
@@ -11409,14 +11644,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
@@ -11450,9 +11685,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
@@ -11464,14 +11699,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
@@ -11505,9 +11740,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
@@ -11519,14 +11754,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
@@ -11560,9 +11795,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
@@ -11574,14 +11809,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
@@ -11615,9 +11850,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
@@ -11629,14 +11864,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
@@ -11670,9 +11905,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
@@ -11684,14 +11919,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
@@ -11725,9 +11960,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
@@ -11739,14 +11974,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
@@ -11780,9 +12015,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
@@ -11794,14 +12029,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
@@ -11835,9 +12070,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
@@ -11849,14 +12084,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
@@ -11890,9 +12125,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
@@ -11904,14 +12139,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
@@ -11945,9 +12180,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
@@ -11959,14 +12194,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
@@ -12000,9 +12235,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
@@ -12014,14 +12249,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
@@ -12055,9 +12290,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
@@ -12069,14 +12304,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
@@ -12110,9 +12345,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
@@ -12124,14 +12359,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
@@ -12165,9 +12400,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
@@ -12179,14 +12414,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
@@ -12220,9 +12455,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
@@ -12234,14 +12469,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
@@ -12275,9 +12510,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
@@ -12289,14 +12524,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
@@ -12330,9 +12565,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
@@ -12344,14 +12579,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
@@ -12385,9 +12620,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
@@ -12399,14 +12634,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
@@ -12440,9 +12675,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
@@ -12454,14 +12689,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
@@ -12495,9 +12730,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
@@ -12509,14 +12744,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
@@ -12550,9 +12785,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
@@ -12564,14 +12799,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
@@ -12605,9 +12840,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
@@ -12619,14 +12854,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
@@ -12660,9 +12895,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
@@ -12674,14 +12909,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
@@ -12715,9 +12950,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
@@ -12729,14 +12964,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
@@ -12770,9 +13005,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
@@ -12784,14 +13019,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
@@ -12825,9 +13060,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
@@ -12839,14 +13074,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
@@ -12880,9 +13115,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
@@ -12894,14 +13129,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
 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}-taskbaricon" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-taskbaricon was given.
+if test "${enable_taskbaricon+set}" = set; then
+  enableval=$enable_taskbaricon;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes'
+                          else
+                            wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no'
+                          fi
+
+else
+
+                          LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_taskbaricon"
+          if test "$no_cache" != 1; then
+            echo $wx_cv_use_taskbaricon >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_TASKBARICON = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_TASKBARICON
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -12935,9 +13225,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
@@ -12949,14 +13239,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
@@ -12990,9 +13280,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
@@ -13004,14 +13294,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
@@ -13045,9 +13335,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
@@ -13059,14 +13349,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
@@ -13100,9 +13390,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
@@ -13114,14 +13404,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
@@ -13155,9 +13445,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
@@ -13169,14 +13459,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
@@ -13210,9 +13500,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
@@ -13224,14 +13514,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
@@ -13265,9 +13555,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
@@ -13279,14 +13569,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
@@ -13320,9 +13610,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
@@ -13334,14 +13624,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
@@ -13375,9 +13665,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
@@ -13389,14 +13679,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
@@ -13432,9 +13722,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
@@ -13446,14 +13736,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
@@ -13487,9 +13777,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
@@ -13501,14 +13791,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
@@ -13542,9 +13832,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
@@ -13556,14 +13846,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
@@ -13597,9 +13887,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
@@ -13611,14 +13901,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
@@ -13652,9 +13942,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
@@ -13666,14 +13956,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
@@ -13707,9 +13997,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
@@ -13721,14 +14011,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
@@ -13762,9 +14052,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
@@ -13776,14 +14066,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
@@ -13817,9 +14107,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
@@ -13831,14 +14121,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
@@ -13872,9 +14162,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
@@ -13886,14 +14176,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
@@ -13927,9 +14217,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
@@ -13941,14 +14231,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
@@ -13982,9 +14272,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
@@ -13996,14 +14286,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
@@ -14037,9 +14327,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
@@ -14051,14 +14341,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
@@ -14092,9 +14382,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
@@ -14106,14 +14396,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
@@ -14147,9 +14437,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
@@ -14161,14 +14451,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
@@ -14202,9 +14492,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
@@ -14216,14 +14506,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
@@ -14259,9 +14549,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
@@ -14273,14 +14563,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
@@ -14314,9 +14604,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
@@ -14328,14 +14618,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
@@ -14369,9 +14659,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
@@ -14383,14 +14673,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
@@ -14424,9 +14714,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
@@ -14438,14 +14728,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
@@ -14479,9 +14769,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
@@ -14493,14 +14783,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
@@ -14534,9 +14824,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
@@ -14548,14 +14838,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
@@ -14589,9 +14879,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
@@ -14603,14 +14893,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
@@ -14644,9 +14934,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
@@ -14658,14 +14948,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
@@ -14699,9 +14989,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
@@ -14713,14 +15003,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
@@ -14754,9 +15044,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
@@ -14768,14 +15058,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
@@ -14809,9 +15099,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
@@ -14823,14 +15113,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
@@ -14866,9 +15156,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
@@ -14880,14 +15170,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
@@ -14924,9 +15214,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
@@ -14938,14 +15228,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
@@ -14979,9 +15269,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
@@ -14993,14 +15283,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
@@ -15034,9 +15324,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
@@ -15048,14 +15338,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
@@ -15089,9 +15379,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
@@ -15103,14 +15393,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
@@ -15144,9 +15434,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
@@ -15158,14 +15448,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
@@ -15199,9 +15489,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
@@ -15213,14 +15503,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
@@ -15254,9 +15544,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
@@ -15268,14 +15558,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
@@ -15309,9 +15599,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
@@ -15323,14 +15613,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
@@ -15364,9 +15654,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
@@ -15378,14 +15668,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
@@ -21022,152 +21312,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
@@ -25608,11 +25752,13 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -25652,11 +25798,13 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <stdio.h>
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
 int
 main ()
 {
-return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
   ;
   return 0;
 }
@@ -45434,10 +45582,188 @@ _ACEOF
 fi
 
 
-if test "$wxUSE_DATETIME" = "yes"; then
-        { echo "$as_me:$LINENO: checking for strptime" >&5
-echo $ECHO_N "checking for strptime... $ECHO_C" >&6; }
-if test "${ac_cv_func_strptime+set}" = set; then
+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
+
+
+
+
+for ac_func in gettimeofday ftime
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -45446,12 +45772,12 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define strptime to an innocuous variant, in case <limits.h> declares strptime.
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define strptime innocuous_strptime
+#define $ac_func innocuous_$ac_func
 
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strptime (); below.
+    which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
 
@@ -45461,7 +45787,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 # include <assert.h>
 #endif
 
-#undef strptime
+#undef $ac_func
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -45469,18 +45795,18 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char strptime ();
+char $ac_func ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined __stub_strptime || defined __stub___strptime
+#if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
 #endif
 
 int
 main ()
 {
-return strptime ();
+return $ac_func ();
   ;
   return 0;
 }
@@ -45503,33 +45829,36 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_func_strptime=yes
+  eval "$as_ac_var=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_func_strptime=no
+       eval "$as_ac_var=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5
-echo "${ECHO_T}$ac_cv_func_strptime" >&6; }
+ac_res=`eval echo '${'$as_ac_var'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ break
+fi
+done
 
-    if test "$ac_cv_func_strptime" = "yes"; then
-        { echo "$as_me:$LINENO: checking for strptime declaration" >&5
-echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6; }
-if test "${wx_cv_func_strptime_decl+set}" = set; then
+
+if test "$ac_cv_func_gettimeofday" = "yes"; then
+    { echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5
+echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6; }
+if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-                ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
                 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -45537,14 +45866,15 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                        #include <time.h>
+                #include <sys/time.h>
+                #include <unistd.h>
 
 int
 main ()
 {
 
-                        struct tm t;
-                        strptime("foo", "bar", &t);
+                struct timeval tv;
+                gettimeofday(&tv, NULL);
 
   ;
   return 0;
@@ -45564,137 +45894,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
+        test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  wx_cv_func_strptime_decl=yes
+  wx_cv_func_gettimeofday_has_2_args=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       wx_cv_func_strptime_decl=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-                ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_decl" >&5
-echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6; }
-    fi
-    if test "$wx_cv_func_strptime_decl" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRPTIME_DECL 1
-_ACEOF
-
-    else
-        wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
-    fi
-    if test "$ac_cv_func_strptime" = "yes"; then
-                                        { echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5
-echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6; }
-if test "${wx_cv_func_strptime_ok+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-                  wx_cv_func_strptime_ok=no
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-
-                    #include <stdlib.h>
-                    #include <time.h>
-                    #include "confdefs.h"
-
-                    $wx_strptime_decl
-
-                    int main()
-                    {
-                        struct tm t;
-                        return !!strptime("", "%x", &t);
-                    }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  wx_cv_func_strptime_ok=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-wx_cv_func_strptime_ok=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5
-echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; }
-
-        if test "$wx_cv_func_strptime_ok" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRPTIME 1
-_ACEOF
-
-        fi
-    fi
-
-            { echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
-echo $ECHO_N "checking for timezone variable in <time.h>... $ECHO_C" >&6; }
-if test "${wx_cv_var_timezone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-                        ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-                        cat >conftest.$ac_ext <<_ACEOF
+       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                                #include <time.h>
+                    #include <sys/time.h>
+                    #include <unistd.h>
 
 int
 main ()
 {
 
-                                int tz;
-                                tz = timezone;
+                    struct timeval tv;
+                    gettimeofday(&tv);
 
   ;
   return 0;
@@ -45714,77 +45937,151 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
+        test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-
-                                wx_cv_var_timezone=timezone
-
+  wx_cv_func_gettimeofday_has_2_args=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
-                                cat >conftest.$ac_ext <<_ACEOF
+                    { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5
+echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
+                    wx_cv_func_gettimeofday_has_2_args=unknown
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5
+echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; }
+
+    if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define WX_GETTIMEOFDAY_NO_TZ 1
+_ACEOF
+
+    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; }
+if test "${ac_cv_func_strptime+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define strptime to an innocuous variant, in case <limits.h> declares strptime.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define strptime innocuous_strptime
 
-                                        #include <time.h>
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char strptime (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef strptime
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char strptime ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_strptime || defined __stub___strptime
+choke me
+#endif
 
 int
 main ()
 {
-
-                                        int tz;
-                                        tz = _timezone;
-
+return strptime ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
+        test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-                                        wx_cv_var_timezone=_timezone
-
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_func_strptime=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+       ac_cv_func_strptime=no
+fi
 
-                                        cat >conftest.$ac_ext <<_ACEOF
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5
+echo "${ECHO_T}$ac_cv_func_strptime" >&6; }
+
+    if test "$ac_cv_func_strptime" = "yes"; then
+        { echo "$as_me:$LINENO: checking for strptime declaration" >&5
+echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6; }
+if test "${wx_cv_func_strptime_decl+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+                ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+                cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                                                #include <time.h>
+                        #include <time.h>
 
 int
 main ()
 {
 
-                                                int tz;
-                                                tz = __timezone;
+                        struct tm t;
+                        strptime("foo", "bar", &t);
 
   ;
   return 0;
@@ -45807,169 +46104,224 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-
-                                                wx_cv_var_timezone=__timezone
-
+  wx_cv_func_strptime_decl=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
-                                                if test "$USE_DOS" = 0 ; then
-                                                    { echo "$as_me:$LINENO: WARNING: no timezone variable" >&5
-echo "$as_me: WARNING: no timezone variable" >&2;}
-                                                fi
-
+       wx_cv_func_strptime_decl=no
 
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 
 
 fi
+{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_decl" >&5
+echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6; }
+    fi
+    if test "$wx_cv_func_strptime_decl" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRPTIME_DECL 1
+_ACEOF
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    else
+        wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
+    fi
+    if test "$ac_cv_func_strptime" = "yes"; then
+                                        { echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5
+echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6; }
+if test "${wx_cv_func_strptime_ok+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+                  wx_cv_func_strptime_ok=no
 
+else
+  cat >conftest.$ac_ext <<_ACEOF
 
-fi
+                    #include <stdlib.h>
+                    #include <time.h>
+                    #include "confdefs.h"
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-                        ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+                    $wx_strptime_decl
 
+                    int main()
+                    {
+                        struct tm t;
+                        return !!strptime("", "%x", &t);
+                    }
 
+_ACEOF
+rm -f conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (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_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  wx_cv_func_strptime_ok=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+( exit $ac_status )
+wx_cv_func_strptime_ok=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_var_timezone" >&5
-echo "${ECHO_T}$wx_cv_var_timezone" >&6; }
 
-        if test "x$wx_cv_var_timezone" != x ; then
-        cat >>confdefs.h <<_ACEOF
-#define WX_TIMEZONE $wx_cv_var_timezone
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5
+echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; }
+
+        if test "$wx_cv_func_strptime_ok" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRPTIME 1
 _ACEOF
 
+        fi
     fi
 
-
-for ac_func in localtime
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+            { echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
+echo $ECHO_N "checking for timezone variable in <time.h>... $ECHO_C" >&6; }
+if test "${wx_cv_var_timezone+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+
+                        ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+                        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
+                                #include <time.h>
 
 int
 main ()
 {
-return $ac_func ();
+
+                                int tz;
+                                tz = timezone;
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+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_link") 2>conftest.er1
+  (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 -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
+       } && test -s conftest.$ac_objext; then
+
+                                wx_cv_var_timezone=timezone
+
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       eval "$as_ac_var=no"
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-              { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+                                cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-fi
-done
+                                        #include <time.h>
 
+int
+main ()
+{
+
+                                        int tz;
+                                        tz = _timezone;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+                                        wx_cv_var_timezone=_timezone
 
-    if test "$ac_cv_func_localtime" = "yes"; then
-        { echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
-echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
-if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-            cat >conftest.$ac_ext <<_ACEOF
+
+                                        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                    #include <time.h>
+                                                #include <time.h>
 
 int
 main ()
 {
 
-                    struct tm tm;
-                    tm.tm_gmtoff++;
+                                                int tz;
+                                                tz = __timezone;
 
   ;
   return 0;
@@ -45989,37 +46341,57 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
 
-                    wx_cv_struct_tm_has_gmtoff=yes
+                                                wx_cv_var_timezone=__timezone
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       wx_cv_struct_tm_has_gmtoff=no
+
+                                                if test "$USE_DOS" = 0 ; then
+                                                    { echo "$as_me:$LINENO: WARNING: no timezone variable" >&5
+echo "$as_me: WARNING: no timezone variable" >&2;}
+                                                fi
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
+
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5
-echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6; }
-    fi
 
-    if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define WX_GMTOFF_IN_TM 1
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                        ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_var_timezone" >&5
+echo "${ECHO_T}$wx_cv_var_timezone" >&6; }
+
+        if test "x$wx_cv_var_timezone" != x ; then
+        cat >>confdefs.h <<_ACEOF
+#define WX_TIMEZONE $wx_cv_var_timezone
 _ACEOF
 
     fi
 
 
-
-for ac_func in gettimeofday ftime
+for ac_func in localtime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -46108,34 +46480,33 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
- break
+
 fi
 done
 
 
-    if test "$ac_cv_func_gettimeofday" = "yes"; then
-        { echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5
-echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6; }
-if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then
+    if test "$ac_cv_func_localtime" = "yes"; then
+        { echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
+echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
+if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-                        cat >conftest.$ac_ext <<_ACEOF
+            cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                    #include <sys/time.h>
-                    #include <unistd.h>
+                    #include <time.h>
 
 int
 main ()
 {
 
-                    struct timeval tv;
-                    gettimeofday(&tv, NULL);
+                    struct tm tm;
+                    tm.tm_gmtoff++;
 
   ;
   return 0;
@@ -46158,78 +46529,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  wx_cv_func_gettimeofday_has_2_args=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                        #include <sys/time.h>
-                        #include <unistd.h>
 
-int
-main ()
-{
-
-                        struct timeval tv;
-                        gettimeofday(&tv);
+                    wx_cv_struct_tm_has_gmtoff=yes
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  wx_cv_func_gettimeofday_has_2_args=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-
-                        { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5
-echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
-                        wx_cv_func_gettimeofday_has_2_args=unknown
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       wx_cv_struct_tm_has_gmtoff=no
 
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5
-echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5
+echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6; }
+    fi
 
-        if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define WX_GETTIMEOFDAY_NO_TZ 1
+    if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define WX_GMTOFF_IN_TM 1
 _ACEOF
 
-        fi
     fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
@@ -48211,10 +48533,14 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
 #define wxUSE_SYSTEM_OPTIONS 1
 _ACEOF
 
-    if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
-        "$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-    fi
+fi
+
+if test "$wxUSE_TASKBARICON" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_TASKBARICON 1
+_ACEOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
 fi