]> git.saurik.com Git - wxWidgets.git/blobdiff - configure.in
wxPaintDC -> wxDC in wxListCtrl; fixed compile problems in wxTreeCtrl (return
[wxWidgets.git] / configure.in
index 1447c47dea1ef015f038a29490a5d466ce2acb56..ed5e745cc9c52475b3e3b35751a124fc6fc963e2 100644 (file)
@@ -4,7 +4,7 @@ dnl Top-level configure.in for wxWindows by Robert Roebling, Wolfram Gloger
 dnl and Martin Sperl.
 dnl
 dnl This script is under the wxWindows licence.
 dnl and Martin Sperl.
 dnl
 dnl This script is under the wxWindows licence.
-dnl
+dnl $Id$
 dnl ////////////////////////////////////////////////////////////////////////
 
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 dnl ////////////////////////////////////////////////////////////////////////
 
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
@@ -240,6 +240,10 @@ SEARCH_INCLUDE="\
     /usr/X11R5/include        \
     /usr/X11R4/include        \
                               \
     /usr/X11R5/include        \
     /usr/X11R4/include        \
                               \
+    /usr/X11R6/lib            \
+    /usr/X11R5/lib            \
+    /usr/X11R4/lib            \
+                              \
     /usr/include/X11R6        \
     /usr/include/X11R5        \
     /usr/include/X11R4        \
     /usr/include/X11R6        \
     /usr/include/X11R5        \
     /usr/include/X11R4        \
@@ -269,6 +273,8 @@ SEARCH_INCLUDE="\
     /usr/lpp/Xamples/include  \
                               \
     /usr/local/include/gtk    \
     /usr/lpp/Xamples/include  \
                               \
     /usr/local/include/gtk    \
+    /usr/local/include/Xm     \
+    /usr/local/include/qt     \
     /usr/X11R6/include/Xm     \
     /usr/X11/include/Xm       \
     /usr/include/qt           \
     /usr/X11R6/include/Xm     \
     /usr/X11/include/Xm       \
     /usr/include/qt           \
@@ -371,7 +377,7 @@ fi
 echo dummy > sub/file
 ${MAKE-make} -f confMake VPATH=sub 2> config.log > /dev/null
 RESULT=$?
 echo dummy > sub/file
 ${MAKE-make} -f confMake VPATH=sub 2> config.log > /dev/null
 RESULT=$?
-rm -f sub/file check final_file config.log confMake
+rm -f sub/file check final_file confMake
 rmdir sub 
 if test "$RESULT" = 0; then
   AC_MSG_RESULT(yes)
 rmdir sub 
 if test "$RESULT" = 0; then
   AC_MSG_RESULT(yes)
@@ -431,6 +437,20 @@ if test "$ac_cv_header_linux_joystick_h" = "yes"; then
 fi
 AC_SUBST(GTK_JOYSTICK)
 
 fi
 AC_SUBST(GTK_JOYSTICK)
 
+dnl check for vprintf/vsprintf() which are GNU extensions
+AC_FUNC_VPRINTF
+dnl check for vsnprintf() which is another GNU extension
+AC_CHECK_FUNC(vsnprintf)
+
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_CHECK_HEADERS(iostream)
+if test "x$HAVE_IOSTREAM" = "x" ; then
+  AC_DEFINE(wxUSE_IOSTREAMH)
+fi
+AC_LANG_RESTORE
+
+dnl   defines HAVE_IOSTREAM
 dnl ###################
 dnl # checks typedefs #
 dnl ###################
 dnl ###################
 dnl # checks typedefs #
 dnl ###################
@@ -571,6 +591,7 @@ USE_VMS=
 USE_ULTRIX=
 USE_DATA_GENERAL=
 
 USE_ULTRIX=
 USE_DATA_GENERAL=
 
+AC_DEFINE(__UNIX__)
 case "${canonical}" in
   *-hp-hpux* )
     USE_HPUX=1
 case "${canonical}" in
   *-hp-hpux* )
     USE_HPUX=1
@@ -579,6 +600,12 @@ case "${canonical}" in
   *-*-linux* )
     USE_LINUX=1
     AC_DEFINE(__LINUX__)
   *-*-linux* )
     USE_LINUX=1
     AC_DEFINE(__LINUX__)
+    TMP=`uname -m`
+    if test "x$TMP" = "xalpha"
+    then
+      USE_ALPHA=1
+      AC_DEFINE(__ALPHA__)
+    fi
   ;;
   *-*-irix5* | *-*-irix6* ) 
     USE_SGI=1
   ;;
   *-*-irix5* | *-*-irix6* ) 
     USE_SGI=1
@@ -644,69 +671,71 @@ dnl ------------------------------------------------------------------------
 
 AC_OVERRIDES_PREPARE
 
 
 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_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_LIBPNG=1
+DEFAULT_wxUSE_ODBC=0
+
+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_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=1
+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=1
+
+DEFAULT_wxUSE_UNICODE=1
+DEFAULT_wxUSE_WCSRTOMBS=0
 
 dnl ----------------------------------------------------------------
 dnl toolkit options
 
 dnl ----------------------------------------------------------------
 dnl toolkit options
@@ -714,15 +743,15 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(gtk,gtk,
 **--with-gtk              use GTK,
 
 AC_OVERRIDES(gtk,gtk,
 **--with-gtk              use GTK,
-USE_GTK)
+wxUSE_GTK)
 
 AC_OVERRIDES(qt,qt,
 **--with-qt               use Qt,
 
 AC_OVERRIDES(qt,qt,
 **--with-qt               use Qt,
-USE_QT)
+wxUSE_QT)
 
 AC_OVERRIDES(motif,motif,
 **--with-motif            use Motif/Lesstif,
 
 AC_OVERRIDES(motif,motif,
 **--with-motif            use Motif/Lesstif,
-USE_MOTIF)
+wxUSE_MOTIF)
 
 dnl ----------------------------------------------------------------
 dnl compile options
 
 dnl ----------------------------------------------------------------
 dnl compile options
@@ -730,35 +759,39 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(shared,shared,
 **--with-shared           create shared libraries,
 
 AC_OVERRIDES(shared,shared,
 **--with-shared           create shared libraries,
-USE_SHARED)
+wxUSE_SHARED)
 
 AC_OVERRIDES(optimise,optimise,
 **--with-optimise         create optimised code,
 
 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,
 
 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,
 
 AC_OVERRIDES(debug_info,debug_info,
 **--with-debug_info       create code with debuging information,
-USE_DEBUG_INFO)
+wxUSE_DEBUG_INFO)
+
+AC_OVERRIDES(debug_gdb,debug_gdb,
+**--with-debug_gdb        create code with extra GDB debuging information,
+wxUSE_DEBUG_GDB)
 
 AC_OVERRIDES(mem_tracing,mem_tracing,
 **--with-mem_traing       create code with memory tracing,
 
 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/),
 
 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,
 
 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,
 
 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
 
 dnl ----------------------------------------------------------------
 dnl user options for libraries
@@ -766,23 +799,19 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(zlib,zlib,
 **--with-zlib             use zlib for LZW comression,
 
 AC_OVERRIDES(zlib,zlib,
 **--with-zlib             use zlib for LZW comression,
-USE_ZLIB)
-
-AC_OVERRIDES(gdk_imlib,gdk_imlib,
-**--with-gdk_imlib        use Raster's gdk_imlib (Image library),
-USE_GDK_IMLIB)
+wxUSE_ZLIB)
 
 AC_OVERRIDES(libpng,libpng,
 **--with-libpng           use libpng (PNG image format),
 
 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,
 
 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),
 
 AC_OVERRIDES(opengl,opengl,
 **--with-opengl           use OpenGL (or Mesa),
-USE_OPENGL)
+wxUSE_OPENGL)
 
 dnl ----------------------------------------------------------------
 dnl user options for GUI control classes
 
 dnl ----------------------------------------------------------------
 dnl user options for GUI control classes
@@ -790,35 +819,35 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(gauge,gauge,
 **--with-gauge            use wxGauge class,
 
 AC_OVERRIDES(gauge,gauge,
 **--with-gauge            use wxGauge class,
-USE_GAUGE)
+wxUSE_GAUGE)
 
 AC_OVERRIDES(combobox,combobox,
 **--with-combobox         use wxComboBox class,
 
 AC_OVERRIDES(combobox,combobox,
 **--with-combobox         use wxComboBox class,
-USE_COMBOBOX)
+wxUSE_COMBOBOX)
 
 AC_OVERRIDES(scrollbar,scrollbar,
 **--with-scrollbar        use wxScrollbar class,
 
 AC_OVERRIDES(scrollbar,scrollbar,
 **--with-scrollbar        use wxScrollbar class,
-USE_SCROLLBAR)
+wxUSE_SCROLLBAR)
 
 AC_OVERRIDES(listctrl,listctrl,
 **--with-listctrl         use wxListCtrl class,
 
 AC_OVERRIDES(listctrl,listctrl,
 **--with-listctrl         use wxListCtrl class,
-USE_LISTCTRL)
+wxUSE_LISTCTRL)
 
 AC_OVERRIDES(treectrl,treectrl,
 **--with-treectrl         use wxTreeCtrl class,
 
 AC_OVERRIDES(treectrl,treectrl,
 **--with-treectrl         use wxTreeCtrl class,
-USE_TREECTRL)
+wxUSE_TREECTRL)
 
 AC_OVERRIDES(grid,grid,
 **--with-grid             use wxGrid class,
 
 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,
 
 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,
 
 AC_OVERRIDES(notebook,notebook,
 **--with-notebook         use wxNotebook class,
-USE_NOTEBOOK)
+wxUSE_NOTEBOOK)
 
 dnl ----------------------------------------------------------------
 dnl user options for non-GUI classes
 
 dnl ----------------------------------------------------------------
 dnl user options for non-GUI classes
@@ -826,39 +855,39 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(timedate, timedate,
 **--with-timedate         use wxTime and wxDate classes,
 
 AC_OVERRIDES(timedate, timedate,
 **--with-timedate         use wxTime and wxDate classes,
-USE_TIMEDATE)
+wxUSE_TIMEDATE)
 
 AC_OVERRIDES(fraction,fraction,
 **--with-fraction         use wxFraction class,
 
 AC_OVERRIDES(fraction,fraction,
 **--with-fraction         use wxFraction class,
-USE_FRACTION)
+wxUSE_FRACTION)
 
 AC_OVERRIDES(log,log,
 **--with-log              use logging system,
 
 AC_OVERRIDES(log,log,
 **--with-log              use logging system,
-USE_LOG)
+wxUSE_LOG)
 
 AC_OVERRIDES(intl,intl,
 **--with-intl             use internationalization system,
 
 AC_OVERRIDES(intl,intl,
 **--with-intl             use internationalization system,
-USE_INTL)
+wxUSE_INTL)
 
 AC_OVERRIDES(config,config,
 **--with-config           use wxConfig class,
 
 AC_OVERRIDES(config,config,
 **--with-config           use wxConfig class,
-USE_CONFIG)
+wxUSE_CONFIG)
 
 AC_OVERRIDES(streams,streams,
 **--with-streams          use wxStream etc classes,
 
 AC_OVERRIDES(streams,streams,
 **--with-streams          use wxStream etc classes,
-USE_STREAMS)
+wxUSE_STREAMS)
 
 AC_OVERRIDES(serial,serial,
 **--with-serial           use class serialization,
 
 AC_OVERRIDES(serial,serial,
 **--with-serial           use class serialization,
-USE_SERIAL)
+wxUSE_SERIAL)
 
 AC_OVERRIDES(file,file,
 **--with-file             use wxFile class,
 
 AC_OVERRIDES(file,file,
 **--with-file             use wxFile class,
-USE_FILE)
+wxUSE_FILE)
 
 AC_OVERRIDES(textfile,textfile,
 **--with-textfile         use wxTextFile class,
 
 AC_OVERRIDES(textfile,textfile,
 **--with-textfile         use wxTextFile class,
-USE_TEXTFILE)
+wxUSE_TEXTFILE)
 
 dnl ----------------------------------------------------------------
 dnl user options for PostScript
 
 dnl ----------------------------------------------------------------
 dnl user options for PostScript
@@ -866,7 +895,7 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(afmfonts,afmfonts,
 **--with-afmfonts         use Adobe Font Metric Font table,
 
 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,
 
 AC_OVERRIDES(normalized, normalized,
 **--with-PS-normalized    use normalized PS fonts,
@@ -874,7 +903,19 @@ WX_NORMALIZED_PS_FONTS)
 
 AC_OVERRIDES(postscript, postscript,
 **--with-postscript       use wxPostscriptDC device context,
 
 AC_OVERRIDES(postscript, postscript,
 **--with-postscript       use wxPostscriptDC device context,
-USE_POSTSCRIPT)
+wxUSE_POSTSCRIPT)
+
+dnl ----------------------------------------------------------------
+dnl user options for wxString and Unicode
+dnl ----------------------------------------------------------------
+
+AC_OVERRIDES(unicode,unicode,
+**--with-unicode          compile wxString with Unicode support,
+wxUSE_UNICODE)
+
+AC_OVERRIDES(wcsrtombs,wcsrtombs,
+**--with-wcsrtombs        use wcsrtombs instead of (buggy in GNU libc5) wcstombs,
+wxUSE_WCSRTOMBS)
 
 dnl ----------------------------------------------------------------
 dnl user options for Prolog and Resources
 
 dnl ----------------------------------------------------------------
 dnl user options for Prolog and Resources
@@ -882,15 +923,15 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(wxresources,wxresources,
 **--with-wxresources      use wxWindows's resources,
 
 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,
 
 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,
 
 AC_OVERRIDES(rpc,RPC,
 **--with-rpc              use Prolog's remote procedure calls,
-USE_RPC)
+wxUSE_RPC)
 
 dnl ----------------------------------------------------------------
 dnl user options for misc stuff
 
 dnl ----------------------------------------------------------------
 dnl user options for misc stuff
@@ -898,23 +939,23 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(ipc,IPC,
 **--with-ipc              use interprocess communication (wxSocket etc.),
 
 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,
 
 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,
 
 AC_OVERRIDES(clipboard,clipboard,
 **--with-clipboard        use wxClipboard classes,
-USE_CLIPBOARD)
+wxUSE_CLIPBOARD)
 
 AC_OVERRIDES(dnd,dnd,
 **--with-dnd              use Drag'n'Drop classes,
 
 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,
 
 AC_OVERRIDES(constraints,constrains,
 **--with-constraints      use layout-constraints system,
-USE_CONSTRAINTS)
+wxUSE_CONSTRAINTS)
 
 dnl ----------------------------------------------------------------
 dnl user options for architectures
 
 dnl ----------------------------------------------------------------
 dnl user options for architectures
@@ -922,15 +963,19 @@ dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(mdi,mdi,
 **--with-mdi              use multiple document interface architecture,
 
 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,
 
 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,
 
 AC_OVERRIDES(printarch,printarch,
 **--with-printarch        use printing architecture,
-USE_PRINTING_ARCHITECTURE)
+wxUSE_PRINTING_ARCHITECTURE)
+
+AC_OVERRIDES(help,help,
+**--with-help             use help (using external browser at present),
+wxUSE_HELP)
 
 dnl ----------------------------------------------------------------
 dnl user options with no effect yet
 
 dnl ----------------------------------------------------------------
 dnl user options with no effect yet
@@ -940,10 +985,6 @@ dnl AC_OVERRIDES(metafile, metafile,
 dnl **--with-metafile         use metafile (no effect),
 dnl wxUSE_METAFILE)
 dnl
 dnl **--with-metafile         use metafile (no effect),
 dnl wxUSE_METAFILE)
 dnl
-dnl AC_OVERRIDES(help,help,
-dnl **--with-help             use help (no effect),
-dnl wxUSE_HELP)
-dnl
 dnl AC_OVERRIDES(wxgraph,wxgraph,
 dnl **--with-wxgraph          use wxgraph (no effect),
 dnl wxUSE_WXGRAPH)
 dnl AC_OVERRIDES(wxgraph,wxgraph,
 dnl **--with-wxgraph          use wxgraph (no effect),
 dnl wxUSE_WXGRAPH)
@@ -958,7 +999,7 @@ dnl ----------------------------------------------------------------
 dnl Unix, obviously
 dnl ----------------------------------------------------------------
 
 dnl Unix, obviously
 dnl ----------------------------------------------------------------
 
-if test "$USE_UNIX" = 1 ; then
+if test "$wxUSE_UNIX" = 1 ; then
   AC_DEFINE(__UNIX__)
 fi
 
   AC_DEFINE(__UNIX__)
 fi
 
@@ -973,19 +1014,22 @@ GUI_TK_INCLUDE=
 GUI_TK_LIBRARY=
 GUI_TK_LINK=
 
 GUI_TK_LIBRARY=
 GUI_TK_LINK=
 
+WX_LINK=
+
 MAKEINCLUDE=
 
 MAKEINCLUDE=
 
-if test "$USE_GTK" = 1; then
-  AM_PATH_GTK(0.99.7, [
+if test "$wxUSE_GTK" = 1; then
+  AM_PATH_GTK(1.0.4, [
        GUI_TK_INCLUDE="$GTK_CFLAGS"
        GUI_TK_LIBRARY="$GTK_LIBS"
        GUI_TK_INCLUDE="$GTK_CFLAGS"
        GUI_TK_LIBRARY="$GTK_LIBS"
-  ], AC_MSG_ERROR(Are gtk-config and the GTK in path and up-to-date?))
+  ], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4?))
   TOOLKIT=GTK
   TOOLKIT_DEF=__WXGTK__
   TOOLKIT=GTK
   TOOLKIT_DEF=__WXGTK__
+  WX_LINK=-lwx_gtk_1_0
   MAKEINCLUDE=../gtk.inc
 fi
 
   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
    AC_MSG_CHECKING(for Qt includes)
    AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,qapp.h)
    if test "$ac_find_includes" != "" ; then
@@ -1004,34 +1048,56 @@ if test "$USE_QT" = 1; then
   else
      AC_MSG_ERROR(no)
   fi
   else
      AC_MSG_ERROR(no)
   fi
-  GUI_TK_LINK="-lXext -lX11 -lqt -lm"
+  GUI_TK_LINK="-lX11 -lqt -lm"
   TOOLKIT=QT
   TOOLKIT_DEF=__WXQT__
   TOOLKIT=QT
   TOOLKIT_DEF=__WXQT__
+  WX_LINK=-lwx_qt
   MAKEINCLUDE=../qt.inc
 fi
 
   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
      AC_MSG_RESULT(found $ac_find_includes)
    AC_MSG_CHECKING(for Motif/Lesstif includes)
    AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,Xm.h)
    if test "$ac_find_includes" != "" ; then
      AC_MSG_RESULT(found $ac_find_includes)
-     AC_MSG_CHECKING(for Motif or Lesstif library)
+     AC_MSG_CHECKING(for Motif/Lesstif library)
      AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xm)
      if test "$ac_find_libraries" != "" ; then
        AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
        AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
      AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xm)
      if test "$ac_find_libraries" != "" ; then
        AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
        AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
-       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
+       CHECK_LINK="$CHECK_LIB $ac_path_to_link"
        CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
        AC_MSG_RESULT(found at $ac_find_libraries)
        CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
        AC_MSG_RESULT(found at $ac_find_libraries)
+       AC_MSG_CHECKING(for Xt library)
+       AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt)
+       if test "$ac_find_libraries" != "" ; then
+         AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
+         CHECK_LINK="$CHECK_LIB $ac_path_to_link"
+         AC_MSG_RESULT(found at $ac_find_libraries)
+         AC_MSG_CHECKING(for Xpm library)
+         AC_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
+         if test "$ac_find_libraries" != "" ; then
+           AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
+           CHECK_LINK="$CHECK_LIB $ac_path_to_link"
+           AC_MSG_RESULT(found at $ac_find_libraries)
+         else
+           AC_MSG_ERROR(no)
+         fi
+       else
+         AC_MSG_ERROR(no)
+       fi
      else
        AC_MSG_ERROR(no)
      fi
   else
      AC_MSG_ERROR(no)
   fi
      else
        AC_MSG_ERROR(no)
      fi
   else
      AC_MSG_ERROR(no)
   fi
-  GUI_TK_LINK="-lXext -lXt -lX11 -lXm -lm"
+  
+  GUI_TK_LINK="-lXm -lXmu -lXt -lXpm -lX11 -lm"
+  GUI_TK_LINK="$CHECK_LINK $GUI_TK_LINK"
   TOOLKIT=MOTIF
   TOOLKIT=MOTIF
-  TOOLKIT_DEF=__WXMOTIF__
+  TOOLKIT_DEF="__WXMOTIF__ -D__LINUX__ -D__UNIX__"
+  WX_LINK=-lwx_motif
   MAKEINCLUDE=../motif.inc
 fi
 
   MAKEINCLUDE=../motif.inc
 fi
 
@@ -1043,6 +1109,8 @@ AC_SUBST(GUI_TK_INCLUDE)
 AC_SUBST(GUI_TK_LIBRARY)
 AC_SUBST(GUI_TK_LINK)
 
 AC_SUBST(GUI_TK_LIBRARY)
 AC_SUBST(GUI_TK_LINK)
 
+AC_SUBST(WX_LINK)
+
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DEF)
 
 AC_SUBST(TOOLKIT)
 AC_SUBST(TOOLKIT_DEF)
 
@@ -1053,37 +1121,47 @@ dnl Register compile options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 WXDEBUG=
 dnl ----------------------------------------------------------------
 
 WXDEBUG=
-if test "$USE_DEBUG_INFO" = 1 ; then
-  WXDEBUG="-g -O0"
+if test "$wxUSE_DEBUG_GDB" = 1 ; then
+  wxUSE_DEBUG_INFO=1
+  WXDEBUG="-ggdb"
+  wxUSE_OPTIMISE=0
+else
+  if test "$wxUSE_DEBUG_INFO" = 1 ; then
+    WXDEBUG="-g"
+    wxUSE_OPTIMISE=0
+  fi
 fi
 AC_SUBST(WXDEBUG)
 
 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)
   WXDEBUG_DEFINE="-D__WXDEBUG__"
   AC_SUBST(WXDEBUG_DEFINE)
+else
+  WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
+  AC_SUBST(WXDEBUG_DEFINE)
 fi
 
 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=
 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=
   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" `
   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
   OPTIMISE=
 else
   if test "$GCC" = yes ; then
 AC_SUBST(OPTIMISE)
 
 APPLE_IEEE=NONE
 AC_SUBST(OPTIMISE)
 
 APPLE_IEEE=NONE
-if test "$USE_APPLE_IEEE" = 1 ; then
+if test "$wxUSE_APPLE_IEEE" = 1 ; then
   APPLE_IEEE="APPLE_IEEE"
   APPLE_IEEE="APPLE_IEEE"
-  AC_DEFINE_UNQUOTED(USE_APPLE_IEEE,$USE_APPLE_IEEE)
+  AC_DEFINE_UNQUOTED(wxUSE_APPLE_IEEE,$wxUSE_APPLE_IEEE)
 fi
 
 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 ----------------------------------------------------------------
 
 
 dnl ----------------------------------------------------------------
 dnl Register library options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
-if test "$USE_ZLIB" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_ZLIB,$USE_ZLIB)
-fi
-
-if test "$USE_GDK_IMLIB" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_GDK_IMLIB,$USE_GDK_IMLIB)
+if test "$wxUSE_ZLIB" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_ZLIB,$wxUSE_ZLIB)
 fi
 
 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
 
 fi
 
-if test "$USE_ODBC" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_ODBC,$USE_ODBC) 
+IODBC_C_SRC=""
+if test "$wxUSE_ODBC" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC) 
+  IODBC_C_SRC="\$(IODBC_C_SRC)"
 fi
 fi
+AC_SUBST(IODBC_C_SRC)
 
 dnl ----------------------------------------------------------------
 dnl Register GUI-control options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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 ----------------------------------------------------------------
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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 ----------------------------------------------------------------
 
 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
 
 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
 
 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 ----------------------------------------------------------------
 
 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
 
 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)
 
 
 AC_DEFINE_UNQUOTED(WX_NORMALIZED_PS_FONTS,$WX_NORMALIZED_PS_FONTS)
 
@@ -1236,40 +1313,52 @@ dnl ----------------------------------------------------------------
 dnl Register architecture options for makefiles and setup.h
 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
 
 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
 
 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 wxString options for makefiles and setup.h
+dnl ----------------------------------------------------------------
+
+if test "$wxUSE_UNICODE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_UNICODE)
+fi
+
+if test "$wxUSE_WCSRTOMBS" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_WCSRTOMBS)
 fi
 
 dnl ----------------------------------------------------------------
 dnl Register misc options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
 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
 
 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
 
 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
 
 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
 
 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 ----------------------------------------------------------------
 fi
 
 dnl ----------------------------------------------------------------
@@ -1277,35 +1366,35 @@ dnl No effect
 dnl ----------------------------------------------------------------
 
 METAFILE=NONE
 dnl ----------------------------------------------------------------
 
 METAFILE=NONE
-if test "$USE_METAFILE" = 1 ; then
+if test "$wxUSE_METAFILE" = 1 ; then
   METAFILE="METAFILE"
   METAFILE="METAFILE"
-  AC_DEFINE_UNQUOTED(USE_METAFILE,$USE_METAFILE)
+  AC_DEFINE_UNQUOTED(wxUSE_METAFILE,$wxUSE_METAFILE)
 fi
 AC_SUBST(METAFILE)
 
 HELP=NONE
 fi
 AC_SUBST(METAFILE)
 
 HELP=NONE
-if test "$USE_HELP" = 1 ; then
+if test "$wxUSE_HELP" = 1 ; then
   HELP="HELP"
   HELP="HELP"
-  AC_DEFINE_UNQUOTED(USE_HELP,$USE_HELP)
+  AC_DEFINE_UNQUOTED(wxUSE_HELP,$wxUSE_HELP)
 fi
 AC_SUBST(HELP)
 
 WXGRAPH=NONE
 fi
 AC_SUBST(HELP)
 
 WXGRAPH=NONE
-if test "$USE_WXGRAPH" = 1 ; then
+if test "$wxUSE_WXGRAPH" = 1 ; then
   WXGRAPH="WXGRAPH"
   WXGRAPH="WXGRAPH"
-  AC_DEFINE_UNQUOTED(USE_WXGRAPH,$USE_WXGRAPH)
+  AC_DEFINE_UNQUOTED(wxUSE_WXGRAPH,$wxUSE_WXGRAPH)
 fi
 AC_SUBST(WXGRAPH)
 
 WXTREE=NONE
 fi
 AC_SUBST(WXGRAPH)
 
 WXTREE=NONE
-if test "$USE_WXTREE" = 1 ; then
+if test "$wxUSE_WXTREE" = 1 ; then
   WXTREE="WXTREE"
   WXTREE="WXTREE"
-  AC_DEFINE_UNQUOTED(USE_WXTREE,$USE_WXTREE)
+  AC_DEFINE_UNQUOTED(wxUSE_WXTREE,$wxUSE_WXTREE)
 fi
 AC_SUBST(WXTREE)
 
 GLCANVAS=NONE
 fi
 AC_SUBST(WXTREE)
 
 GLCANVAS=NONE
-if test "$USE_OPENGL" = 1 ; then
+if test "$wxUSE_OPENGL" = 1 ; then
   GLCANVAS="GLCANVAS"
 fi
 
   GLCANVAS="GLCANVAS"
 fi
 
@@ -1359,6 +1448,10 @@ if test "$wxUSE_THREADS" = "1"; then
   ])
 fi
 
   ])
 fi
 
+if test "$wxUSE_MOTIF" = "1"; then
+  UNIX_THREAD="motif/thread.cpp"
+fi
+
 if test -z "$UNIX_THREAD"; then
   wxUSE_THREADS=0
 fi
 if test -z "$UNIX_THREAD"; then
   wxUSE_THREADS=0
 fi
@@ -1379,7 +1472,7 @@ OPENGL_INCLUDE=
 OPENGL_LIBRARY=
 OPENGL_LINK=
 
 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)
   dnl checking OPENGL includes
   AC_MSG_CHECKING(for OpenGL includes)
   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,GL/gl.h)
@@ -1422,15 +1515,15 @@ dnl ----------------------------------------------------------------
 dnl left-over
 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
 
   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)
 AC_SUBST(OPENGL_INCLUDE)
 AC_SUBST(OPENGL_LIBRARY)
 AC_SUBST(OPENGL_LINK)
@@ -1445,7 +1538,7 @@ CREATE_SHARED=
 case "${canonical}" in
 
   *-hp-hpux* )
 case "${canonical}" in
 
   *-hp-hpux* )
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       CXXFLAGS="${CXXFLAGS} +a1 -z -Aa -D_HPUX_SOURCE"
       CFLAGS="${CFLAGS} -z -D_HPUX_SOURCE"
       PICFLAGS="+z"
       CXXFLAGS="${CXXFLAGS} +a1 -z -Aa -D_HPUX_SOURCE"
       CFLAGS="${CFLAGS} -z -D_HPUX_SOURCE"
       PICFLAGS="+z"
@@ -1469,7 +1562,7 @@ case "${canonical}" in
   ;;
 
   *-*-solaris2* ) 
   ;;
 
   *-*-solaris2* ) 
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       PICFLAGS="-KPIC"
     else
       PICFLAGS="-fPIC"
       PICFLAGS="-KPIC"
     else
       PICFLAGS="-fPIC"
@@ -1479,7 +1572,7 @@ case "${canonical}" in
   ;;
 
   *-*-sunos4* ) 
   ;;
 
   *-*-sunos4* ) 
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       PICFLAGS="-PIC"
     else
       PICFLAGS="-fPIC"
       PICFLAGS="-PIC"
     else
       PICFLAGS="-fPIC"
@@ -1501,7 +1594,7 @@ case "${canonical}" in
   ;;
 
   *-*-dgux5* ) 
   ;;
 
   *-*-dgux5* ) 
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       PICFLAGS="-K PIC"
     else
       PICFLAGS="-fPIC"
       PICFLAGS="-K PIC"
     else
       PICFLAGS="-fPIC"
@@ -1511,7 +1604,7 @@ case "${canonical}" in
   ;;
 
   *-*-sysv5* ) 
   ;;
 
   *-*-sysv5* ) 
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       PICFLAGS="-K PIC"
     else
       PICFLAGS="-fPIC"
       PICFLAGS="-K PIC"
     else
       PICFLAGS="-fPIC"
@@ -1521,7 +1614,7 @@ case "${canonical}" in
   ;;
 
   *-*-aix* ) 
   ;;
 
   *-*-aix* ) 
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       PICFLAGS="-bM\:SRE"
     else
       PICFLAGS="-fPIC"
       PICFLAGS="-bM\:SRE"
     else
       PICFLAGS="-fPIC"
@@ -1540,10 +1633,14 @@ if test "x$GCC" = xyes; then
 fi
 
 if test "x$GXX" = xyes; then
 fi
 
 if test "x$GXX" = xyes; then
-  CXXFLAGS="${CXXFLAGS} -Wall"
+  if test "$wxUSE_MOTIF" = 1; then
+    CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused"
+  else
+    CXXFLAGS="${CXXFLAGS} -Wall"
+  fi
 fi
 
 fi
 
-if test "$USE_SHARED" != 1; then
+if test "$wxUSE_SHARED" != 1; then
     CREATE_SHARED=
     PICFLAGS=
 fi
     CREATE_SHARED=
     PICFLAGS=
 fi