From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 29 Sep 1998 19:12:16 +0000 (+0000)
Subject: more bug fixes after USE_ to wxUSE_ change (now it finally seems to work)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8248314dbd676fcf412fb1acfda2e8dd81ad3d1a

more bug fixes after USE_ to wxUSE_ change (now it finally seems to work)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/configure b/configure
index f93fcf84eb..184fd458c1 100755
--- a/configure
+++ b/configure
@@ -4283,69 +4283,69 @@ touch ${OSTYPE}.system.cache.tmp
 touch ${OSTYPE}.system.cache
 
 
-DEFAULT_USE_GTK=1
-DEFAULT_USE_QT=0
-DEFAULT_USE_MOTIF=0
+DEFAULT_wxUSE_GTK=1
+DEFAULT_wxUSE_QT=0
+DEFAULT_wxUSE_MOTIF=0
 
 DEFAULT_wxUSE_THREADS=1
 
-DEFAULT_USE_SHARED=1
-DEFAULT_USE_OPTIMISE=1
-DEFAULT_USE_PROFILE=0
-DEFAULT_USE_DEBUG_FLAG=0
-DEFAULT_USE_DEBUG_INFO=0
-DEFAULT_USE_MEM_TRACING=0
-DEFAULT_USE_DMALLOC=0
-DEFAULT_USE_APPLE_IEEE=1
-DEFAULT_USE_IOSTREAMH=1
-
-DEFAULT_USE_ZLIB=1
-DEFAULT_USE_GDK_IMLIB=1
-DEFAULT_USE_LIBPNG=1
-DEFAULT_USE_ODBC=1
-
-DEFAULT_USE_COMBOBOX=1
-DEFAULT_USE_GAUGE=1
-DEFAULT_USE_SCROLLBAR=1
-DEFAULT_USE_LISTCTRL=1
-DEFAULT_USE_TREECTRL=1
-DEFAULT_USE_GRID=1
-DEFAULT_USE_TAB_DIALOG=1
-DEFAULT_USE_NOTEBOOK=1
-
-DEFAULT_USE_TIMEDATE=1
-DEFAULT_USE_FRACTION=1
-DEFAULT_USE_LOG=1
-DEFAULT_USE_INTL=1
-DEFAULT_USE_CONFIG=1
-DEFAULT_USE_STREAMS=1
-DEFAULT_USE_SERIAL=1
-DEFAULT_USE_FILE=1
-DEFAULT_USE_TEXTFILE=1
-
-DEFAULT_USE_AFM_FOR_POSTSCRIPT=1
+DEFAULT_wxUSE_SHARED=1
+DEFAULT_wxUSE_OPTIMISE=1
+DEFAULT_wxUSE_PROFILE=0
+DEFAULT_wxUSE_DEBUG_FLAG=0
+DEFAULT_wxUSE_DEBUG_INFO=0
+DEFAULT_wxUSE_MEM_TRACING=0
+DEFAULT_wxUSE_DMALLOC=0
+DEFAULT_wxUSE_APPLE_IEEE=1
+DEFAULT_wxUSE_IOSTREAMH=1
+
+DEFAULT_wxUSE_ZLIB=1
+DEFAULT_wxUSE_GDK_IMLIB=1
+DEFAULT_wxUSE_LIBPNG=1
+DEFAULT_wxUSE_ODBC=1
+
+DEFAULT_wxUSE_COMBOBOX=1
+DEFAULT_wxUSE_GAUGE=1
+DEFAULT_wxUSE_SCROLLBAR=1
+DEFAULT_wxUSE_LISTCTRL=1
+DEFAULT_wxUSE_TREECTRL=1
+DEFAULT_wxUSE_GRID=1
+DEFAULT_wxUSE_TAB_DIALOG=1
+DEFAULT_wxUSE_NOTEBOOK=1
+
+DEFAULT_wxUSE_TIMEDATE=1
+DEFAULT_wxUSE_FRACTION=1
+DEFAULT_wxUSE_LOG=1
+DEFAULT_wxUSE_INTL=1
+DEFAULT_wxUSE_CONFIG=1
+DEFAULT_wxUSE_STREAMS=1
+DEFAULT_wxUSE_SERIAL=1
+DEFAULT_wxUSE_FILE=1
+DEFAULT_wxUSE_TEXTFILE=1
+
+DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=1
 DEFAULT_WX_NORMALIZED_PS_FONTS=1
-DEFAULT_USE_POSTSCRIPT=1
+DEFAULT_wxUSE_POSTSCRIPT=1
 
-DEFAULT_USE_IPC=1
-DEFAULT_USE_RESOURCES=1
-DEFAULT_USE_CONSTRAINTS=1
-DEFAULT_USE_CLIPBOARD=0
-DEFAULT_USE_DND=1
+DEFAULT_wxUSE_IPC=1
+DEFAULT_wxUSE_RESOURCES=1
+DEFAULT_wxUSE_CONSTRAINTS=1
+DEFAULT_wxUSE_CLIPBOARD=0
+DEFAULT_wxUSE_DND=1
 
-DEFAULT_USE_MDI_ARCHITECTURE=1
-DEFAULT_USE_DOC_VIEW_ARCHITECTURE=1
-DEFAULT_USE_PRINTING_ARCHITECTURE=1
+DEFAULT_wxUSE_MDI_ARCHITECTURE=1
+DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1
+DEFAULT_wxUSE_PRINTING_ARCHITECTURE=1
 
-DEFAULT_USE_PROLOGIO=1
-DEFAULT_USE_WX_RESOURCES=1
-DEFAULT_USE_RPC=0
+DEFAULT_wxUSE_PROLOGIO=1
+DEFAULT_wxUSE_WX_RESOURCES=1
+DEFAULT_wxUSE_RPC=0
 
-DEFAULT_USE_OPENGL=0
-DEFAULT_USE_METAFILE=0
-DEFAULT_USE_WXGRAPH=0
-DEFAULT_USE_WXTREE=0
-DEFAULT_USE_HELP=0
+DEFAULT_wxUSE_OPENGL=0
+DEFAULT_wxUSE_METAFILE=0
+DEFAULT_wxUSE_WXGRAPH=0
+DEFAULT_wxUSE_WXTREE=0
+DEFAULT_wxUSE_HELP=0
 
 
 
@@ -4355,23 +4355,23 @@ echo "configure:4354: checking "for gtk"" >&5
 if test "${with_gtk+set}" = set; then
   withval="$with_gtk"
   if test "x$with_gtk" = xyes; then
-  ac_cv_use_gtk='USE_GTK="1"'
+  ac_cv_use_gtk='wxUSE_GTK="1"'
 else
-  ac_cv_use_gtk='USE_GTK="0"'
+  ac_cv_use_gtk='wxUSE_GTK="0"'
 fi
 else
   
-  LINE=`grep "USE_GTK" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_GTK" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_gtk='USE_GTK='$DEFAULT_USE_GTK
+  ac_cv_use_gtk='wxUSE_GTK='$DEFAULT_wxUSE_GTK
 
 fi
 
 eval "$ac_cv_use_gtk"
 echo $ac_cv_use_gtk >> ${OSTYPE}.system.cache.tmp
-if test "$USE_GTK" = 1; then
+if test "$wxUSE_GTK" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4385,23 +4385,23 @@ echo "configure:4384: checking "for qt"" >&5
 if test "${with_qt+set}" = set; then
   withval="$with_qt"
   if test "x$with_qt" = xyes; then
-  ac_cv_use_qt='USE_QT="1"'
+  ac_cv_use_qt='wxUSE_QT="1"'
 else
-  ac_cv_use_qt='USE_QT="0"'
+  ac_cv_use_qt='wxUSE_QT="0"'
 fi
 else
   
-  LINE=`grep "USE_QT" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_QT" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_qt='USE_QT='$DEFAULT_USE_QT
+  ac_cv_use_qt='wxUSE_QT='$DEFAULT_wxUSE_QT
 
 fi
 
 eval "$ac_cv_use_qt"
 echo $ac_cv_use_qt >> ${OSTYPE}.system.cache.tmp
-if test "$USE_QT" = 1; then
+if test "$wxUSE_QT" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4415,23 +4415,23 @@ echo "configure:4414: checking "for motif"" >&5
 if test "${with_motif+set}" = set; then
   withval="$with_motif"
   if test "x$with_motif" = xyes; then
-  ac_cv_use_motif='USE_MOTIF="1"'
+  ac_cv_use_motif='wxUSE_MOTIF="1"'
 else
-  ac_cv_use_motif='USE_MOTIF="0"'
+  ac_cv_use_motif='wxUSE_MOTIF="0"'
 fi
 else
   
-  LINE=`grep "USE_MOTIF" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_MOTIF" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_motif='USE_MOTIF='$DEFAULT_USE_MOTIF
+  ac_cv_use_motif='wxUSE_MOTIF='$DEFAULT_wxUSE_MOTIF
 
 fi
 
 eval "$ac_cv_use_motif"
 echo $ac_cv_use_motif >> ${OSTYPE}.system.cache.tmp
-if test "$USE_MOTIF" = 1; then
+if test "$wxUSE_MOTIF" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4446,23 +4446,23 @@ echo "configure:4445: checking "for shared"" >&5
 if test "${with_shared+set}" = set; then
   withval="$with_shared"
   if test "x$with_shared" = xyes; then
-  ac_cv_use_shared='USE_SHARED="1"'
+  ac_cv_use_shared='wxUSE_SHARED="1"'
 else
-  ac_cv_use_shared='USE_SHARED="0"'
+  ac_cv_use_shared='wxUSE_SHARED="0"'
 fi
 else
   
-  LINE=`grep "USE_SHARED" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_SHARED" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_shared='USE_SHARED='$DEFAULT_USE_SHARED
+  ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED
 
 fi
 
 eval "$ac_cv_use_shared"
 echo $ac_cv_use_shared >> ${OSTYPE}.system.cache.tmp
-if test "$USE_SHARED" = 1; then
+if test "$wxUSE_SHARED" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4476,23 +4476,23 @@ echo "configure:4475: checking "for optimise"" >&5
 if test "${with_optimise+set}" = set; then
   withval="$with_optimise"
   if test "x$with_optimise" = xyes; then
-  ac_cv_use_optimise='USE_OPTIMISE="1"'
+  ac_cv_use_optimise='wxUSE_OPTIMISE="1"'
 else
-  ac_cv_use_optimise='USE_OPTIMISE="0"'
+  ac_cv_use_optimise='wxUSE_OPTIMISE="0"'
 fi
 else
   
-  LINE=`grep "USE_OPTIMISE" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_OPTIMISE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_optimise='USE_OPTIMISE='$DEFAULT_USE_OPTIMISE
+  ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE
 
 fi
 
 eval "$ac_cv_use_optimise"
 echo $ac_cv_use_optimise >> ${OSTYPE}.system.cache.tmp
-if test "$USE_OPTIMISE" = 1; then
+if test "$wxUSE_OPTIMISE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4506,23 +4506,23 @@ echo "configure:4505: checking "for debug_flag"" >&5
 if test "${with_debug_flag+set}" = set; then
   withval="$with_debug_flag"
   if test "x$with_debug_flag" = xyes; then
-  ac_cv_use_debug_flag='USE_DEBUG_FLAG="1"'
+  ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG="1"'
 else
-  ac_cv_use_debug_flag='USE_DEBUG_FLAG="0"'
+  ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG="0"'
 fi
 else
   
-  LINE=`grep "USE_DEBUG_FLAG" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_DEBUG_FLAG" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_debug_flag='USE_DEBUG_FLAG='$DEFAULT_USE_DEBUG_FLAG
+  ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG
 
 fi
 
 eval "$ac_cv_use_debug_flag"
 echo $ac_cv_use_debug_flag >> ${OSTYPE}.system.cache.tmp
-if test "$USE_DEBUG_FLAG" = 1; then
+if test "$wxUSE_DEBUG_FLAG" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4536,23 +4536,23 @@ echo "configure:4535: checking "for debug_info"" >&5
 if test "${with_debug_info+set}" = set; then
   withval="$with_debug_info"
   if test "x$with_debug_info" = xyes; then
-  ac_cv_use_debug_info='USE_DEBUG_INFO="1"'
+  ac_cv_use_debug_info='wxUSE_DEBUG_INFO="1"'
 else
-  ac_cv_use_debug_info='USE_DEBUG_INFO="0"'
+  ac_cv_use_debug_info='wxUSE_DEBUG_INFO="0"'
 fi
 else
   
-  LINE=`grep "USE_DEBUG_INFO" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_DEBUG_INFO" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_debug_info='USE_DEBUG_INFO='$DEFAULT_USE_DEBUG_INFO
+  ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO
 
 fi
 
 eval "$ac_cv_use_debug_info"
 echo $ac_cv_use_debug_info >> ${OSTYPE}.system.cache.tmp
-if test "$USE_DEBUG_INFO" = 1; then
+if test "$wxUSE_DEBUG_INFO" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4566,23 +4566,23 @@ echo "configure:4565: checking "for mem_tracing"" >&5
 if test "${with_mem_tracing+set}" = set; then
   withval="$with_mem_tracing"
   if test "x$with_mem_tracing" = xyes; then
-  ac_cv_use_mem_tracing='USE_MEM_TRACING="1"'
+  ac_cv_use_mem_tracing='wxUSE_MEM_TRACING="1"'
 else
-  ac_cv_use_mem_tracing='USE_MEM_TRACING="0"'
+  ac_cv_use_mem_tracing='wxUSE_MEM_TRACING="0"'
 fi
 else
   
-  LINE=`grep "USE_MEM_TRACING" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_MEM_TRACING" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_mem_tracing='USE_MEM_TRACING='$DEFAULT_USE_MEM_TRACING
+  ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING
 
 fi
 
 eval "$ac_cv_use_mem_tracing"
 echo $ac_cv_use_mem_tracing >> ${OSTYPE}.system.cache.tmp
-if test "$USE_MEM_TRACING" = 1; then
+if test "$wxUSE_MEM_TRACING" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4596,23 +4596,23 @@ echo "configure:4595: checking "for dmalloc"" >&5
 if test "${with_dmalloc+set}" = set; then
   withval="$with_dmalloc"
   if test "x$with_dmalloc" = xyes; then
-  ac_cv_use_dmalloc='USE_DMALLOC="1"'
+  ac_cv_use_dmalloc='wxUSE_DMALLOC="1"'
 else
-  ac_cv_use_dmalloc='USE_DMALLOC="0"'
+  ac_cv_use_dmalloc='wxUSE_DMALLOC="0"'
 fi
 else
   
-  LINE=`grep "USE_DMALLOC" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_DMALLOC" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_dmalloc='USE_DMALLOC='$DEFAULT_USE_DMALLOC
+  ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC
 
 fi
 
 eval "$ac_cv_use_dmalloc"
 echo $ac_cv_use_dmalloc >> ${OSTYPE}.system.cache.tmp
-if test "$USE_DMALLOC" = 1; then
+if test "$wxUSE_DMALLOC" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4626,23 +4626,23 @@ echo "configure:4625: checking "for profile"" >&5
 if test "${with_profile+set}" = set; then
   withval="$with_profile"
   if test "x$with_profile" = xyes; then
-  ac_cv_use_profile='USE_PROFILE="1"'
+  ac_cv_use_profile='wxUSE_PROFILE="1"'
 else
-  ac_cv_use_profile='USE_PROFILE="0"'
+  ac_cv_use_profile='wxUSE_PROFILE="0"'
 fi
 else
   
-  LINE=`grep "USE_PROFILE" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_PROFILE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_profile='USE_PROFILE='$DEFAULT_USE_PROFILE
+  ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE
 
 fi
 
 eval "$ac_cv_use_profile"
 echo $ac_cv_use_profile >> ${OSTYPE}.system.cache.tmp
-if test "$USE_PROFILE" = 1; then
+if test "$wxUSE_PROFILE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4656,23 +4656,23 @@ echo "configure:4655: checking "for apple_ieee"" >&5
 if test "${with_apple_ieee+set}" = set; then
   withval="$with_apple_ieee"
   if test "x$with_apple_ieee" = xyes; then
-  ac_cv_use_apple_ieee='USE_APPLE_IEEE="1"'
+  ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE="1"'
 else
-  ac_cv_use_apple_ieee='USE_APPLE_IEEE="0"'
+  ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE="0"'
 fi
 else
   
-  LINE=`grep "USE_APPLE_IEEE" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_APPLE_IEEE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_apple_ieee='USE_APPLE_IEEE='$DEFAULT_USE_APPLE_IEEE
+  ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
 
 fi
 
 eval "$ac_cv_use_apple_ieee"
 echo $ac_cv_use_apple_ieee >> ${OSTYPE}.system.cache.tmp
-if test "$USE_APPLE_IEEE" = 1; then
+if test "$wxUSE_APPLE_IEEE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4687,23 +4687,23 @@ echo "configure:4686: checking "for zlib"" >&5
 if test "${with_zlib+set}" = set; then
   withval="$with_zlib"
   if test "x$with_zlib" = xyes; then
-  ac_cv_use_zlib='USE_ZLIB="1"'
+  ac_cv_use_zlib='wxUSE_ZLIB="1"'
 else
-  ac_cv_use_zlib='USE_ZLIB="0"'
+  ac_cv_use_zlib='wxUSE_ZLIB="0"'
 fi
 else
   
-  LINE=`grep "USE_ZLIB" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_ZLIB" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_zlib='USE_ZLIB='$DEFAULT_USE_ZLIB
+  ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB
 
 fi
 
 eval "$ac_cv_use_zlib"
 echo $ac_cv_use_zlib >> ${OSTYPE}.system.cache.tmp
-if test "$USE_ZLIB" = 1; then
+if test "$wxUSE_ZLIB" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4717,23 +4717,23 @@ echo "configure:4716: checking "for gdk_imlib"" >&5
 if test "${with_gdk_imlib+set}" = set; then
   withval="$with_gdk_imlib"
   if test "x$with_gdk_imlib" = xyes; then
-  ac_cv_use_gdk_imlib='USE_GDK_IMLIB="1"'
+  ac_cv_use_gdk_imlib='wxUSE_GDK_IMLIB="1"'
 else
-  ac_cv_use_gdk_imlib='USE_GDK_IMLIB="0"'
+  ac_cv_use_gdk_imlib='wxUSE_GDK_IMLIB="0"'
 fi
 else
   
-  LINE=`grep "USE_GDK_IMLIB" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_GDK_IMLIB" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_gdk_imlib='USE_GDK_IMLIB='$DEFAULT_USE_GDK_IMLIB
+  ac_cv_use_gdk_imlib='wxUSE_GDK_IMLIB='$DEFAULT_wxUSE_GDK_IMLIB
 
 fi
 
 eval "$ac_cv_use_gdk_imlib"
 echo $ac_cv_use_gdk_imlib >> ${OSTYPE}.system.cache.tmp
-if test "$USE_GDK_IMLIB" = 1; then
+if test "$wxUSE_GDK_IMLIB" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4747,23 +4747,23 @@ echo "configure:4746: checking "for libpng"" >&5
 if test "${with_libpng+set}" = set; then
   withval="$with_libpng"
   if test "x$with_libpng" = xyes; then
-  ac_cv_use_libpng='USE_LIBPNG="1"'
+  ac_cv_use_libpng='wxUSE_LIBPNG="1"'
 else
-  ac_cv_use_libpng='USE_LIBPNG="0"'
+  ac_cv_use_libpng='wxUSE_LIBPNG="0"'
 fi
 else
   
-  LINE=`grep "USE_LIBPNG" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_LIBPNG" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_libpng='USE_LIBPNG='$DEFAULT_USE_LIBPNG
+  ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG
 
 fi
 
 eval "$ac_cv_use_libpng"
 echo $ac_cv_use_libpng >> ${OSTYPE}.system.cache.tmp
-if test "$USE_LIBPNG" = 1; then
+if test "$wxUSE_LIBPNG" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4777,23 +4777,23 @@ echo "configure:4776: checking "for odbc"" >&5
 if test "${with_odbc+set}" = set; then
   withval="$with_odbc"
   if test "x$with_odbc" = xyes; then
-  ac_cv_use_odbc='USE_ODBC="1"'
+  ac_cv_use_odbc='wxUSE_ODBC="1"'
 else
-  ac_cv_use_odbc='USE_ODBC="0"'
+  ac_cv_use_odbc='wxUSE_ODBC="0"'
 fi
 else
   
-  LINE=`grep "USE_ODBC" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_ODBC" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_odbc='USE_ODBC='$DEFAULT_USE_ODBC
+  ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC
 
 fi
 
 eval "$ac_cv_use_odbc"
 echo $ac_cv_use_odbc >> ${OSTYPE}.system.cache.tmp
-if test "$USE_ODBC" = 1; then
+if test "$wxUSE_ODBC" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4807,23 +4807,23 @@ echo "configure:4806: checking "for opengl"" >&5
 if test "${with_opengl+set}" = set; then
   withval="$with_opengl"
   if test "x$with_opengl" = xyes; then
-  ac_cv_use_opengl='USE_OPENGL="1"'
+  ac_cv_use_opengl='wxUSE_OPENGL="1"'
 else
-  ac_cv_use_opengl='USE_OPENGL="0"'
+  ac_cv_use_opengl='wxUSE_OPENGL="0"'
 fi
 else
   
-  LINE=`grep "USE_OPENGL" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_OPENGL" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_opengl='USE_OPENGL='$DEFAULT_USE_OPENGL
+  ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL
 
 fi
 
 eval "$ac_cv_use_opengl"
 echo $ac_cv_use_opengl >> ${OSTYPE}.system.cache.tmp
-if test "$USE_OPENGL" = 1; then
+if test "$wxUSE_OPENGL" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4838,23 +4838,23 @@ echo "configure:4837: checking "for gauge"" >&5
 if test "${with_gauge+set}" = set; then
   withval="$with_gauge"
   if test "x$with_gauge" = xyes; then
-  ac_cv_use_gauge='USE_GAUGE="1"'
+  ac_cv_use_gauge='wxUSE_GAUGE="1"'
 else
-  ac_cv_use_gauge='USE_GAUGE="0"'
+  ac_cv_use_gauge='wxUSE_GAUGE="0"'
 fi
 else
   
-  LINE=`grep "USE_GAUGE" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_GAUGE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_gauge='USE_GAUGE='$DEFAULT_USE_GAUGE
+  ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
 
 fi
 
 eval "$ac_cv_use_gauge"
 echo $ac_cv_use_gauge >> ${OSTYPE}.system.cache.tmp
-if test "$USE_GAUGE" = 1; then
+if test "$wxUSE_GAUGE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4868,23 +4868,23 @@ echo "configure:4867: checking "for combobox"" >&5
 if test "${with_combobox+set}" = set; then
   withval="$with_combobox"
   if test "x$with_combobox" = xyes; then
-  ac_cv_use_combobox='USE_COMBOBOX="1"'
+  ac_cv_use_combobox='wxUSE_COMBOBOX="1"'
 else
-  ac_cv_use_combobox='USE_COMBOBOX="0"'
+  ac_cv_use_combobox='wxUSE_COMBOBOX="0"'
 fi
 else
   
-  LINE=`grep "USE_COMBOBOX" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_COMBOBOX" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_combobox='USE_COMBOBOX='$DEFAULT_USE_COMBOBOX
+  ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX
 
 fi
 
 eval "$ac_cv_use_combobox"
 echo $ac_cv_use_combobox >> ${OSTYPE}.system.cache.tmp
-if test "$USE_COMBOBOX" = 1; then
+if test "$wxUSE_COMBOBOX" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4898,23 +4898,23 @@ echo "configure:4897: checking "for scrollbar"" >&5
 if test "${with_scrollbar+set}" = set; then
   withval="$with_scrollbar"
   if test "x$with_scrollbar" = xyes; then
-  ac_cv_use_scrollbar='USE_SCROLLBAR="1"'
+  ac_cv_use_scrollbar='wxUSE_SCROLLBAR="1"'
 else
-  ac_cv_use_scrollbar='USE_SCROLLBAR="0"'
+  ac_cv_use_scrollbar='wxUSE_SCROLLBAR="0"'
 fi
 else
   
-  LINE=`grep "USE_SCROLLBAR" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_SCROLLBAR" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_scrollbar='USE_SCROLLBAR='$DEFAULT_USE_SCROLLBAR
+  ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR
 
 fi
 
 eval "$ac_cv_use_scrollbar"
 echo $ac_cv_use_scrollbar >> ${OSTYPE}.system.cache.tmp
-if test "$USE_SCROLLBAR" = 1; then
+if test "$wxUSE_SCROLLBAR" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4928,23 +4928,23 @@ echo "configure:4927: checking "for listctrl"" >&5
 if test "${with_listctrl+set}" = set; then
   withval="$with_listctrl"
   if test "x$with_listctrl" = xyes; then
-  ac_cv_use_listctrl='USE_LISTCTRL="1"'
+  ac_cv_use_listctrl='wxUSE_LISTCTRL="1"'
 else
-  ac_cv_use_listctrl='USE_LISTCTRL="0"'
+  ac_cv_use_listctrl='wxUSE_LISTCTRL="0"'
 fi
 else
   
-  LINE=`grep "USE_LISTCTRL" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_LISTCTRL" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_listctrl='USE_LISTCTRL='$DEFAULT_USE_LISTCTRL
+  ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL
 
 fi
 
 eval "$ac_cv_use_listctrl"
 echo $ac_cv_use_listctrl >> ${OSTYPE}.system.cache.tmp
-if test "$USE_LISTCTRL" = 1; then
+if test "$wxUSE_LISTCTRL" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4958,23 +4958,23 @@ echo "configure:4957: checking "for treectrl"" >&5
 if test "${with_treectrl+set}" = set; then
   withval="$with_treectrl"
   if test "x$with_treectrl" = xyes; then
-  ac_cv_use_treectrl='USE_TREECTRL="1"'
+  ac_cv_use_treectrl='wxUSE_TREECTRL="1"'
 else
-  ac_cv_use_treectrl='USE_TREECTRL="0"'
+  ac_cv_use_treectrl='wxUSE_TREECTRL="0"'
 fi
 else
   
-  LINE=`grep "USE_TREECTRL" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_TREECTRL" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_treectrl='USE_TREECTRL='$DEFAULT_USE_TREECTRL
+  ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
 
 fi
 
 eval "$ac_cv_use_treectrl"
 echo $ac_cv_use_treectrl >> ${OSTYPE}.system.cache.tmp
-if test "$USE_TREECTRL" = 1; then
+if test "$wxUSE_TREECTRL" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4988,23 +4988,23 @@ echo "configure:4987: checking "for grid"" >&5
 if test "${with_grid+set}" = set; then
   withval="$with_grid"
   if test "x$with_grid" = xyes; then
-  ac_cv_use_grid='USE_GRID="1"'
+  ac_cv_use_grid='wxUSE_GRID="1"'
 else
-  ac_cv_use_grid='USE_GRID="0"'
+  ac_cv_use_grid='wxUSE_GRID="0"'
 fi
 else
   
-  LINE=`grep "USE_GRID" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_GRID" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_grid='USE_GRID='$DEFAULT_USE_GRID
+  ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
 
 fi
 
 eval "$ac_cv_use_grid"
 echo $ac_cv_use_grid >> ${OSTYPE}.system.cache.tmp
-if test "$USE_GRID" = 1; then
+if test "$wxUSE_GRID" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5018,23 +5018,23 @@ echo "configure:5017: checking "for tab_dialog"" >&5
 if test "${with_tab_dialog+set}" = set; then
   withval="$with_tab_dialog"
   if test "x$with_tab_dialog" = xyes; then
-  ac_cv_use_tab_dialog='USE_TAB_DIALOG="1"'
+  ac_cv_use_tab_dialog='wxUSE_TAB_DIALOG="1"'
 else
-  ac_cv_use_tab_dialog='USE_TAB_DIALOG="0"'
+  ac_cv_use_tab_dialog='wxUSE_TAB_DIALOG="0"'
 fi
 else
   
-  LINE=`grep "USE_TAB_DIALOG" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_TAB_DIALOG" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_tab_dialog='USE_TAB_DIALOG='$DEFAULT_USE_TAB_DIALOG
+  ac_cv_use_tab_dialog='wxUSE_TAB_DIALOG='$DEFAULT_wxUSE_TAB_DIALOG
 
 fi
 
 eval "$ac_cv_use_tab_dialog"
 echo $ac_cv_use_tab_dialog >> ${OSTYPE}.system.cache.tmp
-if test "$USE_TAB_DIALOG" = 1; then
+if test "$wxUSE_TAB_DIALOG" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5048,23 +5048,23 @@ echo "configure:5047: checking "for notebook"" >&5
 if test "${with_notebook+set}" = set; then
   withval="$with_notebook"
   if test "x$with_notebook" = xyes; then
-  ac_cv_use_notebook='USE_NOTEBOOK="1"'
+  ac_cv_use_notebook='wxUSE_NOTEBOOK="1"'
 else
-  ac_cv_use_notebook='USE_NOTEBOOK="0"'
+  ac_cv_use_notebook='wxUSE_NOTEBOOK="0"'
 fi
 else
   
-  LINE=`grep "USE_NOTEBOOK" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_NOTEBOOK" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_notebook='USE_NOTEBOOK='$DEFAULT_USE_NOTEBOOK
+  ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
 
 fi
 
 eval "$ac_cv_use_notebook"
 echo $ac_cv_use_notebook >> ${OSTYPE}.system.cache.tmp
-if test "$USE_NOTEBOOK" = 1; then
+if test "$wxUSE_NOTEBOOK" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5079,23 +5079,23 @@ echo "configure:5078: checking "for timedate"" >&5
 if test "${with_timedate+set}" = set; then
   withval="$with_timedate"
   if test "x$with_timedate" = xyes; then
-  ac_cv_use_timedate='USE_TIMEDATE="1"'
+  ac_cv_use_timedate='wxUSE_TIMEDATE="1"'
 else
-  ac_cv_use_timedate='USE_TIMEDATE="0"'
+  ac_cv_use_timedate='wxUSE_TIMEDATE="0"'
 fi
 else
   
-  LINE=`grep "USE_TIMEDATE" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_TIMEDATE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_timedate='USE_TIMEDATE='$DEFAULT_USE_TIMEDATE
+  ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE
 
 fi
 
 eval "$ac_cv_use_timedate"
 echo $ac_cv_use_timedate >> ${OSTYPE}.system.cache.tmp
-if test "$USE_TIMEDATE" = 1; then
+if test "$wxUSE_TIMEDATE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5109,23 +5109,23 @@ echo "configure:5108: checking "for fraction"" >&5
 if test "${with_fraction+set}" = set; then
   withval="$with_fraction"
   if test "x$with_fraction" = xyes; then
-  ac_cv_use_fraction='USE_FRACTION="1"'
+  ac_cv_use_fraction='wxUSE_FRACTION="1"'
 else
-  ac_cv_use_fraction='USE_FRACTION="0"'
+  ac_cv_use_fraction='wxUSE_FRACTION="0"'
 fi
 else
   
-  LINE=`grep "USE_FRACTION" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_FRACTION" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_fraction='USE_FRACTION='$DEFAULT_USE_FRACTION
+  ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
 
 fi
 
 eval "$ac_cv_use_fraction"
 echo $ac_cv_use_fraction >> ${OSTYPE}.system.cache.tmp
-if test "$USE_FRACTION" = 1; then
+if test "$wxUSE_FRACTION" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5139,23 +5139,23 @@ echo "configure:5138: checking "for log"" >&5
 if test "${with_log+set}" = set; then
   withval="$with_log"
   if test "x$with_log" = xyes; then
-  ac_cv_use_log='USE_LOG="1"'
+  ac_cv_use_log='wxUSE_LOG="1"'
 else
-  ac_cv_use_log='USE_LOG="0"'
+  ac_cv_use_log='wxUSE_LOG="0"'
 fi
 else
   
-  LINE=`grep "USE_LOG" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_LOG" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_log='USE_LOG='$DEFAULT_USE_LOG
+  ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG
 
 fi
 
 eval "$ac_cv_use_log"
 echo $ac_cv_use_log >> ${OSTYPE}.system.cache.tmp
-if test "$USE_LOG" = 1; then
+if test "$wxUSE_LOG" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5169,23 +5169,23 @@ echo "configure:5168: checking "for intl"" >&5
 if test "${with_intl+set}" = set; then
   withval="$with_intl"
   if test "x$with_intl" = xyes; then
-  ac_cv_use_intl='USE_INTL="1"'
+  ac_cv_use_intl='wxUSE_INTL="1"'
 else
-  ac_cv_use_intl='USE_INTL="0"'
+  ac_cv_use_intl='wxUSE_INTL="0"'
 fi
 else
   
-  LINE=`grep "USE_INTL" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_INTL" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_intl='USE_INTL='$DEFAULT_USE_INTL
+  ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL
 
 fi
 
 eval "$ac_cv_use_intl"
 echo $ac_cv_use_intl >> ${OSTYPE}.system.cache.tmp
-if test "$USE_INTL" = 1; then
+if test "$wxUSE_INTL" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5199,23 +5199,23 @@ echo "configure:5198: checking "for config"" >&5
 if test "${with_config+set}" = set; then
   withval="$with_config"
   if test "x$with_config" = xyes; then
-  ac_cv_use_config='USE_CONFIG="1"'
+  ac_cv_use_config='wxUSE_CONFIG="1"'
 else
-  ac_cv_use_config='USE_CONFIG="0"'
+  ac_cv_use_config='wxUSE_CONFIG="0"'
 fi
 else
   
-  LINE=`grep "USE_CONFIG" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_CONFIG" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_config='USE_CONFIG='$DEFAULT_USE_CONFIG
+  ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG
 
 fi
 
 eval "$ac_cv_use_config"
 echo $ac_cv_use_config >> ${OSTYPE}.system.cache.tmp
-if test "$USE_CONFIG" = 1; then
+if test "$wxUSE_CONFIG" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5229,23 +5229,23 @@ echo "configure:5228: checking "for streams"" >&5
 if test "${with_streams+set}" = set; then
   withval="$with_streams"
   if test "x$with_streams" = xyes; then
-  ac_cv_use_streams='USE_STREAMS="1"'
+  ac_cv_use_streams='wxUSE_STREAMS="1"'
 else
-  ac_cv_use_streams='USE_STREAMS="0"'
+  ac_cv_use_streams='wxUSE_STREAMS="0"'
 fi
 else
   
-  LINE=`grep "USE_STREAMS" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_STREAMS" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_streams='USE_STREAMS='$DEFAULT_USE_STREAMS
+  ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
 
 fi
 
 eval "$ac_cv_use_streams"
 echo $ac_cv_use_streams >> ${OSTYPE}.system.cache.tmp
-if test "$USE_STREAMS" = 1; then
+if test "$wxUSE_STREAMS" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5259,23 +5259,23 @@ echo "configure:5258: checking "for serial"" >&5
 if test "${with_serial+set}" = set; then
   withval="$with_serial"
   if test "x$with_serial" = xyes; then
-  ac_cv_use_serial='USE_SERIAL="1"'
+  ac_cv_use_serial='wxUSE_SERIAL="1"'
 else
-  ac_cv_use_serial='USE_SERIAL="0"'
+  ac_cv_use_serial='wxUSE_SERIAL="0"'
 fi
 else
   
-  LINE=`grep "USE_SERIAL" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_SERIAL" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_serial='USE_SERIAL='$DEFAULT_USE_SERIAL
+  ac_cv_use_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL
 
 fi
 
 eval "$ac_cv_use_serial"
 echo $ac_cv_use_serial >> ${OSTYPE}.system.cache.tmp
-if test "$USE_SERIAL" = 1; then
+if test "$wxUSE_SERIAL" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5289,23 +5289,23 @@ echo "configure:5288: checking "for file"" >&5
 if test "${with_file+set}" = set; then
   withval="$with_file"
   if test "x$with_file" = xyes; then
-  ac_cv_use_file='USE_FILE="1"'
+  ac_cv_use_file='wxUSE_FILE="1"'
 else
-  ac_cv_use_file='USE_FILE="0"'
+  ac_cv_use_file='wxUSE_FILE="0"'
 fi
 else
   
-  LINE=`grep "USE_FILE" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_FILE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_file='USE_FILE='$DEFAULT_USE_FILE
+  ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
 
 fi
 
 eval "$ac_cv_use_file"
 echo $ac_cv_use_file >> ${OSTYPE}.system.cache.tmp
-if test "$USE_FILE" = 1; then
+if test "$wxUSE_FILE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5319,23 +5319,23 @@ echo "configure:5318: checking "for textfile"" >&5
 if test "${with_textfile+set}" = set; then
   withval="$with_textfile"
   if test "x$with_textfile" = xyes; then
-  ac_cv_use_textfile='USE_TEXTFILE="1"'
+  ac_cv_use_textfile='wxUSE_TEXTFILE="1"'
 else
-  ac_cv_use_textfile='USE_TEXTFILE="0"'
+  ac_cv_use_textfile='wxUSE_TEXTFILE="0"'
 fi
 else
   
-  LINE=`grep "USE_TEXTFILE" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_TEXTFILE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_textfile='USE_TEXTFILE='$DEFAULT_USE_TEXTFILE
+  ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
 
 fi
 
 eval "$ac_cv_use_textfile"
 echo $ac_cv_use_textfile >> ${OSTYPE}.system.cache.tmp
-if test "$USE_TEXTFILE" = 1; then
+if test "$wxUSE_TEXTFILE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5350,23 +5350,23 @@ echo "configure:5349: checking "for afmfonts"" >&5
 if test "${with_afmfonts+set}" = set; then
   withval="$with_afmfonts"
   if test "x$with_afmfonts" = xyes; then
-  ac_cv_use_afmfonts='USE_AFM_FOR_POSTSCRIPT="1"'
+  ac_cv_use_afmfonts='wxUSE_AFM_FOR_POSTSCRIPT="1"'
 else
-  ac_cv_use_afmfonts='USE_AFM_FOR_POSTSCRIPT="0"'
+  ac_cv_use_afmfonts='wxUSE_AFM_FOR_POSTSCRIPT="0"'
 fi
 else
   
-  LINE=`grep "USE_AFM_FOR_POSTSCRIPT" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_AFM_FOR_POSTSCRIPT" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_afmfonts='USE_AFM_FOR_POSTSCRIPT='$DEFAULT_USE_AFM_FOR_POSTSCRIPT
+  ac_cv_use_afmfonts='wxUSE_AFM_FOR_POSTSCRIPT='$DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT
 
 fi
 
 eval "$ac_cv_use_afmfonts"
 echo $ac_cv_use_afmfonts >> ${OSTYPE}.system.cache.tmp
-if test "$USE_AFM_FOR_POSTSCRIPT" = 1; then
+if test "$wxUSE_AFM_FOR_POSTSCRIPT" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5410,23 +5410,23 @@ echo "configure:5409: checking "for postscript"" >&5
 if test "${with_postscript+set}" = set; then
   withval="$with_postscript"
   if test "x$with_postscript" = xyes; then
-  ac_cv_use_postscript='USE_POSTSCRIPT="1"'
+  ac_cv_use_postscript='wxUSE_POSTSCRIPT="1"'
 else
-  ac_cv_use_postscript='USE_POSTSCRIPT="0"'
+  ac_cv_use_postscript='wxUSE_POSTSCRIPT="0"'
 fi
 else
   
-  LINE=`grep "USE_POSTSCRIPT" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_POSTSCRIPT" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_postscript='USE_POSTSCRIPT='$DEFAULT_USE_POSTSCRIPT
+  ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
 
 fi
 
 eval "$ac_cv_use_postscript"
 echo $ac_cv_use_postscript >> ${OSTYPE}.system.cache.tmp
-if test "$USE_POSTSCRIPT" = 1; then
+if test "$wxUSE_POSTSCRIPT" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5441,23 +5441,23 @@ echo "configure:5440: checking "for wxresources"" >&5
 if test "${with_wxresources+set}" = set; then
   withval="$with_wxresources"
   if test "x$with_wxresources" = xyes; then
-  ac_cv_use_wxresources='USE_WX_RESOURCES="1"'
+  ac_cv_use_wxresources='wxUSE_WX_RESOURCES="1"'
 else
-  ac_cv_use_wxresources='USE_WX_RESOURCES="0"'
+  ac_cv_use_wxresources='wxUSE_WX_RESOURCES="0"'
 fi
 else
   
-  LINE=`grep "USE_WX_RESOURCES" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_WX_RESOURCES" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_wxresources='USE_WX_RESOURCES='$DEFAULT_USE_WX_RESOURCES
+  ac_cv_use_wxresources='wxUSE_WX_RESOURCES='$DEFAULT_wxUSE_WX_RESOURCES
 
 fi
 
 eval "$ac_cv_use_wxresources"
 echo $ac_cv_use_wxresources >> ${OSTYPE}.system.cache.tmp
-if test "$USE_WX_RESOURCES" = 1; then
+if test "$wxUSE_WX_RESOURCES" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5471,23 +5471,23 @@ echo "configure:5470: checking "for prologio"" >&5
 if test "${with_prologio+set}" = set; then
   withval="$with_prologio"
   if test "x$with_prologio" = xyes; then
-  ac_cv_use_prologio='USE_PROLOGIO="1"'
+  ac_cv_use_prologio='wxUSE_PROLOGIO="1"'
 else
-  ac_cv_use_prologio='USE_PROLOGIO="0"'
+  ac_cv_use_prologio='wxUSE_PROLOGIO="0"'
 fi
 else
   
-  LINE=`grep "USE_PROLOGIO" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_PROLOGIO" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_prologio='USE_PROLOGIO='$DEFAULT_USE_PROLOGIO
+  ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
 
 fi
 
 eval "$ac_cv_use_prologio"
 echo $ac_cv_use_prologio >> ${OSTYPE}.system.cache.tmp
-if test "$USE_PROLOGIO" = 1; then
+if test "$wxUSE_PROLOGIO" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5501,23 +5501,23 @@ echo "configure:5500: checking "for RPC"" >&5
 if test "${with_rpc+set}" = set; then
   withval="$with_rpc"
   if test "x$with_rpc" = xyes; then
-  ac_cv_use_rpc='USE_RPC="1"'
+  ac_cv_use_rpc='wxUSE_RPC="1"'
 else
-  ac_cv_use_rpc='USE_RPC="0"'
+  ac_cv_use_rpc='wxUSE_RPC="0"'
 fi
 else
   
-  LINE=`grep "USE_RPC" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_RPC" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_rpc='USE_RPC='$DEFAULT_USE_RPC
+  ac_cv_use_rpc='wxUSE_RPC='$DEFAULT_wxUSE_RPC
 
 fi
 
 eval "$ac_cv_use_rpc"
 echo $ac_cv_use_rpc >> ${OSTYPE}.system.cache.tmp
-if test "$USE_RPC" = 1; then
+if test "$wxUSE_RPC" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5532,23 +5532,23 @@ echo "configure:5531: checking "for IPC"" >&5
 if test "${with_ipc+set}" = set; then
   withval="$with_ipc"
   if test "x$with_ipc" = xyes; then
-  ac_cv_use_ipc='USE_IPC="1"'
+  ac_cv_use_ipc='wxUSE_IPC="1"'
 else
-  ac_cv_use_ipc='USE_IPC="0"'
+  ac_cv_use_ipc='wxUSE_IPC="0"'
 fi
 else
   
-  LINE=`grep "USE_IPC" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_IPC" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_ipc='USE_IPC='$DEFAULT_USE_IPC
+  ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC
 
 fi
 
 eval "$ac_cv_use_ipc"
 echo $ac_cv_use_ipc >> ${OSTYPE}.system.cache.tmp
-if test "$USE_IPC" = 1; then
+if test "$wxUSE_IPC" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5562,23 +5562,23 @@ echo "configure:5561: checking "for resources"" >&5
 if test "${with_resources+set}" = set; then
   withval="$with_resources"
   if test "x$with_resources" = xyes; then
-  ac_cv_use_resources='USE_RESOURCES="1"'
+  ac_cv_use_resources='wxUSE_RESOURCES="1"'
 else
-  ac_cv_use_resources='USE_RESOURCES="0"'
+  ac_cv_use_resources='wxUSE_RESOURCES="0"'
 fi
 else
   
-  LINE=`grep "USE_RESOURCES" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_RESOURCES" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_resources='USE_RESOURCES='$DEFAULT_USE_RESOURCES
+  ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
 
 fi
 
 eval "$ac_cv_use_resources"
 echo $ac_cv_use_resources >> ${OSTYPE}.system.cache.tmp
-if test "$USE_RESOURCES" = 1; then
+if test "$wxUSE_RESOURCES" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5592,23 +5592,23 @@ echo "configure:5591: checking "for clipboard"" >&5
 if test "${with_clipboard+set}" = set; then
   withval="$with_clipboard"
   if test "x$with_clipboard" = xyes; then
-  ac_cv_use_clipboard='USE_CLIPBOARD="1"'
+  ac_cv_use_clipboard='wxUSE_CLIPBOARD="1"'
 else
-  ac_cv_use_clipboard='USE_CLIPBOARD="0"'
+  ac_cv_use_clipboard='wxUSE_CLIPBOARD="0"'
 fi
 else
   
-  LINE=`grep "USE_CLIPBOARD" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_CLIPBOARD" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_clipboard='USE_CLIPBOARD='$DEFAULT_USE_CLIPBOARD
+  ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
 
 fi
 
 eval "$ac_cv_use_clipboard"
 echo $ac_cv_use_clipboard >> ${OSTYPE}.system.cache.tmp
-if test "$USE_CLIPBOARD" = 1; then
+if test "$wxUSE_CLIPBOARD" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5622,23 +5622,23 @@ echo "configure:5621: checking "for dnd"" >&5
 if test "${with_dnd+set}" = set; then
   withval="$with_dnd"
   if test "x$with_dnd" = xyes; then
-  ac_cv_use_dnd='USE_DND="1"'
+  ac_cv_use_dnd='wxUSE_DND="1"'
 else
-  ac_cv_use_dnd='USE_DND="0"'
+  ac_cv_use_dnd='wxUSE_DND="0"'
 fi
 else
   
-  LINE=`grep "USE_DND" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_DND" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_dnd='USE_DND='$DEFAULT_USE_DND
+  ac_cv_use_dnd='wxUSE_DND='$DEFAULT_wxUSE_DND
 
 fi
 
 eval "$ac_cv_use_dnd"
 echo $ac_cv_use_dnd >> ${OSTYPE}.system.cache.tmp
-if test "$USE_DND" = 1; then
+if test "$wxUSE_DND" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5652,23 +5652,23 @@ echo "configure:5651: checking "for constrains"" >&5
 if test "${with_constraints+set}" = set; then
   withval="$with_constraints"
   if test "x$with_constraints" = xyes; then
-  ac_cv_use_constraints='USE_CONSTRAINTS="1"'
+  ac_cv_use_constraints='wxUSE_CONSTRAINTS="1"'
 else
-  ac_cv_use_constraints='USE_CONSTRAINTS="0"'
+  ac_cv_use_constraints='wxUSE_CONSTRAINTS="0"'
 fi
 else
   
-  LINE=`grep "USE_CONSTRAINTS" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_CONSTRAINTS" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_constraints='USE_CONSTRAINTS='$DEFAULT_USE_CONSTRAINTS
+  ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
 
 fi
 
 eval "$ac_cv_use_constraints"
 echo $ac_cv_use_constraints >> ${OSTYPE}.system.cache.tmp
-if test "$USE_CONSTRAINTS" = 1; then
+if test "$wxUSE_CONSTRAINTS" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5683,23 +5683,23 @@ echo "configure:5682: checking "for mdi"" >&5
 if test "${with_mdi+set}" = set; then
   withval="$with_mdi"
   if test "x$with_mdi" = xyes; then
-  ac_cv_use_mdi='USE_MDI_ARCHITECTURE="1"'
+  ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE="1"'
 else
-  ac_cv_use_mdi='USE_MDI_ARCHITECTURE="0"'
+  ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE="0"'
 fi
 else
   
-  LINE=`grep "USE_MDI_ARCHITECTURE" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_mdi='USE_MDI_ARCHITECTURE='$DEFAULT_USE_MDI_ARCHITECTURE
+  ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
 
 fi
 
 eval "$ac_cv_use_mdi"
 echo $ac_cv_use_mdi >> ${OSTYPE}.system.cache.tmp
-if test "$USE_MDI_ARCHITECTURE" = 1; then
+if test "$wxUSE_MDI_ARCHITECTURE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5713,23 +5713,23 @@ echo "configure:5712: checking "for docview"" >&5
 if test "${with_docview+set}" = set; then
   withval="$with_docview"
   if test "x$with_docview" = xyes; then
-  ac_cv_use_docview='USE_DOC_VIEW_ARCHITECTURE="1"'
+  ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE="1"'
 else
-  ac_cv_use_docview='USE_DOC_VIEW_ARCHITECTURE="0"'
+  ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE="0"'
 fi
 else
   
-  LINE=`grep "USE_DOC_VIEW_ARCHITECTURE" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_docview='USE_DOC_VIEW_ARCHITECTURE='$DEFAULT_USE_DOC_VIEW_ARCHITECTURE
+  ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
 
 fi
 
 eval "$ac_cv_use_docview"
 echo $ac_cv_use_docview >> ${OSTYPE}.system.cache.tmp
-if test "$USE_DOC_VIEW_ARCHITECTURE" = 1; then
+if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5743,23 +5743,23 @@ echo "configure:5742: checking "for printarch"" >&5
 if test "${with_printarch+set}" = set; then
   withval="$with_printarch"
   if test "x$with_printarch" = xyes; then
-  ac_cv_use_printarch='USE_PRINTING_ARCHITECTURE="1"'
+  ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE="1"'
 else
-  ac_cv_use_printarch='USE_PRINTING_ARCHITECTURE="0"'
+  ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE="0"'
 fi
 else
   
-  LINE=`grep "USE_PRINTING_ARCHITECTURE" ${OSTYPE}.system.cache`
+  LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_printarch='USE_PRINTING_ARCHITECTURE='$DEFAULT_USE_PRINTING_ARCHITECTURE
+  ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
 
 fi
 
 eval "$ac_cv_use_printarch"
 echo $ac_cv_use_printarch >> ${OSTYPE}.system.cache.tmp
-if test "$USE_PRINTING_ARCHITECTURE" = 1; then
+if test "$wxUSE_PRINTING_ARCHITECTURE" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -5767,7 +5767,7 @@ fi
 
 
 
-if test "$USE_UNIX" = 1 ; then
+if test "$wxUSE_UNIX" = 1 ; then
   cat >> confdefs.h <<\EOF
 #define __UNIX__ 1
 EOF
@@ -5784,7 +5784,7 @@ GUI_TK_LINK=
 
 MAKEINCLUDE=
 
-if test "$USE_GTK" = 1; then
+if test "$wxUSE_GTK" = 1; then
   # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
   withval="$with_gtk_prefix"
@@ -5921,7 +5921,7 @@ fi
   MAKEINCLUDE=../gtk.inc
 fi
 
-if test "$USE_QT" = 1; then
+if test "$wxUSE_QT" = 1; then
    echo $ac_n "checking for Qt includes""... $ac_c" 1>&6
 echo "configure:5927: checking for Qt includes" >&5
    
@@ -5985,7 +5985,7 @@ for ac_dir in $SEARCH_LIB;
   MAKEINCLUDE=../qt.inc
 fi
 
-if test "$USE_MOTIF" = 1; then
+if test "$wxUSE_MOTIF" = 1; then
    echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6
 echo "configure:5991: checking for Motif/Lesstif includes" >&5
    
@@ -6064,46 +6064,46 @@ fi
 
 
 WXDEBUG=
-if test "$USE_DEBUG_INFO" = 1 ; then
+if test "$wxUSE_DEBUG_INFO" = 1 ; then
   WXDEBUG="-g -O0"
 fi
 
 
-if test "$USE_DEBUG_FLAG" = 1 ; then
+if test "$wxUSE_DEBUG_FLAG" = 1 ; then
   cat >> confdefs.h <<EOF
-#define WXDEBUG $USE_DEBUG_FLAG
+#define WXDEBUG $wxUSE_DEBUG_FLAG
 EOF
 
   WXDEBUG_DEFINE="-D__WXDEBUG__"
   
 fi
 
-if test "$USE_MEM_TRACING" = 1 ; then
+if test "$wxUSE_MEM_TRACING" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_MEMORY_TRACING $USE_MEM_TRACING
+#define wxUSE_MEMORY_TRACING $wxUSE_MEM_TRACING
 EOF
 
   cat >> confdefs.h <<EOF
-#define USE_GLOBAL_MEMORY_OPERATORS $USE_MEM_TRACING
+#define wxUSE_GLOBAL_MEMORY_OPERATORS $wxUSE_MEM_TRACING
 EOF
 
 fi
 
 EXTRA_LINK=
-if test "$USE_DMALLOC" = 1 ; then
+if test "$wxUSE_DMALLOC" = 1 ; then
   EXTRA_LINK="$EXTRA_LINK -ldmalloc"
 fi
 
 
 PROFILE=
-if test "$USE_PROFILE" = 1 ; then
+if test "$wxUSE_PROFILE" = 1 ; then
   PROFILE="-pg"
 fi
 
 
 CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
 CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
-if test "$USE_OPTIMISE" = 0 ; then
+if test "$wxUSE_OPTIMISE" = 0 ; then
   OPTIMISE=
 else
   if test "$GCC" = yes ; then
@@ -6120,202 +6120,202 @@ fi
 
 
 APPLE_IEEE=NONE
-if test "$USE_APPLE_IEEE" = 1 ; then
+if test "$wxUSE_APPLE_IEEE" = 1 ; then
   APPLE_IEEE="APPLE_IEEE"
   cat >> confdefs.h <<EOF
-#define USE_APPLE_IEEE $USE_APPLE_IEEE
+#define wxUSE_APPLE_IEEE $wxUSE_APPLE_IEEE
 EOF
 
 fi
 
-USE_IOSTREAMH=$DEFAULT_USE_IOSTREAMH
+wxUSE_IOSTREAMH=$DEFAULT_wxUSE_IOSTREAMH
 cat >> confdefs.h <<EOF
-#define USE_IOSTREAMH $USE_IOSTREAMH
+#define wxUSE_IOSTREAMH $wxUSE_IOSTREAMH
 EOF
 
 
 
-if test "$USE_ZLIB" = 1 ; then
+if test "$wxUSE_ZLIB" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_ZLIB $USE_ZLIB
+#define wxUSE_ZLIB $wxUSE_ZLIB
 EOF
 
 fi
 
-if test "$USE_GDK_IMLIB" = 1 ; then
+if test "$wxUSE_GDK_IMLIB" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_GDK_IMLIB $USE_GDK_IMLIB
+#define wxUSE_GDK_IMLIB $wxUSE_GDK_IMLIB
 EOF
 
 fi
 
-if test "$USE_LIBPNG" = 1 ; then
+if test "$wxUSE_LIBPNG" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_LIBPNG $USE_LIBPNG
+#define wxUSE_LIBPNG $wxUSE_LIBPNG
 EOF
  
 fi
 
-if test "$USE_ODBC" = 1 ; then
+if test "$wxUSE_ODBC" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_ODBC $USE_ODBC
+#define wxUSE_ODBC $wxUSE_ODBC
 EOF
  
 fi
 
 
-if test "$USE_GAUGE" = 1 ; then
+if test "$wxUSE_GAUGE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_GAUGE $USE_GAUGE
+#define wxUSE_GAUGE $wxUSE_GAUGE
 EOF
 
 fi
 
-if test "$USE_COMBOBOX" = 1 ; then
+if test "$wxUSE_COMBOBOX" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_COMBOBOX $USE_COMBOBOX
+#define wxUSE_COMBOBOX $wxUSE_COMBOBOX
 EOF
 
 fi
 
-if test "$USE_SCROLLBAR" = 1 ; then
+if test "$wxUSE_SCROLLBAR" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_SCROLLBAR $USE_SCROLLBAR
+#define wxUSE_SCROLLBAR $wxUSE_SCROLLBAR
 EOF
 
 fi
 
-if test "$USE_LISTCTRL" = 1 ; then
+if test "$wxUSE_LISTCTRL" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_LISTCTRL $USE_LISTCTRL
+#define wxUSE_LISTCTRL $wxUSE_LISTCTRL
 EOF
 
 fi
 
-if test "$USE_TREECTRL" = 1 ; then
+if test "$wxUSE_TREECTRL" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_TREECTRL $USE_TREECTRL
+#define wxUSE_TREECTRL $wxUSE_TREECTRL
 EOF
 
 fi
 
-if test "$USE_GRID" = 1 ; then
+if test "$wxUSE_GRID" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_GRID $USE_GRID
+#define wxUSE_GRID $wxUSE_GRID
 EOF
 
 fi
 
-if test "$USE_TAB_DIALOG" = 1 ; then
+if test "$wxUSE_TAB_DIALOG" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_TAB_DIALOG $USE_TAB_DIALOG
+#define wxUSE_TAB_DIALOG $wxUSE_TAB_DIALOG
 EOF
 
 fi
 
-if test "$USE_NOTEBOOK" = 1 ; then
+if test "$wxUSE_NOTEBOOK" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_NOTEBOOK $USE_NOTEBOOK
+#define wxUSE_NOTEBOOK $wxUSE_NOTEBOOK
 EOF
 
 fi
 
 
-if test "$USE_CONFIG" = 1 ; then
+if test "$wxUSE_CONFIG" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_CONFIG $USE_CONFIG
+#define wxUSE_CONFIG $wxUSE_CONFIG
 EOF
 
 fi
 
-if test "$USE_TIMEDATE" = 1 ; then
+if test "$wxUSE_TIMEDATE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_TIMEDATE $USE_TIMEDATE
+#define wxUSE_TIMEDATE $wxUSE_TIMEDATE
 EOF
 
 fi
 
-if test "$USE_FRACTION" = 1 ; then
+if test "$wxUSE_FRACTION" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_FRACTION $USE_FRACTION
+#define wxUSE_FRACTION $wxUSE_FRACTION
 EOF
 
 fi
 
-if test "$USE_LOG" = 1 ; then
+if test "$wxUSE_LOG" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_LOG $USE_LOG
+#define wxUSE_LOG $wxUSE_LOG
 EOF
 
 fi
 
-if test "$USE_INTL" = 1 ; then
+if test "$wxUSE_INTL" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_INTL $USE_INTL
+#define wxUSE_INTL $wxUSE_INTL
 EOF
 
 fi
 
-if test "$USE_STREAMS" = 1 ; then
+if test "$wxUSE_STREAMS" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_STREAMS $USE_STREAMS
+#define wxUSE_STREAMS $wxUSE_STREAMS
 EOF
 
 fi
 
-if test "$USE_SERIAL" = 1 ; then
+if test "$wxUSE_SERIAL" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_SERIAL $USE_SERIAL
+#define wxUSE_SERIAL $wxUSE_SERIAL
 EOF
 
 fi
 
-if test "$USE_FILE" = 1 ; then
+if test "$wxUSE_FILE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_FILE $USE_FILE
+#define wxUSE_FILE $wxUSE_FILE
 EOF
 
 fi
 
-if test "$USE_TEXTFILE" = 1 ; then
+if test "$wxUSE_TEXTFILE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_TEXTFILE $USE_TEXTFILE
+#define wxUSE_TEXTFILE $wxUSE_TEXTFILE
 EOF
 
 fi
 
 
-if test "$USE_RPC" = 1 ; then
+if test "$wxUSE_RPC" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_RPC $USE_RPC
+#define wxUSE_RPC $wxUSE_RPC
 EOF
 
 fi
 
-if test "$USE_WX_RESOURCES" = 1 ; then
+if test "$wxUSE_WX_RESOURCES" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_WX_RESOURCES $USE_WX_RESOURCES
+#define wxUSE_WX_RESOURCES $wxUSE_WX_RESOURCES
 EOF
 
 fi
 
-if test "$USE_PROLOGIO" = 1 ; then
+if test "$wxUSE_PROLOGIO" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_PROLOGIO 1
+#define wxUSE_PROLOGIO 1
 EOF
 
 fi
 
 
-if test "$USE_POSTSCRIPT" = 1 ; then
+if test "$wxUSE_POSTSCRIPT" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_POSTSCRIPT 1
+#define wxUSE_POSTSCRIPT 1
 EOF
 
 fi
 
 cat >> confdefs.h <<EOF
-#define USE_AFM_FOR_POSTSCRIPT $USE_AFM_FOR_POSTSCRIPT
+#define wxUSE_AFM_FOR_POSTSCRIPT $wxUSE_AFM_FOR_POSTSCRIPT
 EOF
 
 
@@ -6325,106 +6325,106 @@ EOF
 
 
 
-if test "$USE_MDI_ARCHITECTURE" = 1 ; then
+if test "$wxUSE_MDI_ARCHITECTURE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_MDI_ARCHITECTURE $USE_MDI_ARCHITECTURE
+#define wxUSE_MDI_ARCHITECTURE $wxUSE_MDI_ARCHITECTURE
 EOF
 
 fi
 
-if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
+if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_DOC_VIEW_ARCHITECTURE $USE_DOC_VIEW_ARCHITECTURE
+#define wxUSE_DOC_VIEW_ARCHITECTURE $wxUSE_DOC_VIEW_ARCHITECTURE
 EOF
 
 fi
 
-if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
+if test "$wxUSE_PRINTING_ARCHITECTURE" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_PRINTING_ARCHITECTURE $USE_PRINTING_ARCHITECTURE
+#define wxUSE_PRINTING_ARCHITECTURE $wxUSE_PRINTING_ARCHITECTURE
 EOF
 
 fi
 
 
-if test "$USE_IPC" = 1 ; then
+if test "$wxUSE_IPC" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_IPC 1
+#define wxUSE_IPC 1
 EOF
 
 fi
 
-if test "$USE_RESOURCES" = 1 ; then
+if test "$wxUSE_RESOURCES" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_RESOURCES $USE_RESOURCES
+#define wxUSE_RESOURCES $wxUSE_RESOURCES
 EOF
 
 fi
 
-if test "$USE_CLIPBOARD" = 1 ; then
+if test "$wxUSE_CLIPBOARD" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_CLIPBOARD $USE_CLIPBOARD
+#define wxUSE_CLIPBOARD $wxUSE_CLIPBOARD
 EOF
 
 fi
 
-if test "$USE_DND" = 1 ; then
+if test "$wxUSE_DND" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_DND $USE_DND
+#define wxUSE_DND $wxUSE_DND
 EOF
 
 fi
 
-if test "$USE_CONSTRAINTS" = 1 ; then
+if test "$wxUSE_CONSTRAINTS" = 1 ; then
   cat >> confdefs.h <<EOF
-#define USE_CONSTRAINTS $USE_CONSTRAINTS
+#define wxUSE_CONSTRAINTS $wxUSE_CONSTRAINTS
 EOF
 
 fi
 
 
 METAFILE=NONE
-if test "$USE_METAFILE" = 1 ; then
+if test "$wxUSE_METAFILE" = 1 ; then
   METAFILE="METAFILE"
   cat >> confdefs.h <<EOF
-#define USE_METAFILE $USE_METAFILE
+#define wxUSE_METAFILE $wxUSE_METAFILE
 EOF
 
 fi
 
 
 HELP=NONE
-if test "$USE_HELP" = 1 ; then
+if test "$wxUSE_HELP" = 1 ; then
   HELP="HELP"
   cat >> confdefs.h <<EOF
-#define USE_HELP $USE_HELP
+#define wxUSE_HELP $wxUSE_HELP
 EOF
 
 fi
 
 
 WXGRAPH=NONE
-if test "$USE_WXGRAPH" = 1 ; then
+if test "$wxUSE_WXGRAPH" = 1 ; then
   WXGRAPH="WXGRAPH"
   cat >> confdefs.h <<EOF
-#define USE_WXGRAPH $USE_WXGRAPH
+#define wxUSE_WXGRAPH $wxUSE_WXGRAPH
 EOF
 
 fi
 
 
 WXTREE=NONE
-if test "$USE_WXTREE" = 1 ; then
+if test "$wxUSE_WXTREE" = 1 ; then
   WXTREE="WXTREE"
   cat >> confdefs.h <<EOF
-#define USE_WXTREE $USE_WXTREE
+#define wxUSE_WXTREE $wxUSE_WXTREE
 EOF
 
 fi
 
 
 GLCANVAS=NONE
-if test "$USE_OPENGL" = 1 ; then
+if test "$wxUSE_OPENGL" = 1 ; then
   GLCANVAS="GLCANVAS"
 fi
 
@@ -6469,7 +6469,7 @@ fi
 
 
 
-wxUSE_THREADS=1
+wxwxUSE_THREADS=1
 THREADS_LINK=""
 UNIX_THREAD="gtk/threadno.cpp"
 
@@ -6480,23 +6480,23 @@ echo "configure:6479: checking "for threads"" >&5
 if test "${with_threads+set}" = set; then
   withval="$with_threads"
   if test "x$with_threads" = xyes; then
-  ac_cv_use_threads='wxUSE_THREADS="1"'
+  ac_cv_use_threads='wxwxUSE_THREADS="1"'
 else
-  ac_cv_use_threads='wxUSE_THREADS="0"'
+  ac_cv_use_threads='wxwxUSE_THREADS="0"'
 fi
 else
   
-  LINE=`grep "wxUSE_THREADS" ${OSTYPE}.system.cache`
+  LINE=`grep "wxwxUSE_THREADS" ${OSTYPE}.system.cache`
   if test "x$LINE" != x ; then
     eval "DEFAULT_$LINE"
   fi
-  ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
+  ac_cv_use_threads='wxwxUSE_THREADS='$DEFAULT_wxwxUSE_THREADS
 
 fi
 
 eval "$ac_cv_use_threads"
 echo $ac_cv_use_threads >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_THREADS" = 1; then
+if test "$wxwxUSE_THREADS" = 1; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -6504,7 +6504,7 @@ fi
 
 
 
-if test "$wxUSE_THREADS" = "1"; then
+if test "$wxwxUSE_THREADS" = "1"; then
   UNIX_THREAD="gtk/threadno.cpp"
 
   
@@ -6679,13 +6679,13 @@ fi
 fi
 
 if test -z "$UNIX_THREAD"; then
-  wxUSE_THREADS=0
+  wxwxUSE_THREADS=0
 fi
 
 
 
 cat >> confdefs.h <<\EOF
-#define wxUSE_THREADS 1
+#define wxwxUSE_THREADS 1
 EOF
 
 
@@ -6695,7 +6695,7 @@ OPENGL_INCLUDE=
 OPENGL_LIBRARY=
 OPENGL_LINK=
 
-if test "$USE_OPENGL" = 1; then
+if test "$wxUSE_OPENGL" = 1; then
     echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6
 echo "configure:6701: checking for OpenGL includes" >&5
   
@@ -6800,8 +6800,8 @@ for ac_dir in $SEARCH_LIB;
 fi
 
 
-USE_GLX=$USE_OPENGL
-if test "$USE_OPENGL" != 1; then
+wxUSE_GLX=$wxUSE_OPENGL
+if test "$wxUSE_OPENGL" != 1; then
   OPENGL_LIBRARIES=
   OPENGL_INCLUDE=
   OPENGL_LINK=
@@ -6809,7 +6809,7 @@ if test "$USE_OPENGL" != 1; then
 fi
 
 cat >> confdefs.h <<EOF
-#define USE_GLX $USE_GLX
+#define wxUSE_GLX $wxUSE_GLX
 EOF
 
 
@@ -6942,7 +6942,7 @@ if test "x$GXX" = xyes; then
   CXXFLAGS="${CXXFLAGS} -Wall"
 fi
 
-if test "$USE_SHARED" != 1; then
+if test "$wxUSE_SHARED" != 1; then
     CREATE_SHARED=
     PICFLAGS=
 fi
diff --git a/configure.in b/configure.in
index 1179e1dd0d..f6f0c296be 100644
--- a/configure.in
+++ b/configure.in
@@ -644,69 +644,69 @@ dnl ------------------------------------------------------------------------
 
 AC_OVERRIDES_PREPARE
 
-DEFAULT_USE_GTK=1
-DEFAULT_USE_QT=0
-DEFAULT_USE_MOTIF=0
+DEFAULT_wxUSE_GTK=1
+DEFAULT_wxUSE_QT=0
+DEFAULT_wxUSE_MOTIF=0
 
 DEFAULT_wxUSE_THREADS=1
 
-DEFAULT_USE_SHARED=1
-DEFAULT_USE_OPTIMISE=1
-DEFAULT_USE_PROFILE=0
-DEFAULT_USE_DEBUG_FLAG=0
-DEFAULT_USE_DEBUG_INFO=0
-DEFAULT_USE_MEM_TRACING=0
-DEFAULT_USE_DMALLOC=0
-DEFAULT_USE_APPLE_IEEE=1
-DEFAULT_USE_IOSTREAMH=1
-
-DEFAULT_USE_ZLIB=1
-DEFAULT_USE_GDK_IMLIB=1
-DEFAULT_USE_LIBPNG=1
-DEFAULT_USE_ODBC=1
-
-DEFAULT_USE_COMBOBOX=1
-DEFAULT_USE_GAUGE=1
-DEFAULT_USE_SCROLLBAR=1
-DEFAULT_USE_LISTCTRL=1
-DEFAULT_USE_TREECTRL=1
-DEFAULT_USE_GRID=1
-DEFAULT_USE_TAB_DIALOG=1
-DEFAULT_USE_NOTEBOOK=1
-
-DEFAULT_USE_TIMEDATE=1
-DEFAULT_USE_FRACTION=1
-DEFAULT_USE_LOG=1
-DEFAULT_USE_INTL=1
-DEFAULT_USE_CONFIG=1
-DEFAULT_USE_STREAMS=1
-DEFAULT_USE_SERIAL=1
-DEFAULT_USE_FILE=1
-DEFAULT_USE_TEXTFILE=1
-
-DEFAULT_USE_AFM_FOR_POSTSCRIPT=1
+DEFAULT_wxUSE_SHARED=1
+DEFAULT_wxUSE_OPTIMISE=1
+DEFAULT_wxUSE_PROFILE=0
+DEFAULT_wxUSE_DEBUG_FLAG=0
+DEFAULT_wxUSE_DEBUG_INFO=0
+DEFAULT_wxUSE_MEM_TRACING=0
+DEFAULT_wxUSE_DMALLOC=0
+DEFAULT_wxUSE_APPLE_IEEE=1
+DEFAULT_wxUSE_IOSTREAMH=1
+
+DEFAULT_wxUSE_ZLIB=1
+DEFAULT_wxUSE_GDK_IMLIB=1
+DEFAULT_wxUSE_LIBPNG=1
+DEFAULT_wxUSE_ODBC=1
+
+DEFAULT_wxUSE_COMBOBOX=1
+DEFAULT_wxUSE_GAUGE=1
+DEFAULT_wxUSE_SCROLLBAR=1
+DEFAULT_wxUSE_LISTCTRL=1
+DEFAULT_wxUSE_TREECTRL=1
+DEFAULT_wxUSE_GRID=1
+DEFAULT_wxUSE_TAB_DIALOG=1
+DEFAULT_wxUSE_NOTEBOOK=1
+
+DEFAULT_wxUSE_TIMEDATE=1
+DEFAULT_wxUSE_FRACTION=1
+DEFAULT_wxUSE_LOG=1
+DEFAULT_wxUSE_INTL=1
+DEFAULT_wxUSE_CONFIG=1
+DEFAULT_wxUSE_STREAMS=1
+DEFAULT_wxUSE_SERIAL=1
+DEFAULT_wxUSE_FILE=1
+DEFAULT_wxUSE_TEXTFILE=1
+
+DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=1
 DEFAULT_WX_NORMALIZED_PS_FONTS=1
-DEFAULT_USE_POSTSCRIPT=1
+DEFAULT_wxUSE_POSTSCRIPT=1
 
-DEFAULT_USE_IPC=1
-DEFAULT_USE_RESOURCES=1
-DEFAULT_USE_CONSTRAINTS=1
-DEFAULT_USE_CLIPBOARD=0
-DEFAULT_USE_DND=1
+DEFAULT_wxUSE_IPC=1
+DEFAULT_wxUSE_RESOURCES=1
+DEFAULT_wxUSE_CONSTRAINTS=1
+DEFAULT_wxUSE_CLIPBOARD=0
+DEFAULT_wxUSE_DND=1
 
-DEFAULT_USE_MDI_ARCHITECTURE=1
-DEFAULT_USE_DOC_VIEW_ARCHITECTURE=1
-DEFAULT_USE_PRINTING_ARCHITECTURE=1
+DEFAULT_wxUSE_MDI_ARCHITECTURE=1
+DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1
+DEFAULT_wxUSE_PRINTING_ARCHITECTURE=1
 
-DEFAULT_USE_PROLOGIO=1
-DEFAULT_USE_WX_RESOURCES=1
-DEFAULT_USE_RPC=0
+DEFAULT_wxUSE_PROLOGIO=1
+DEFAULT_wxUSE_WX_RESOURCES=1
+DEFAULT_wxUSE_RPC=0
 
-DEFAULT_USE_OPENGL=0
-DEFAULT_USE_METAFILE=0
-DEFAULT_USE_WXGRAPH=0
-DEFAULT_USE_WXTREE=0
-DEFAULT_USE_HELP=0
+DEFAULT_wxUSE_OPENGL=0
+DEFAULT_wxUSE_METAFILE=0
+DEFAULT_wxUSE_WXGRAPH=0
+DEFAULT_wxUSE_WXTREE=0
+DEFAULT_wxUSE_HELP=0
 
 dnl ----------------------------------------------------------------
 dnl toolkit options
@@ -714,15 +714,15 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(gtk,gtk,
 **--with-gtk              use GTK,
-USE_GTK)
+wxUSE_GTK)
 
 AC_OVERRIDES(qt,qt,
 **--with-qt               use Qt,
-USE_QT)
+wxUSE_QT)
 
 AC_OVERRIDES(motif,motif,
 **--with-motif            use Motif/Lesstif,
-USE_MOTIF)
+wxUSE_MOTIF)
 
 dnl ----------------------------------------------------------------
 dnl compile options
@@ -730,35 +730,35 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(shared,shared,
 **--with-shared           create shared libraries,
-USE_SHARED)
+wxUSE_SHARED)
 
 AC_OVERRIDES(optimise,optimise,
 **--with-optimise         create optimised code,
-USE_OPTIMISE)
+wxUSE_OPTIMISE)
 
 AC_OVERRIDES(debug_flag,debug_flag,
 **--with-debug_flag       create code with WXDEBUG define set to 1,
-USE_DEBUG_FLAG)
+wxUSE_DEBUG_FLAG)
 
 AC_OVERRIDES(debug_info,debug_info,
 **--with-debug_info       create code with debuging information,
-USE_DEBUG_INFO)
+wxUSE_DEBUG_INFO)
 
 AC_OVERRIDES(mem_tracing,mem_tracing,
 **--with-mem_traing       create code with memory tracing,
-USE_MEM_TRACING)
+wxUSE_MEM_TRACING)
 
 AC_OVERRIDES(dmalloc,dmalloc,
 **--with-dmalloc          use dmalloc memory debug library (www.letters.com/dmalloc/),
-USE_DMALLOC)
+wxUSE_DMALLOC)
 
 AC_OVERRIDES(profile,profile,
 **--with-profile          create code with profiling information,
-USE_PROFILE)
+wxUSE_PROFILE)
 
 AC_OVERRIDES(apple_ieee, apple_ieee,
 **--with_apple_ieee	  use the Apple IEEE codec,
-USE_APPLE_IEEE)
+wxUSE_APPLE_IEEE)
 
 dnl ----------------------------------------------------------------
 dnl user options for libraries
@@ -766,23 +766,23 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(zlib,zlib,
 **--with-zlib             use zlib for LZW comression,
-USE_ZLIB)
+wxUSE_ZLIB)
 
 AC_OVERRIDES(gdk_imlib,gdk_imlib,
 **--with-gdk_imlib        use Raster's gdk_imlib (Image library),
-USE_GDK_IMLIB)
+wxUSE_GDK_IMLIB)
 
 AC_OVERRIDES(libpng,libpng,
 **--with-libpng           use libpng (PNG image format),
-USE_LIBPNG)
+wxUSE_LIBPNG)
 
 AC_OVERRIDES(odbc,odbc,
 **--with-odbc             use iODBC and wxODBC classes,
-USE_ODBC)
+wxUSE_ODBC)
 
 AC_OVERRIDES(opengl,opengl,
 **--with-opengl           use OpenGL (or Mesa),
-USE_OPENGL)
+wxUSE_OPENGL)
 
 dnl ----------------------------------------------------------------
 dnl user options for GUI control classes
@@ -790,35 +790,35 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(gauge,gauge,
 **--with-gauge            use wxGauge class,
-USE_GAUGE)
+wxUSE_GAUGE)
 
 AC_OVERRIDES(combobox,combobox,
 **--with-combobox         use wxComboBox class,
-USE_COMBOBOX)
+wxUSE_COMBOBOX)
 
 AC_OVERRIDES(scrollbar,scrollbar,
 **--with-scrollbar        use wxScrollbar class,
-USE_SCROLLBAR)
+wxUSE_SCROLLBAR)
 
 AC_OVERRIDES(listctrl,listctrl,
 **--with-listctrl         use wxListCtrl class,
-USE_LISTCTRL)
+wxUSE_LISTCTRL)
 
 AC_OVERRIDES(treectrl,treectrl,
 **--with-treectrl         use wxTreeCtrl class,
-USE_TREECTRL)
+wxUSE_TREECTRL)
 
 AC_OVERRIDES(grid,grid,
 **--with-grid             use wxGrid class,
-USE_GRID)
+wxUSE_GRID)
 
 AC_OVERRIDES(tab_dialog,tab_dialog,
 **--with-tab_dialog       use wxTabDia class,
-USE_TAB_DIALOG)
+wxUSE_TAB_DIALOG)
 
 AC_OVERRIDES(notebook,notebook,
 **--with-notebook         use wxNotebook class,
-USE_NOTEBOOK)
+wxUSE_NOTEBOOK)
 
 dnl ----------------------------------------------------------------
 dnl user options for non-GUI classes
@@ -826,39 +826,39 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(timedate, timedate,
 **--with-timedate         use wxTime and wxDate classes,
-USE_TIMEDATE)
+wxUSE_TIMEDATE)
 
 AC_OVERRIDES(fraction,fraction,
 **--with-fraction         use wxFraction class,
-USE_FRACTION)
+wxUSE_FRACTION)
 
 AC_OVERRIDES(log,log,
 **--with-log              use logging system,
-USE_LOG)
+wxUSE_LOG)
 
 AC_OVERRIDES(intl,intl,
 **--with-intl             use internationalization system,
-USE_INTL)
+wxUSE_INTL)
 
 AC_OVERRIDES(config,config,
 **--with-config           use wxConfig class,
-USE_CONFIG)
+wxUSE_CONFIG)
 
 AC_OVERRIDES(streams,streams,
 **--with-streams          use wxStream etc classes,
-USE_STREAMS)
+wxUSE_STREAMS)
 
 AC_OVERRIDES(serial,serial,
 **--with-serial           use class serialization,
-USE_SERIAL)
+wxUSE_SERIAL)
 
 AC_OVERRIDES(file,file,
 **--with-file             use wxFile class,
-USE_FILE)
+wxUSE_FILE)
 
 AC_OVERRIDES(textfile,textfile,
 **--with-textfile         use wxTextFile class,
-USE_TEXTFILE)
+wxUSE_TEXTFILE)
 
 dnl ----------------------------------------------------------------
 dnl user options for PostScript
@@ -866,7 +866,7 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(afmfonts,afmfonts,
 **--with-afmfonts         use Adobe Font Metric Font table,
-USE_AFM_FOR_POSTSCRIPT)
+wxUSE_AFM_FOR_POSTSCRIPT)
 
 AC_OVERRIDES(normalized, normalized,
 **--with-PS-normalized    use normalized PS fonts,
@@ -874,7 +874,7 @@ WX_NORMALIZED_PS_FONTS)
 
 AC_OVERRIDES(postscript, postscript,
 **--with-postscript       use wxPostscriptDC device context,
-USE_POSTSCRIPT)
+wxUSE_POSTSCRIPT)
 
 dnl ----------------------------------------------------------------
 dnl user options for Prolog and Resources
@@ -882,15 +882,15 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(wxresources,wxresources,
 **--with-wxresources      use wxWindows's resources,
-USE_WX_RESOURCES)
+wxUSE_WX_RESOURCES)
 
 AC_OVERRIDES(prologio,prologio,
 **--with-prologio         use Prolog IO library,
-USE_PROLOGIO)
+wxUSE_PROLOGIO)
 
 AC_OVERRIDES(rpc,RPC,
 **--with-rpc              use Prolog's remote procedure calls,
-USE_RPC)
+wxUSE_RPC)
 
 dnl ----------------------------------------------------------------
 dnl user options for misc stuff
@@ -898,23 +898,23 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(ipc,IPC,
 **--with-ipc              use interprocess communication (wxSocket etc.),
-USE_IPC)
+wxUSE_IPC)
 
 AC_OVERRIDES(resources,resources,
 **--with-resources        use X resources for saving information,
-USE_RESOURCES)
+wxUSE_RESOURCES)
 
 AC_OVERRIDES(clipboard,clipboard,
 **--with-clipboard        use wxClipboard classes,
-USE_CLIPBOARD)
+wxUSE_CLIPBOARD)
 
 AC_OVERRIDES(dnd,dnd,
 **--with-dnd              use Drag'n'Drop classes,
-USE_DND)
+wxUSE_DND)
 
 AC_OVERRIDES(constraints,constrains,
 **--with-constraints      use layout-constraints system,
-USE_CONSTRAINTS)
+wxUSE_CONSTRAINTS)
 
 dnl ----------------------------------------------------------------
 dnl user options for architectures
@@ -922,15 +922,15 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(mdi,mdi,
 **--with-mdi              use multiple document interface architecture,
-USE_MDI_ARCHITECTURE)
+wxUSE_MDI_ARCHITECTURE)
 
 AC_OVERRIDES(docview,docview,
 **--with-docview          use document view architecture,
-USE_DOC_VIEW_ARCHITECTURE)
+wxUSE_DOC_VIEW_ARCHITECTURE)
 
 AC_OVERRIDES(printarch,printarch,
 **--with-printarch        use printing architecture,
-USE_PRINTING_ARCHITECTURE)
+wxUSE_PRINTING_ARCHITECTURE)
 
 dnl ----------------------------------------------------------------
 dnl user options with no effect yet
@@ -938,19 +938,19 @@ dnl ----------------------------------------------------------------
 dnl
 dnl AC_OVERRIDES(metafile, metafile,
 dnl **--with-metafile         use metafile (no effect),
-dnl wxUSE_METAFILE)
+dnl wxwxUSE_METAFILE)
 dnl
 dnl AC_OVERRIDES(help,help,
 dnl **--with-help             use help (no effect),
-dnl wxUSE_HELP)
+dnl wxwxUSE_HELP)
 dnl
 dnl AC_OVERRIDES(wxgraph,wxgraph,
 dnl **--with-wxgraph          use wxgraph (no effect),
-dnl wxUSE_WXGRAPH)
+dnl wxwxUSE_WXGRAPH)
 dnl
 dnl AC_OVERRIDES(wxtree,wxtree,
 dnl **--with-wxtree           use wxtree (no effect),
-dnl wxUSE_WXTREE)
+dnl wxwxUSE_WXTREE)
 dnl
 dnl AC_OVERRIDES(package,message,helpmessage,variable)
 dnl
@@ -958,7 +958,7 @@ dnl ----------------------------------------------------------------
 dnl Unix, obviously
 dnl ----------------------------------------------------------------
 
-if test "$USE_UNIX" = 1 ; then
+if test "$wxUSE_UNIX" = 1 ; then
   AC_DEFINE(__UNIX__)
 fi
 
@@ -975,7 +975,7 @@ GUI_TK_LINK=
 
 MAKEINCLUDE=
 
-if test "$USE_GTK" = 1; then
+if test "$wxUSE_GTK" = 1; then
   AM_PATH_GTK(0.99.7, [
        GUI_TK_INCLUDE="$GTK_CFLAGS"
        GUI_TK_LIBRARY="$GTK_LIBS"
@@ -985,7 +985,7 @@ if test "$USE_GTK" = 1; then
   MAKEINCLUDE=../gtk.inc
 fi
 
-if test "$USE_QT" = 1; then
+if test "$wxUSE_QT" = 1; then
    AC_MSG_CHECKING(for Qt includes)
    AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,qapp.h)
    if test "$ac_find_includes" != "" ; then
@@ -1010,7 +1010,7 @@ if test "$USE_QT" = 1; then
   MAKEINCLUDE=../qt.inc
 fi
 
-if test "$USE_MOTIF" = 1; then
+if test "$wxUSE_MOTIF" = 1; then
    AC_MSG_CHECKING(for Motif/Lesstif includes)
    AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,Xm.h)
    if test "$ac_find_includes" != "" ; then
@@ -1053,37 +1053,37 @@ dnl Register compile options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 WXDEBUG=
-if test "$USE_DEBUG_INFO" = 1 ; then
+if test "$wxUSE_DEBUG_INFO" = 1 ; then
   WXDEBUG="-g -O0"
 fi
 AC_SUBST(WXDEBUG)
 
-if test "$USE_DEBUG_FLAG" = 1 ; then
-  AC_DEFINE_UNQUOTED(WXDEBUG,$USE_DEBUG_FLAG)
+if test "$wxUSE_DEBUG_FLAG" = 1 ; then
+  AC_DEFINE_UNQUOTED(WXDEBUG,$wxUSE_DEBUG_FLAG)
   WXDEBUG_DEFINE="-D__WXDEBUG__"
   AC_SUBST(WXDEBUG_DEFINE)
 fi
 
-if test "$USE_MEM_TRACING" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_MEMORY_TRACING,$USE_MEM_TRACING)
-  AC_DEFINE_UNQUOTED(USE_GLOBAL_MEMORY_OPERATORS,$USE_MEM_TRACING)
+if test "$wxUSE_MEM_TRACING" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_MEMORY_TRACING,$wxUSE_MEM_TRACING)
+  AC_DEFINE_UNQUOTED(wxUSE_GLOBAL_MEMORY_OPERATORS,$wxUSE_MEM_TRACING)
 fi
 
 EXTRA_LINK=
-if test "$USE_DMALLOC" = 1 ; then
+if test "$wxUSE_DMALLOC" = 1 ; then
   EXTRA_LINK="$EXTRA_LINK -ldmalloc"
 fi
 AC_SUBST(EXTRA_LINK)
 
 PROFILE=
-if test "$USE_PROFILE" = 1 ; then
+if test "$wxUSE_PROFILE" = 1 ; then
   PROFILE="-pg"
 fi
 AC_SUBST(PROFILE)
 
 CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
 CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
-if test "$USE_OPTIMISE" = 0 ; then
+if test "$wxUSE_OPTIMISE" = 0 ; then
   OPTIMISE=
 else
   if test "$GCC" = yes ; then
@@ -1100,135 +1100,135 @@ fi
 AC_SUBST(OPTIMISE)
 
 APPLE_IEEE=NONE
-if test "$USE_APPLE_IEEE" = 1 ; then
+if test "$wxUSE_APPLE_IEEE" = 1 ; then
   APPLE_IEEE="APPLE_IEEE"
-  AC_DEFINE_UNQUOTED(USE_APPLE_IEEE,$USE_APPLE_IEEE)
+  AC_DEFINE_UNQUOTED(wxUSE_APPLE_IEEE,$wxUSE_APPLE_IEEE)
 fi
 
-USE_IOSTREAMH=$DEFAULT_USE_IOSTREAMH
-AC_DEFINE_UNQUOTED(USE_IOSTREAMH,$USE_IOSTREAMH)
+wxUSE_IOSTREAMH=$DEFAULT_wxUSE_IOSTREAMH
+AC_DEFINE_UNQUOTED(wxUSE_IOSTREAMH,$wxUSE_IOSTREAMH)
 
 dnl ----------------------------------------------------------------
 dnl Register library options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
-if test "$USE_ZLIB" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_ZLIB,$USE_ZLIB)
+if test "$wxUSE_ZLIB" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_ZLIB,$wxUSE_ZLIB)
 fi
 
-if test "$USE_GDK_IMLIB" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_GDK_IMLIB,$USE_GDK_IMLIB)
+if test "$wxUSE_GDK_IMLIB" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_GDK_IMLIB,$wxUSE_GDK_IMLIB)
 fi
 
-if test "$USE_LIBPNG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_LIBPNG,$USE_LIBPNG) 
+if test "$wxUSE_LIBPNG" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_LIBPNG,$wxUSE_LIBPNG) 
 fi
 
-if test "$USE_ODBC" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_ODBC,$USE_ODBC) 
+if test "$wxUSE_ODBC" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC) 
 fi
 
 dnl ----------------------------------------------------------------
 dnl Register GUI-control options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
-if test "$USE_GAUGE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_GAUGE,$USE_GAUGE)
+if test "$wxUSE_GAUGE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_GAUGE,$wxUSE_GAUGE)
 fi
 
-if test "$USE_COMBOBOX" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_COMBOBOX,$USE_COMBOBOX)
+if test "$wxUSE_COMBOBOX" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_COMBOBOX,$wxUSE_COMBOBOX)
 fi
 
-if test "$USE_SCROLLBAR" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_SCROLLBAR,$USE_SCROLLBAR)
+if test "$wxUSE_SCROLLBAR" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_SCROLLBAR,$wxUSE_SCROLLBAR)
 fi
 
-if test "$USE_LISTCTRL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_LISTCTRL,$USE_LISTCTRL)
+if test "$wxUSE_LISTCTRL" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_LISTCTRL,$wxUSE_LISTCTRL)
 fi
 
-if test "$USE_TREECTRL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TREECTRL,$USE_TREECTRL)
+if test "$wxUSE_TREECTRL" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_TREECTRL,$wxUSE_TREECTRL)
 fi
 
-if test "$USE_GRID" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_GRID,$USE_GRID)
+if test "$wxUSE_GRID" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_GRID,$wxUSE_GRID)
 fi
 
-if test "$USE_TAB_DIALOG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TAB_DIALOG,$USE_TAB_DIALOG)
+if test "$wxUSE_TAB_DIALOG" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_TAB_DIALOG,$wxUSE_TAB_DIALOG)
 fi
 
-if test "$USE_NOTEBOOK" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_NOTEBOOK,$USE_NOTEBOOK)
+if test "$wxUSE_NOTEBOOK" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_NOTEBOOK,$wxUSE_NOTEBOOK)
 fi
 
 dnl ----------------------------------------------------------------
 dnl Register non-GUI class options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
-if test "$USE_CONFIG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_CONFIG,$USE_CONFIG)
+if test "$wxUSE_CONFIG" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_CONFIG,$wxUSE_CONFIG)
 fi
 
-if test "$USE_TIMEDATE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TIMEDATE,$USE_TIMEDATE)
+if test "$wxUSE_TIMEDATE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_TIMEDATE,$wxUSE_TIMEDATE)
 fi
 
-if test "$USE_FRACTION" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_FRACTION,$USE_FRACTION)
+if test "$wxUSE_FRACTION" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_FRACTION,$wxUSE_FRACTION)
 fi
 
-if test "$USE_LOG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_LOG,$USE_LOG)
+if test "$wxUSE_LOG" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_LOG,$wxUSE_LOG)
 fi
 
-if test "$USE_INTL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_INTL,$USE_INTL)
+if test "$wxUSE_INTL" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_INTL,$wxUSE_INTL)
 fi
 
-if test "$USE_STREAMS" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_STREAMS,$USE_STREAMS)
+if test "$wxUSE_STREAMS" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_STREAMS,$wxUSE_STREAMS)
 fi
 
-if test "$USE_SERIAL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_SERIAL,$USE_SERIAL)
+if test "$wxUSE_SERIAL" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_SERIAL,$wxUSE_SERIAL)
 fi
 
-if test "$USE_FILE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_FILE,$USE_FILE)
+if test "$wxUSE_FILE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_FILE,$wxUSE_FILE)
 fi
 
-if test "$USE_TEXTFILE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TEXTFILE,$USE_TEXTFILE)
+if test "$wxUSE_TEXTFILE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_TEXTFILE,$wxUSE_TEXTFILE)
 fi
 
 dnl ----------------------------------------------------------------
 dnl Register Prolog and Resources options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
-if test "$USE_RPC" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_RPC,$USE_RPC)
+if test "$wxUSE_RPC" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_RPC,$wxUSE_RPC)
 fi
 
-if test "$USE_WX_RESOURCES" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_WX_RESOURCES,$USE_WX_RESOURCES)
+if test "$wxUSE_WX_RESOURCES" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_WX_RESOURCES,$wxUSE_WX_RESOURCES)
 fi
 
-if test "$USE_PROLOGIO" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_PROLOGIO)
+if test "$wxUSE_PROLOGIO" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_PROLOGIO)
 fi
 
 dnl ----------------------------------------------------------------
 dnl Register PostScript options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
-if test "$USE_POSTSCRIPT" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_POSTSCRIPT)
+if test "$wxUSE_POSTSCRIPT" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_POSTSCRIPT)
 fi
 
-AC_DEFINE_UNQUOTED(USE_AFM_FOR_POSTSCRIPT,$USE_AFM_FOR_POSTSCRIPT)
+AC_DEFINE_UNQUOTED(wxUSE_AFM_FOR_POSTSCRIPT,$wxUSE_AFM_FOR_POSTSCRIPT)
 
 AC_DEFINE_UNQUOTED(WX_NORMALIZED_PS_FONTS,$WX_NORMALIZED_PS_FONTS)
 
@@ -1236,40 +1236,40 @@ dnl ----------------------------------------------------------------
 dnl Register architecture options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
-if test "$USE_MDI_ARCHITECTURE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_MDI_ARCHITECTURE,$USE_MDI_ARCHITECTURE)
+if test "$wxUSE_MDI_ARCHITECTURE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_MDI_ARCHITECTURE,$wxUSE_MDI_ARCHITECTURE)
 fi
 
-if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_DOC_VIEW_ARCHITECTURE,$USE_DOC_VIEW_ARCHITECTURE)
+if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_DOC_VIEW_ARCHITECTURE,$wxUSE_DOC_VIEW_ARCHITECTURE)
 fi
 
-if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_PRINTING_ARCHITECTURE,$USE_PRINTING_ARCHITECTURE)
+if test "$wxUSE_PRINTING_ARCHITECTURE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_PRINTING_ARCHITECTURE,$wxUSE_PRINTING_ARCHITECTURE)
 fi
 
 dnl ----------------------------------------------------------------
 dnl Register misc options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
-if test "$USE_IPC" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_IPC)
+if test "$wxUSE_IPC" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_IPC)
 fi
 
-if test "$USE_RESOURCES" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_RESOURCES,$USE_RESOURCES)
+if test "$wxUSE_RESOURCES" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_RESOURCES,$wxUSE_RESOURCES)
 fi
 
-if test "$USE_CLIPBOARD" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_CLIPBOARD,$USE_CLIPBOARD)
+if test "$wxUSE_CLIPBOARD" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_CLIPBOARD,$wxUSE_CLIPBOARD)
 fi
 
-if test "$USE_DND" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_DND,$USE_DND)
+if test "$wxUSE_DND" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_DND,$wxUSE_DND)
 fi
 
-if test "$USE_CONSTRAINTS" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_CONSTRAINTS,$USE_CONSTRAINTS)
+if test "$wxUSE_CONSTRAINTS" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_CONSTRAINTS,$wxUSE_CONSTRAINTS)
 fi
 
 dnl ----------------------------------------------------------------
@@ -1277,35 +1277,35 @@ dnl No effect
 dnl ----------------------------------------------------------------
 
 METAFILE=NONE
-if test "$USE_METAFILE" = 1 ; then
+if test "$wxUSE_METAFILE" = 1 ; then
   METAFILE="METAFILE"
-  AC_DEFINE_UNQUOTED(USE_METAFILE,$USE_METAFILE)
+  AC_DEFINE_UNQUOTED(wxUSE_METAFILE,$wxUSE_METAFILE)
 fi
 AC_SUBST(METAFILE)
 
 HELP=NONE
-if test "$USE_HELP" = 1 ; then
+if test "$wxUSE_HELP" = 1 ; then
   HELP="HELP"
-  AC_DEFINE_UNQUOTED(USE_HELP,$USE_HELP)
+  AC_DEFINE_UNQUOTED(wxUSE_HELP,$wxUSE_HELP)
 fi
 AC_SUBST(HELP)
 
 WXGRAPH=NONE
-if test "$USE_WXGRAPH" = 1 ; then
+if test "$wxUSE_WXGRAPH" = 1 ; then
   WXGRAPH="WXGRAPH"
-  AC_DEFINE_UNQUOTED(USE_WXGRAPH,$USE_WXGRAPH)
+  AC_DEFINE_UNQUOTED(wxUSE_WXGRAPH,$wxUSE_WXGRAPH)
 fi
 AC_SUBST(WXGRAPH)
 
 WXTREE=NONE
-if test "$USE_WXTREE" = 1 ; then
+if test "$wxUSE_WXTREE" = 1 ; then
   WXTREE="WXTREE"
-  AC_DEFINE_UNQUOTED(USE_WXTREE,$USE_WXTREE)
+  AC_DEFINE_UNQUOTED(wxUSE_WXTREE,$wxUSE_WXTREE)
 fi
 AC_SUBST(WXTREE)
 
 GLCANVAS=NONE
-if test "$USE_OPENGL" = 1 ; then
+if test "$wxUSE_OPENGL" = 1 ; then
   GLCANVAS="GLCANVAS"
 fi
 
@@ -1320,19 +1320,19 @@ dnl ----------------------------------------------------------------
 dnl thread support
 dnl ----------------------------------------------------------------
 
-wxUSE_THREADS=1
+wxwxUSE_THREADS=1
 THREADS_LINK=""
 UNIX_THREAD="gtk/threadno.cpp"
 
 AC_OVERRIDES(threads,threads,
 **--without-threads       Force disabling threads,
-wxUSE_THREADS)
+wxwxUSE_THREADS)
 
 dnl AC_ARG_WITH(threads,
 dnl [**--without-threads       Force disabling threads ],
-dnl [wxUSE_THREADS="$withval"])
+dnl [wxwxUSE_THREADS="$withval"])
 
-if test "$wxUSE_THREADS" = "1"; then
+if test "$wxwxUSE_THREADS" = "1"; then
   UNIX_THREAD="gtk/threadno.cpp"
 
   dnl For glibc 2 users who have the old libc 5 too
@@ -1360,16 +1360,16 @@ if test "$wxUSE_THREADS" = "1"; then
 fi
 
 if test -z "$UNIX_THREAD"; then
-  wxUSE_THREADS=0
+  wxwxUSE_THREADS=0
 fi
 
 AC_SUBST(UNIX_THREAD)
 AC_SUBST(THREADS_LINK)
-AC_DEFINE(wxUSE_THREADS)
+AC_DEFINE(wxwxUSE_THREADS)
 
 dnl   defines UNIX_THREAD it contains the source file to use for threads. (GL)
 dnl   defines THREADS_LINK it contains the thread library to link with. (GL)
-dnl   defines wxUSE_THREADS if thread support is activated. (GL)
+dnl   defines wxwxUSE_THREADS if thread support is activated. (GL)
 
 dnl ----------------------------------------------------------------
 dnl search for opengl
@@ -1379,7 +1379,7 @@ OPENGL_INCLUDE=
 OPENGL_LIBRARY=
 OPENGL_LINK=
 
-if test "$USE_OPENGL" = 1; then
+if test "$wxUSE_OPENGL" = 1; then
   dnl checking OPENGL includes
   AC_MSG_CHECKING(for OpenGL includes)
   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,GL/gl.h)
@@ -1422,15 +1422,15 @@ dnl ----------------------------------------------------------------
 dnl left-over
 dnl ----------------------------------------------------------------
 
-USE_GLX=$USE_OPENGL
-if test "$USE_OPENGL" != 1; then
+wxUSE_GLX=$wxUSE_OPENGL
+if test "$wxUSE_OPENGL" != 1; then
   OPENGL_LIBRARIES=
   OPENGL_INCLUDE=
   OPENGL_LINK=
   GLCANVAS=NONE
 fi
 
-AC_DEFINE_UNQUOTED(USE_GLX,$USE_GLX)
+AC_DEFINE_UNQUOTED(wxUSE_GLX,$wxUSE_GLX)
 AC_SUBST(OPENGL_INCLUDE)
 AC_SUBST(OPENGL_LIBRARY)
 AC_SUBST(OPENGL_LINK)
@@ -1543,7 +1543,7 @@ if test "x$GXX" = xyes; then
   CXXFLAGS="${CXXFLAGS} -Wall"
 fi
 
-if test "$USE_SHARED" != 1; then
+if test "$wxUSE_SHARED" != 1; then
     CREATE_SHARED=
     PICFLAGS=
 fi