]> git.saurik.com Git - wxWidgets.git/blobdiff - configure.in
no message
[wxWidgets.git] / configure.in
index 0d44fab9c32bea0f4595d87dc653271672c95357..419be3c0b66b72a2f1c696becb3814284388d0e6 100644 (file)
@@ -1,10 +1,10 @@
 dnl ////////////////////////////////////////////////////////////////////////
 dnl
-dnl Top-level configure.in for wxGTK by Robert Roebling, Wolfram Gloger
+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
+dnl $Id$
 dnl ////////////////////////////////////////////////////////////////////////
 
 dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
@@ -14,9 +14,9 @@ AC_DEFUN(AM_PATH_GTK,
 [dnl 
 dnl Get the cflags and libraries from the gtk-config script
 dnl
-AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
+AC_ARG_WITH(gtk-prefix,[**--with-gtk-prefix=PFX       Prefix where GTK is installed],
             gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
+AC_ARG_WITH(gtk-exec-prefix,[**--with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed],
             gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
 
   if test x$gtk_config_exec_prefix != x ; then
@@ -61,6 +61,8 @@ main ()
      exit(1);
    }
 
+   if (gtk_minor_version > 0) return FALSE;
+
    return !((gtk_major_version > major) ||
            ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
            ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
@@ -235,11 +237,16 @@ dnl ------------------------------------------------------------------------
 
 SEARCH_INCLUDE="\
     /usr/Motif1.2/include     \
+    /usr/dt/include/Xm        \
                              \
     /usr/X11R6/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        \
@@ -262,18 +269,28 @@ SEARCH_INCLUDE="\
     /usr/XFree86/include/X11  \
                               \
     /usr/include              \
+    /usr/include/gtk          \
+    /usr/include/gdk          \
+    /usr/include/glib         \
     /usr/local/include        \
-    /usr/local/include/gtk    \
     /usr/unsupported/include  \
     /usr/athena/include       \
     /usr/local/x11r5/include  \
     /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/openwin/include      \
     /usr/openwin/share/include \
     "
 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` \
+    /usr/dt/lib \
     "
 
 dnl ------------------------------------------------------------------------
@@ -367,7 +384,7 @@ fi
 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)
@@ -407,17 +424,40 @@ AC_HEADER_STDC
 dnl   defines STDC_HEADERS if ANSI-C header
 AC_HEADER_SYS_WAIT
 dnl   defines HAVE_SYS_WAIT_H if sys/wait.h exist and is POSIX.1
-AC_CHECK_HEADER(fcntl.h)
+AC_CHECK_HEADERS(fcntl.h)
 dnl   defines HAVE_FCNTL_H
-AC_CHECK_HEADER(limits.h)
+AC_CHECK_HEADERS(limits.h)
 dnl   defines HAVE_LIMITS_h
-AC_CHECK_HEADER(sys/file.h)
+AC_CHECK_HEADERS(sys/file.h)
 dnl   defines HAVE_SYS_FILE_H
-AC_CHECK_HEADER(sys/time.h)
+AC_CHECK_HEADERS(sys/time.h)
 dnl   defines HAVE_SYS_TIME_H
-AC_CHECK_HEADER(unistd.h)
+AC_CHECK_HEADERS(unistd.h)
 dnl   defines HAVE_UNISTD_H
+AC_CHECK_HEADERS(fnmatch.h)
+dnl   defines HAVE_FNMATCH_H
+dnl As it needs Linux 2.1.x for the moment: check whether the file exists (GL).
+AC_CHECK_HEADERS(linux/joystick.h)
+GTK_JOYSTICK=""
+if test "$ac_cv_header_linux_joystick_h" = "yes"; then
+  GTK_JOYSTICK="gtk/joystick.cpp"
+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 ###################
@@ -489,6 +529,7 @@ dnl ##########################
 dnl # checks system services #
 dnl ##########################
 
+
 AC_SYS_LONG_FILE_NAMES
 dnl   defines HAVE_LONG_FILENAMES if filenames longer then
 dnl                               14 chars are supported
@@ -537,12 +578,8 @@ dnl ------------------------------------------------------------------------
 dnl system settings
 dnl ------------------------------------------------------------------------
 
-USE_GTK=1
 USE_UNIX=1
 
-TOOLKIT=GTK
-TOOLKIT_DEF=__GTK__
-
 USE_LINUX=
 USE_SGI=
 USE_HPUX=
@@ -560,6 +597,7 @@ USE_VMS=
 USE_ULTRIX=
 USE_DATA_GENERAL=
 
+AC_DEFINE(__UNIX__)
 case "${canonical}" in
   *-hp-hpux* )
     USE_HPUX=1
@@ -568,6 +606,12 @@ case "${canonical}" in
   *-*-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
@@ -633,296 +677,406 @@ dnl ------------------------------------------------------------------------
 
 AC_OVERRIDES_PREPARE
 
-DEFAULT_USE_SHARED=0
-DEFAULT_USE_OPTIMISE=1
-DEFAULT_USE_PROFILE=0
-DEFAULT_USE_DEBUG_FLAG=0
-DEFAULT_USE_DEBUG_INFO=0
-DEFAULT_USE_MEM_TRACING=0
+DEFAULT_wxUSE_GTK=1
+DEFAULT_wxUSE_QT=0
+DEFAULT_wxUSE_MOTIF=0
+
+DEFAULT_wxUSE_THREADS=0
+
+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=1
+
+DEFAULT_wxUSE_TIMEDATE=1
+DEFAULT_wxUSE_INTL=1
+DEFAULT_wxUSE_CONFIG=1
+DEFAULT_wxUSE_STREAMS=1
+DEFAULT_wxUSE_SERIAL=1
+
+DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=1
+DEFAULT_WX_NORMALIZED_PS_FONTS=1
+DEFAULT_wxUSE_POSTSCRIPT=1
 
-DEFAULT_USE_ZLIB=1
-DEFAULT_USE_GDK_IMLIB=1
-DEFAULT_USE_LIBPNG=1
+DEFAULT_wxUSE_IPC=1
+DEFAULT_wxUSE_RESOURCES=1
+DEFAULT_wxUSE_CLIPBOARD=1
+DEFAULT_wxUSE_DRAG_AND_DROP=1
 
-DEFAULT_USE_STORABLE_CLASSES=1
-DEFAULT_USE_AUTOTRANS=1
-DEFAULT_USE_AFM_FOR_POSTSCRIPT=1
-DEFAULT_WX_NORMALIZED_PS_FONTS=1
+DEFAULT_wxUSE_MDI_ARCHITECTURE=1
+DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1
+DEFAULT_wxUSE_PRINTING_ARCHITECTURE=1
+
+DEFAULT_wxUSE_PROLOGIO=1
+DEFAULT_wxUSE_WX_RESOURCES=1
+DEFAULT_wxUSE_RPC=0
+DEFAULT_wxUSE_HELP=1
+
+DEFAULT_wxUSE_UNICODE=1
+DEFAULT_wxUSE_WCSRTOMBS=0
+
+dnl ----------------------------------------------------------------
+dnl toolkit options
+dnl ----------------------------------------------------------------
+
+AC_OVERRIDES(gtk,gtk,
+**--with-gtk              use GTK,
+wxUSE_GTK)
 
-DEFAULT_USE_IOSTREAMH=1
-
-DEFAULT_USE_THREADS=0
-DEFAULT_USE_THREADS_SGI=0
-DEFAULT_USE_THREADS_POSIX=0
-DEFAULT_USE_OPENGL=0
-
-DEFAULT_USE_POSTSCRIPT=1
-DEFAULT_USE_IPC=1
-DEFAULT_USE_RESOURCES=1
-DEFAULT_USE_TIMEDATE=1
-DEFAULT_USE_FRACTION=1
-DEFAULT_USE_CONSTRAINTS=1
-DEFAULT_USE_TOOLBAR=1
-DEFAULT_USE_GAUGE=1
-DEFAULT_USE_SCROLLBAR=1
-DEFAULT_USE_DOC_VIEW_ARCHITECTURE=1
-DEFAULT_USE_PRINTING_ARCHITECTURE=1
-
-DEFAULT_USE_METAFILE=0
-DEFAULT_USE_HELP=0
-DEFAULT_USE_CLIPBOARD=0
-DEFAULT_USE_VLBOX=0
-DEFAULT_USE_WXGRAPH=0
-DEFAULT_USE_WXTREE=0
-DEFAULT_USE_ENHANCED_DIALOG=0
-
-DEFAULT_USE_FORM=0
-DEFAULT_USE_PROLOGIO=0
-DEFAULT_USE_RPC=0
-DEFAULT_USE_WX_RESOURCES=1
+AC_OVERRIDES(qt,qt,
+**--with-qt               use Qt,
+wxUSE_QT)
+
+AC_OVERRIDES(motif,motif,
+**--with-motif            use Motif/Lesstif,
+wxUSE_MOTIF)
 
 dnl ----------------------------------------------------------------
-dnl user options
+dnl compile options
 dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(shared,shared,
 **--with-shared           create shared libraries,
-USE_SHARED)
+wxUSE_SHARED)
 
 AC_OVERRIDES(optimise,optimise,
-**--without-optimise      create unoptimised code,
-USE_OPTIMISE)
+**--with-optimise         create optimised code,
+wxUSE_OPTIMISE)
 
 AC_OVERRIDES(debug_flag,debug_flag,
-**--with-debug_flag       create code with DEBUG define set to 1,
-USE_DEBUG_FLAG)
+**--with-debug_flag       create code with WXDEBUG define set to 1,
+wxUSE_DEBUG_FLAG)
 
 AC_OVERRIDES(debug_info,debug_info,
-**--with-debug_info       create code with debuging information included,
-USE_DEBUG_INFO)
+**--with-debug_info       create code with debuging information,
+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,
-USE_MEM_TRACING)
+wxUSE_MEM_TRACING)
+
+AC_OVERRIDES(dmalloc,dmalloc,
+**--with-dmalloc          use dmalloc memory debug library (www.letters.com/dmalloc/),
+wxUSE_DMALLOC)
 
 AC_OVERRIDES(profile,profile,
-**--with-profile          create code with profiling information included,
-USE_PROFILE)
+**--with-profile          create code with profiling information,
+wxUSE_PROFILE)
+
+AC_OVERRIDES(apple_ieee, apple_ieee,
+**--with_apple_ieee      use the Apple IEEE codec,
+wxUSE_APPLE_IEEE)
+
+AC_OVERRIDES(threads,threads,
+**--with-threads          for enabling threads,
+wxUSE_THREADS)
 
 dnl ----------------------------------------------------------------
-dnl user options for libraries (no choice yet)
+dnl user options for libraries
 dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(zlib,zlib,
-**--with-zlib          use zlib (LZW comression),
-USE_ZLIB)
-
-AC_OVERRIDES(gdk_imlib,gdk_imlib,
-**--with-gdk_imlib     use Raster's gdk_imlib (Image library),
-USE_GDK_IMLIB)
+**--with-zlib             use zlib for LZW comression,
+wxUSE_ZLIB)
 
 AC_OVERRIDES(libpng,libpng,
-**--with-libpng        use libpng (PNG image format),
-USE_LIBPNG)
-
-AC_OVERRIDES(threads,threads,
-**--with-threads       use threads,
-USE_THREADS)
+**--with-libpng           use libpng (PNG image format),
+wxUSE_LIBPNG)
 
-AC_OVERRIDES(opengl,opengl,
-**--with-opengl        use opengl (OpenGL or Mesa),
-USE_OPENGL)
+AC_OVERRIDES(odbc,odbc,
+**--with-odbc             use iODBC and wxODBC classes,
+wxUSE_ODBC)
 
 dnl ----------------------------------------------------------------
-dnl user options for code features (no choice yet)
+dnl user options for non-GUI classes
 dnl ----------------------------------------------------------------
 
-AC_OVERRIDES(storable,storable,
-**--with-storable          use storable classes,
-USE_STORABLE_CLASSES)
+AC_OVERRIDES(timedate, timedate,
+**--with-timedate         use wxTime and wxDate classes,
+wxUSE_TIMEDATE)
+
+AC_OVERRIDES(intl,intl,
+**--with-intl             use internationalization system,
+wxUSE_INTL)
+
+AC_OVERRIDES(config,config,
+**--with-config           use wxConfig class,
+wxUSE_CONFIG)
 
-AC_OVERRIDES(autotrans,autotrans,
-**--with-autotrans         use gettext automatic translation,
-USE_AUTOTRANS)
+AC_OVERRIDES(streams,streams,
+**--with-streams          use wxStream etc classes,
+wxUSE_STREAMS)
+
+AC_OVERRIDES(serial,serial,
+**--with-serial           use class serialization,
+wxUSE_SERIAL)
+
+dnl ----------------------------------------------------------------
+dnl user options for PostScript
+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,
 WX_NORMALIZED_PS_FONTS)
 
-AC_OVERRIDES(rpc,RPC,
-**--with-rpc              use RPC,
-USE_RPC)
-
-AC_OVERRIDES(wxresources,wxresources,
-**--with-wxresources      use wxresources,
-USE_WX_RESOURCES)
-
-AC_OVERRIDES(prologio,prologio,
-**--with-prologio         use prologio,
-USE_PROLOGIO)
-
 AC_OVERRIDES(postscript, postscript,
-**--with-postscript       use postscript-device-context,
-USE_POSTSCRIPT)
+**--with-postscript       use wxPostscriptDC device context,
+wxUSE_POSTSCRIPT)
 
-AC_OVERRIDES(metafile, metafile,
-**--with-metafile         use metafile,
-USE_METAFILE)
+dnl ----------------------------------------------------------------
+dnl user options for wxString and Unicode
+dnl ----------------------------------------------------------------
 
-AC_OVERRIDES(form,form,
-**--with-form             use form,
-USE_FORM)
+AC_OVERRIDES(unicode,unicode,
+**--with-unicode          compile wxString with Unicode support,
+wxUSE_UNICODE)
 
-AC_OVERRIDES(help,help,
-**--with-help             use help,
-USE_HELP)
+AC_OVERRIDES(wcsrtombs,wcsrtombs,
+**--with-wcsrtombs        use wcsrtombs instead of (buggy in GNU libc5) wcstombs,
+wxUSE_WCSRTOMBS)
 
-AC_OVERRIDES(ipc,IPC,
-**--with-ipc              use ipc,
-USE_IPC)
+dnl ----------------------------------------------------------------
+dnl user options for Prolog and Resources
+dnl ----------------------------------------------------------------
 
-AC_OVERRIDES(enhanceddialog,enhanced dialog,
-**--with-enhanceddialog   use enhanced dialog,
-USE_ENHANCED_DIALOG)
+AC_OVERRIDES(wxresources,wxresources,
+**--with-wxresources      use wxWindows's resources,
+wxUSE_WX_RESOURCES)
 
-AC_OVERRIDES(resources,resources,
-**--with-resources        use resources,
-USE_RESOURCES)
+AC_OVERRIDES(prologio,prologio,
+**--with-prologio         use Prolog IO library,
+wxUSE_PROLOGIO)
 
-AC_OVERRIDES(clipboard,clipboard,
-**--with-clipboard        use clipboard,
-USE_CLIPBOARD)
+AC_OVERRIDES(rpc,RPC,
+**--with-rpc              use Prolog's remote procedure calls,
+wxUSE_RPC)
 
-AC_OVERRIDES(timedate, timedate,
-**--with-timedate         use timedate,
-USE_TIMEDATE)
+dnl ----------------------------------------------------------------
+dnl user options for misc stuff
+dnl ----------------------------------------------------------------
 
-AC_OVERRIDES(fraction,fraction,
-**--with-fraction         use fraction,
-USE_FRACTION)
+AC_OVERRIDES(ipc,IPC,
+**--with-ipc              use interprocess communication (wxSocket etc.),
+wxUSE_IPC)
 
-AC_OVERRIDES(constraints,constrains,
-**--with-constraints      use constraints,
-USE_CONSTRAINTS)
+AC_OVERRIDES(resources,resources,
+**--with-resources        use X resources for saving information,
+wxUSE_RESOURCES)
 
-AC_OVERRIDES(toolbar,toolbar,
-**--with-toolbar          use toolbar,
-USE_TOOLBAR)
+AC_OVERRIDES(clipboard,clipboard,
+**--with-clipboard        use wxClipboard classes,
+wxUSE_CLIPBOARD)
 
-AC_OVERRIDES(gauge,gauge,
-**--with-gauge            use gauge,
-USE_GAUGE)
+AC_OVERRIDES(dnd,dnd,
+**--with-dnd              use Drag'n'Drop classes,
+wxUSE_DRAG_AND_DROP)
 
-AC_OVERRIDES(vllist,vllist,
-**--with-vlbox            use virtual list box,
-USE_VLBOX)
+dnl ----------------------------------------------------------------
+dnl user options for architectures
+dnl ----------------------------------------------------------------
 
-AC_OVERRIDES(scrollbar,scrollbar,
-**--with-scrollbar        use scrollbar,
-USE_SCROLLBAR)
+AC_OVERRIDES(mdi,mdi,
+**--with-mdi              use multiple document interface 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)
 
-AC_OVERRIDES(typetree,typetree,
-**--with-typetree         use typetree,
-USE_TYPETREE)
-
-AC_OVERRIDES(wxgraph,wxgraph,
-**--with-wxgraph          use wxgraph,
-USE_WXGRAPH)
+AC_OVERRIDES(help,help,
+**--with-help             use help (using external browser at present),
+wxUSE_HELP)
 
-AC_OVERRIDES(wxtree,wxtree,
-**--with-wxtree           use wxtree,
-USE_WXTREE)
+dnl ----------------------------------------------------------------
+dnl Unix, obviously
+dnl ----------------------------------------------------------------
 
-dnl AC_OVERRIDES(package,message,helpmessage,variable)
+if test "$wxUSE_UNIX" = 1 ; then
+  AC_DEFINE(__UNIX__)
+fi
 
 dnl ----------------------------------------------------------------
-dnl register changes for Makefiles (via substit) and setup.h
+dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------
 
-ZLIB=NONE
-if test "$USE_ZLIB" = 1 ; then
-  ZLIB="ZLIB"
-fi
+TOOLKIT=
+TOOLKIT_DEF=
+
+GUI_TK_INCLUDE=
+GUI_TK_LIBRARY=
+GUI_TK_LINK=
+
+WX_LINK=
+
+MAKEINCLUDE=
 
-GDK_IMLIB=NONE
-if test "$USE_GDK_IMLIB" = 1 ; then
-  GDK_IMLIB="GDK_IMLIB"
+if test "$wxUSE_GTK" = 1; then
+  AM_PATH_GTK(1.0.4, [
+       GUI_TK_INCLUDE="$GTK_CFLAGS"
+       GUI_TK_LIBRARY="$GTK_LIBS"
+  ], AC_MSG_ERROR(Is gtk-config in path and GTK+ is version 1.0.4 up-to 1.0.6?))
+  TOOLKIT=GTK
+  TOOLKIT_DEF=__WXGTK__
+  WX_LINK=-lwx_gtk2
+  MAKEINCLUDE=../gtk.inc
 fi
 
-LIBPNG=NONE
-if test "$USE_LIBPNG" = 1 ; then
-  LIBPNG="LIBPNG"
+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_RESULT(found $ac_find_includes)
+     AC_MSG_CHECKING(for Qt library)
+     AC_PATH_FIND_LIBRARIES($SEARCH_LIB,qt)
+     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_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
+       AC_MSG_RESULT(found Qt at $ac_find_libraries)
+     else
+       AC_MSG_ERROR(no)
+     fi
+  else
+     AC_MSG_ERROR(no)
+  fi
+  GUI_TK_LINK="-lX11 -lqt -lm"
+  TOOLKIT=QT
+  TOOLKIT_DEF=__WXQT__
+  WX_LINK=-lwx_qt
+  MAKEINCLUDE=../qt.inc
 fi
 
-THREADS=NONE
-THREADS_LINK=
-if test "$USE_THREADS" = 1 ; then
-  case "$OS" in iris | IRIX | Irix5 | Irix6)
-    USE_THREADS_POSIX=0
-    USE_THREADS_SGI=1
-  ;;
-  *)
-    USE_THREADS_POSIX=1
-    USE_THREADS_SGI=0
-    THREADS_LINK=-lpthread
-  ;;
-  esac
-  THREADS="THREADS"
-  AC_DEFINE_UNQUOTED(USE_THREADS,$USE_THREADS)
-  AC_DEFINE_UNQUOTED(USE_THREADS_SGI,$USE_THREADS_SGI)
-  AC_DEFINE_UNQUOTED(USE_THREADS_POSIX,$USE_THREADS_POSIX)
+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 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)
+       CHECK_LINK="$CHECK_LIB $ac_path_to_link"
+       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
+  
+  GUI_TK_LINK="-lXm -lXmu -lXt -lXpm -lX11 -lm"
+  GUI_TK_LINK="$CHECK_LINK $GUI_TK_LINK"
+  TOOLKIT=MOTIF
+  TOOLKIT_DEF="__WXMOTIF__ -D__LINUX__ -D__UNIX__"
+  WX_LINK=-lwx_motif
+  MAKEINCLUDE=../motif.inc
 fi
-AC_SUBST(THREADS)
-AC_SUBST(THREADS_LINK)
 
-STORABLE=NONE
-if test "$USE_STORABLE_CLASSES" = 1 ; then
-  STORABLE="STORABLE"
-  AC_DEFINE_UNQUOTED(USE_STORABLE_CLASSES,$USE_STORABLE_CLASSES)
+if test "$TOOLKIT" = ""; then
+  AC_MSG_ERROR(You must specify a toolkit: --with-gtk --with-qt --with-motif) 
 fi
 
-AUTOTRANS=NONE
-if test "$USE_AUTOTRANS" = 1 ; then
-  AUTOTRANS="AUTOTRANS"
-  AC_DEFINE_UNQUOTED(USE_AUTOTRANS,$USE_AUTOTRANS)
+AC_SUBST(GUI_TK_INCLUDE)
+AC_SUBST(GUI_TK_LIBRARY)
+AC_SUBST(GUI_TK_LINK)
+
+AC_SUBST(WX_LINK)
+
+AC_SUBST(TOOLKIT)
+AC_SUBST(TOOLKIT_DEF)
+
+AC_SUBST(MAKEINCLUDE)
+
+dnl ----------------------------------------------------------------
+dnl Register compile options for makefiles and setup.h
+dnl ----------------------------------------------------------------
+
+WXDEBUG=
+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
+  else
+    WX_LINK="-s $WX_LINK"
+  fi
 fi
+AC_SUBST(WXDEBUG)
 
-DEBUG=
-if test "$USE_DEBUG_INFO" = 1 ; then
-  DEBUG="-g"
+if test "$wxUSE_DEBUG_FLAG" = 1 ; then
+  AC_DEFINE_UNQUOTED(WXDEBUG,$wxUSE_DEBUG_FLAG)
+  WXDEBUG_DEFINE="-D__WXDEBUG__"
+  AC_SUBST(WXDEBUG_DEFINE)
+else
+  WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
+  AC_SUBST(WXDEBUG_DEFINE)
 fi
-AC_SUBST(DEBUG)
 
-if test "$USE_DEBUG_FLAG" = 1 ; then
-  AC_DEFINE_UNQUOTED(DEBUG,$USE_DEBUG_FLAG)
+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
 
-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)
+EXTRA_LINK=
+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
@@ -938,392 +1092,210 @@ else
 fi
 AC_SUBST(OPTIMISE)
 
-USE_IOSTREAMH=$DEFAULT_USE_IOSTREAMH
-AC_DEFINE_UNQUOTED(USE_IOSTREAMH,$USE_IOSTREAMH)
-
-RPC=NONE
-if test "$USE_RPC" = 1 ; then
-  RPC="RPC"
-  AC_DEFINE_UNQUOTED(USE_RPC,$USE_RPC)
+APPLE_IEEE=NONE
+if test "$wxUSE_APPLE_IEEE" = 1 ; then
+  APPLE_IEEE="APPLE_IEEE"
+  AC_DEFINE_UNQUOTED(wxUSE_APPLE_IEEE,$wxUSE_APPLE_IEEE)
 fi
-AC_SUBST(RPC)
 
-WXRESOURCES=NONE
-if test "$USE_WX_RESOURCES" = 1 ; then
-  WXRESOURCES="WXRESOURCES"
-  AC_DEFINE_UNQUOTED(USE_WX_RESOURCES,$USE_WX_RESOURCES)
-fi
-AC_SUBST(WXRESOURCES)
-
-PROLOGIO=NONE
-PROLOGIOSRC=NONE
-if test "$USE_PROLOGIO" = 1 ; then
-  PROLOGIO="PROLOGIO"
-  PROLOGIOSRC="PROLOGIOSRC"
-  AC_DEFINE_UNQUOTED(USE_PROLOGIO)
-fi
-AC_SUBST(PROLOGIO)
-AC_SUBST(PROLOGIOSRC)
+wxUSE_IOSTREAMH=$DEFAULT_wxUSE_IOSTREAMH
+AC_DEFINE_UNQUOTED(wxUSE_IOSTREAMH,$wxUSE_IOSTREAMH)
 
-POSTSCRIPTDC=NONE
-if test "$USE_POSTSCRIPT" = 1 ; then
-  POSTSCRIPTDC="POSTSCRIPTDC"
-  AC_DEFINE_UNQUOTED(USE_POSTSCRIPT)
-fi
-AC_SUBST(POSTSCRIPTDC)
+dnl ----------------------------------------------------------------
+dnl Register library options for makefiles and setup.h
+dnl ----------------------------------------------------------------
 
-METAFILE=NONE
-if test "$USE_METAFILE" = 1 ; then
-  METAFILE="METAFILE"
-  AC_DEFINE_UNQUOTED(USE_METAFILE,$USE_METAFILE)
+if test "$wxUSE_ZLIB" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_ZLIB,$wxUSE_ZLIB)
+  Z_C_SRC="\$(Z_C_SRC)"
 fi
-AC_SUBST(METAFILE)
+AC_SUBST(Z_C_SRC)
 
-FORM=NONE
-if test "$USE_FORM" = 1 ; then
-  FORM="FORM"
-  AC_DEFINE_UNQUOTED(USE_FORM,$USE_FORM)
+if test "$wxUSE_LIBPNG" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_LIBPNG,$wxUSE_LIBPNG) 
+  PNG_C_SRC="\$(PNG_C_SRC)"
 fi
-AC_SUBST(FORM)
+AC_SUBST(PNG_C_SRC)
 
-HELP=NONE
-if test "$USE_HELP" = 1 ; then
-  HELP="HELP"
-  AC_DEFINE_UNQUOTED(USE_HELP,$USE_HELP)
+IODBC_C_SRC=""
+if test "$wxUSE_ODBC" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_ODBC,$wxUSE_ODBC) 
+  IODBC_C_SRC="\$(IODBC_C_SRC)"
 fi
-AC_SUBST(HELP)
+AC_SUBST(IODBC_C_SRC)
 
-IPC=NONE
-if test "$USE_IPC" = 1 ; then
-  IPC="IPC"
-  AC_DEFINE_UNQUOTED(USE_IPC)
-fi
-AC_SUBST(IPC)
+dnl ----------------------------------------------------------------
+dnl Register non-GUI class options for makefiles and setup.h
+dnl ----------------------------------------------------------------
 
-ENHDIALOGBOX=NONE
-if test "$USE_ENHANCED_DIALOG" = 1 ; then
-  ENHDIALOGBOX="ENHDIALOGBOX"
-  AC_DEFINE_UNQUOTED(USE_ENHANCED_DIALOG,$USE_ENHANCED_DIALOG)
+if test "$wxUSE_CONFIG" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_CONFIG,$wxUSE_CONFIG)
 fi
-AC_SUBST(ENHDIALOGBOX)
 
-XRESOURCES=NONE
-if test "$USE_RESOURCES" = 1 ; then
-  XRESOURCES="XRESOURCES"
-  AC_DEFINE_UNQUOTED(USE_RESOURCES,$USE_RESOURCES)
+if test "$wxUSE_TIMEDATE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_TIMEDATE,$wxUSE_TIMEDATE)
 fi
-AC_SUBST(XRESOURCES)
 
-CLIPBOARD=NONE
-if test "$USE_CLIPBOARD" = 1 ; then
-  CLIPBOARD="CLIPBOARD"
-  AC_DEFINE_UNQUOTED(USE_CLIPBOARD,$USE_CLIPBOARD)
+if test "$wxUSE_INTL" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_INTL,$wxUSE_INTL)
 fi
-AC_SUBST(CLIPBOARD)
 
-CONSTRAINTS=NONE
-if test "$USE_CONSTRAINTS" = 1 ; then
-  CONSTRAINTS="CONSTRAINTS"
-  AC_DEFINE_UNQUOTED(USE_CONSTRAINTS,$USE_CONSTRAINTS)
+if test "$wxUSE_STREAMS" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_STREAMS,$wxUSE_STREAMS)
 fi
-AC_SUBST(CONSTRAINTS)
 
-TIMEDATE=NONE
-if test "$USE_TIMEDATE" = 1 ; then
-  TIMEDATE="TIMEDATE"
-  AC_DEFINE_UNQUOTED(USE_TIMEDATE,$USE_TIMEDATE)
+if test "$wxUSE_SERIAL" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_SERIAL,$wxUSE_SERIAL)
 fi
-AC_SUBST(TIMEDATE)
 
-FRACTION=NONE
-if test "$USE_FRACTION" = 1 ; then
-  FRACTION="FRACTION"
-  AC_DEFINE_UNQUOTED(USE_FRACTION,$USE_FRACTION)
-fi
-AC_SUBST(FRACTION)
+dnl ----------------------------------------------------------------
+dnl Register Prolog and Resources options for makefiles and setup.h
+dnl ----------------------------------------------------------------
 
-TOOLBAR=NONE
-if test "$USE_TOOLBAR" = 1 ; then
-  TOOLBAR="TOOLBAR"
-  AC_DEFINE_UNQUOTED(USE_TOOLBAR,$USE_TOOLBAR)
-  AC_DEFINE_UNQUOTED(USE_XT_TOOLBAR,$USE_XT_TOOLBAR)
+if test "$wxUSE_RPC" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_RPC,$wxUSE_RPC)
 fi
-AC_SUBST(TOOLBAR)
 
-GAUGE=NONE
-if test "$USE_GAUGE" = 1 ; then
-  GAUGE="GAUGE"
-  AC_SUBST(GAUGE)
-  AC_DEFINE_UNQUOTED(USE_GAUGE,$USE_GAUGE)
+if test "$wxUSE_WX_RESOURCES" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_WX_RESOURCES,$wxUSE_WX_RESOURCES)
 fi
 
-VIRLISTBOX=NONE
-if test "$USE_VLBOX" = 1 ; then
-  VIRTLISTBOX="VIRLISTBOX"
-  AC_DEFINE_UNQUOTED(USE_VIRLISTBOX,$USE_VIRLISTBOX)
+if test "$wxUSE_PROLOGIO" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_PROLOGIO)
 fi
-AC_SUBST(VIRLISTBOX)
 
-SCROLLBAR=NONE
-if test "$USE_SCROLLBAR" = 1 ; then
-  SCROLLBAR="SCROLLBAR"
-  AC_DEFINE_UNQUOTED(USE_SCROLLBAR,$USE_SCROLLBAR)
-fi
-AC_SUBST(SCROLLBAR)
+dnl ----------------------------------------------------------------
+dnl Register PostScript options for makefiles and setup.h
+dnl ----------------------------------------------------------------
 
-DOCVIEW=NONE
-if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
-  DOCVIEW="DOCVIEW"
-  AC_DEFINE_UNQUOTED(USE_DOC_VIEW_ARCHITECTURE,$USE_DOC_VIEW_ARCHITECTURE)
+if test "$wxUSE_POSTSCRIPT" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_POSTSCRIPT)
 fi
-AC_SUBST(DOCVIEW)
 
-PRINTPREVIEW=NONE
-if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
-  PRINTPREVIEW="PRINTPREVIEW"
-  AC_DEFINE_UNQUOTED(USE_PRINTING_ARCHITECTURE,$USE_PRINTING_ARCHITECTURE)
-fi
-AC_SUBST(PRINTPREVIEW)
+AC_DEFINE_UNQUOTED(wxUSE_AFM_FOR_POSTSCRIPT,$wxUSE_AFM_FOR_POSTSCRIPT)
 
-TYPETREE=NONE
-if test "$USE_TYPETREE" = 1 ; then
-  TYPETREE="TYPETREE"
-  AC_DEFINE_UNQUOTED(USE_TYPETREE,$USE_TYPETREE)
-fi
-AC_SUBST(TYPETREE)
+AC_DEFINE_UNQUOTED(WX_NORMALIZED_PS_FONTS,$WX_NORMALIZED_PS_FONTS)
 
-WXGRAPH=NONE
-if test "$USE_WXGRAPH" = 1 ; then
-  WXGRAPH="WXGRAPH"
-  AC_DEFINE_UNQUOTED(USE_WXGRAPH,$USE_WXGRAPH)
-fi
-AC_SUBST(WXGRAPH)
+dnl ----------------------------------------------------------------
+dnl Register architecture options for makefiles and setup.h
+dnl ----------------------------------------------------------------
 
-WXTREE=NONE
-if test "$USE_WXTREE" = 1 ; then
-  WXTREE="WXTREE"
-  AC_DEFINE_UNQUOTED(USE_WXTREE,$USE_WXTREE)
+if test "$wxUSE_MDI_ARCHITECTURE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_MDI_ARCHITECTURE,$wxUSE_MDI_ARCHITECTURE)
 fi
-AC_SUBST(WXTREE)
 
-GLCANVAS=NONE
-if test "$USE_OPENGL" = 1 ; then
-  GLCANVAS="GLCANVAS"
+if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_DOC_VIEW_ARCHITECTURE,$wxUSE_DOC_VIEW_ARCHITECTURE)
 fi
 
-AC_DEFINE_UNQUOTED(USE_AFM_FOR_POSTSCRIPT,$USE_AFM_FOR_POSTSCRIPT)
-
-AC_DEFINE_UNQUOTED(WX_NORMALIZED_PS_FONTS,$WX_NORMALIZED_PS_FONTS)
+if test "$wxUSE_PRINTING_ARCHITECTURE" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_PRINTING_ARCHITECTURE,$wxUSE_PRINTING_ARCHITECTURE)
+fi
 
 dnl ----------------------------------------------------------------
-dnl Unix, obviously
+dnl Register wxString options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
-if test "$USE_UNIX" = 1 ; then
-  AC_DEFINE(__UNIX__)
+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 search for GTK
+dnl Register misc options for makefiles and setup.h
 dnl ----------------------------------------------------------------
 
-GUI_TK_INCLUDE=
-GUI_TK_LIBRARY=
-GUI_TK_LINK=
+if test "$wxUSE_IPC" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_IPC)
+fi
 
-if test "$USE_GTK" = 1; then
-  AM_PATH_GTK(0.99.7, [
-       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_DEFINE(__GTK__)
+if test "$wxUSE_RESOURCES" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_RESOURCES,$wxUSE_RESOURCES)
 fi
-AC_SUBST(GUI_TK_INCLUDE)
-AC_SUBST(GUI_TK_LIBRARY)
-AC_SUBST(GUI_TK_LINK)
 
-AC_SUBST(TOOLKIT)
-AC_SUBST(TOOLKIT_DEF)
+if test "$wxUSE_CLIPBOARD" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_CLIPBOARD,$wxUSE_CLIPBOARD)
+fi
+
+if test "$wxUSE_DRAG_AND_DROP" = 1 ; then
+  AC_DEFINE_UNQUOTED(wxUSE_DRAG_AND_DROP,$wxUSE_DRAG_AND_DROP)
+fi
 
 dnl ----------------------------------------------------------------
-dnl search for opengl
+dnl No effect yet
 dnl ----------------------------------------------------------------
 
-OPENGL_INCLUDE=
-OPENGL_LIBRARY=
-OPENGL_LINK=
-
-if test "$USE_OPENGL" = 1; then
-  dnl checking OPENGL includes
-  AC_MSG_CHECKING(for OpenGL includes)
-  AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,GL/gl.h)
-  if test "$ac_find_includes" != "" ; then
-    OPENGL_INCLUDE="-I$ac_find_includes"
-    AC_MSG_RESULT(found $ac_find_includes)
-    dnl checking OPENGL libraries
-    AC_MSG_CHECKING(for OpenGL library)
-    AC_PATH_FIND_LIBRARIES($SEARCH_LIB,GL)
-    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_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
-      OPENGL_LIBRARY="$ac_path_to_link"
-      OPENGL_INCLUDE="$ac_path_to_include"
-      OPENGL_LINK="-lGL"
-      AC_MSG_RESULT(found OpenGL at $ac_find_libraries)
-    else
-      AC_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
-      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_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
-        OPENGL_LIBRARY="$ac_path_to_link"
-        OPENGL_INCLUDE="$ac_path_to_include"
-        OPENGL_LINK="-lMesaGL"
-        AC_MSG_RESULT(found MESA at $ac_find_libraries)
-      else
-        AC_MSG_ERROR(no)
-      fi
-    fi
-  else
-    AC_MSG_ERROR(no)
-  fi
+HELP=NONE
+if test "$wxUSE_HELP" = 1 ; then
+  HELP="HELP"
+  AC_DEFINE_UNQUOTED(wxUSE_HELP,$wxUSE_HELP)
 fi
+AC_SUBST(HELP)
 
 dnl ----------------------------------------------------------------
-dnl search for gdk_imlib
+dnl select  dynamic loader (used by iODBC to load drivers)
 dnl ----------------------------------------------------------------
-dnl 
-dnl GDK_IMLIB_INCLUDE=
-dnl GDK_IMLIB_LIBRARY=
-dnl GDK_IMLIB_LINK=
-dnl 
-    if test "$USE_GDK_IMLIB" = 1; then
-dnl   AC_MSG_CHECKING(for gdk_imlib includes)
-dnl   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,gdk_imlib.h)
-dnl   if test "$ac_find_includes" != "" ; then
-dnl     dnl GDK_IMLIB_INCLUDE="-I$ac_find_includes"
-dnl     AC_MSG_RESULT(found $ac_find_includes)
-dnl     AC_MSG_CHECKING(for gdk_imlib library)
-dnl     AC_PATH_FIND_LIBRARIES($SEARCH_LIB,gdk_imlib)
-dnl     if test "$ac_find_libraries" != "" ; then
-dnl       AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
-dnl       AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
-dnl       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
-dnl       CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
-dnl       GDK_IMLIB_LIBRARY="$ac_path_to_link"
-dnl       GDK_IMLIB_INCLUDE="$ac_path_to_include"
-dnl       GDK_IMLIB_LINK="-lgdk_imlib"
-dnl       AC_MSG_RESULT(found gdk_imlib at $ac_find_libraries)
-dnl     else
-dnl       AC_MSG_ERROR(no)
-dnl     fi
-dnl   else
-dnl     AC_MSG_ERROR(no)
-dnl   fi
-      AC_DEFINE_UNQUOTED(USE_GDK_IMLIB,$USE_GDK_IMLIB)
-    fi
-dnl AC_SUBST(GDK_IMLIB_INCLUDE)
-dnl AC_SUBST(GDK_IMLIB_LIBRARY)
-dnl AC_SUBST(GDK_IMLIB_LINK)
 
-dnl ----------------------------------------------------------------
-dnl search for zlib
-dnl ----------------------------------------------------------------
-dnl
-dnl ZLIB_INCLUDE=
-dnl ZLIB_LINK=
-dnl 
-    if test "$USE_ZLIB" = 1; then
-dnl   AC_MSG_CHECKING(for zlib includes)
-dnl   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,zlib.h)
-dnl   if test "$ac_find_includes" != "" ; then
-dnl     AC_MSG_RESULT(found $ac_find_includes)
-dnl     AC_MSG_CHECKING(for zlib library)
-dnl     AC_PATH_FIND_LIBRARIES($SEARCH_LIB,z)
-dnl     if test "$ac_find_libraries" != "" ; then
-dnl       AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
-dnl       AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
-dnl       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
-dnl       CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
-dnl       ZLIB_INCLUDE="$ac_path_to_include"
-dnl       ZLIB_LINK="-lz"
-dnl       AC_MSG_RESULT(found zlib at $ac_find_libraries)
-dnl     else
-dnl       AC_MSG_ERROR(no)
-dnl     fi
-dnl   else
-dnl     AC_MSG_ERROR(no)
-dnl   fi
-      AC_DEFINE_UNQUOTED(USE_ZLIB,$USE_ZLIB)
-    fi
-dnl AC_SUBST(ZLIB_INCLUDE)
-dnl AC_SUBST(ZLIB_LIBRARY)
-dnl AC_SUBST(ZLIB_LINK)
+AC_CHECK_LIB(dl,main,[DL_LIBRARY=-ldl],[DL_LIBRARY=])
+AC_SUBST(DL_LIBRARY)
 
 dnl ----------------------------------------------------------------
-dnl search for libpng
+dnl thread support
 dnl ----------------------------------------------------------------
-dnl 
-dnl LIBPNG_INCLUDE=
-dnl LIBPNG_LIBRARY=
-dnl LIBPNG_LINK=
-dnl 
-    if test "$USE_LIBPNG" = 1; then
-dnl   AC_MSG_CHECKING(for libpng includes)
-dnl   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,png.h)
-dnl   if test "$ac_find_includes" != "" ; then
-dnl     AC_MSG_RESULT(found $ac_find_includes)
-dnl     AC_MSG_CHECKING(for libpng library)
-dnl     AC_PATH_FIND_LIBRARIES($SEARCH_LIB,png)
-dnl     if test "$ac_find_libraries" != "" ; then
-dnl       AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
-dnl       AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
-dnl       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
-dnl       CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
-dnl       LIBPNG_LIBRARY="$ac_path_to_link"
-dnl       LIBPNG_INCLUDE="$ac_path_to_include"
-dnl       LIBPNG_LINK="-lpng"
-dnl       AC_MSG_RESULT(found libpng at $ac_find_libraries)
-dnl     else
-dnl       AC_MSG_RESULT(no)
-dnl     fi
-dnl   else
-dnl     AC_MSG_ERROR(no)
-dnl   fi
-      AC_DEFINE_UNQUOTED(USE_LIBPNG,$USE_LIBPNG) 
+
+THREADS_LINK=""
+UNIX_THREAD=""
+
+if test "$wxUSE_THREADS" = "1"; then
+
+     dnl For glibc 2 users who have the old libc 5 too
+
+     AC_CHECK_LIB(pthread-0.7, pthread_create, [
+       UNIX_THREAD="gtk/threadpsx.cpp"
+       THREADS_LINK="-lpthread-0.7"
+     ],[
+       AC_CHECK_HEADER(sys/prctl.h, [
+          UNIX_THREAD="gtk/threadsgi.cpp"
+     ])
+
+     dnl pthread_create is always available in pthread but it seems not to be
+     dnl the case for pthread_setcanceltype.
+
+     AC_CHECK_LIB(pthread, pthread_setcanceltype, [
+       UNIX_THREAD="gtk/threadpsx.cpp"
+       THREADS_LINK="-lpthread"
+     ])
+    ])
+
+    if test "$THREADS_LINK" != ""; then
+      AC_DEFINE(wxUSE_THREADS)
     fi
-dnl AC_SUBST(LIBPNG_INCLUDE)
-dnl AC_SUBST(LIBPNG_LIBRARY)
-dnl AC_SUBST(LIBPNG_LINK)
 
-dnl ----------------------------------------------------------------
-dnl search for Python
-dnl ----------------------------------------------------------------
+    dnl -lposix4 seems to be required on Solaris
 
-dnl ----------------------------------------------------------------
-dnl search for ODBC
-dnl ----------------------------------------------------------------
+    AC_CHECK_LIB(posix4, printf, [
+      THREADS_LINK="$THREADS_LINK -lposix4"
+    ])
+    
+fi
 
-dnl ----------------------------------------------------------------
-dnl left-over
-dnl ----------------------------------------------------------------
+if test "$wxUSE_MOTIF" = "1"; then
+  UNIX_THREAD="motif/thread.cpp"
+fi
 
-USE_GLX=$USE_OPENGL
-if test "$USE_OPENGL" != 1; then
-  OPENGL_LIBRARIES=
-  OPENGL_INCLUDE=
-  OPENGL_LINK=
-  GLCANVAS=NONE
+if test -z "$UNIX_THREAD"; then
+  wxUSE_THREADS=0
 fi
 
-AC_DEFINE_UNQUOTED(USE_GLX,$USE_GLX)
-AC_SUBST(OPENGL_INCLUDE)
-AC_SUBST(OPENGL_LIBRARY)
-AC_SUBST(OPENGL_LINK)
-AC_SUBST(GLCANVAS)
+AC_SUBST(UNIX_THREAD)
+AC_SUBST(THREADS_LINK)
+
+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 ------------------------------------------------------------------------
 dnl compiler options for shared libs
@@ -1334,7 +1306,7 @@ CREATE_SHARED=
 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"
@@ -1358,7 +1330,7 @@ case "${canonical}" in
   ;;
 
   *-*-solaris2* ) 
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       PICFLAGS="-KPIC"
     else
       PICFLAGS="-fPIC"
@@ -1368,7 +1340,7 @@ case "${canonical}" in
   ;;
 
   *-*-sunos4* ) 
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       PICFLAGS="-PIC"
     else
       PICFLAGS="-fPIC"
@@ -1390,7 +1362,7 @@ case "${canonical}" in
   ;;
 
   *-*-dgux5* ) 
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       PICFLAGS="-K PIC"
     else
       PICFLAGS="-fPIC"
@@ -1400,7 +1372,7 @@ case "${canonical}" in
   ;;
 
   *-*-sysv5* ) 
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       PICFLAGS="-K PIC"
     else
       PICFLAGS="-fPIC"
@@ -1410,7 +1382,7 @@ case "${canonical}" in
   ;;
 
   *-*-aix* ) 
-    if test "${CC}" != "gcc" ; then
+    if test "$GCC" != "yes" ; then
       PICFLAGS="-bM\:SRE"
     else
       PICFLAGS="-fPIC"
@@ -1425,14 +1397,18 @@ case "${canonical}" in
 esac
 
 if test "x$GCC" = xyes; then
-  CFLAGS="${CFLAGS} -Wall"
+  CFLAGS="${CFLAGS} -Wall -Wno-unused -Wno-uninitialized -D_REENTRANT -DLEX_SCANNER"
 fi
 
 if test "x$GXX" = xyes; then
-  CXXFLAGS="${CXXFLAGS} -Wall"
+  if test "$wxUSE_MOTIF" = 1; then
+    CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused -D_REENTRANT"
+  else
+    CXXFLAGS="${CXXFLAGS} -Wall -D_REENTRANT"
+  fi
 fi
 
-if test "$USE_SHARED" != 1; then
+if test "$wxUSE_SHARED" != 1; then
     CREATE_SHARED=
     PICFLAGS=
 fi
@@ -1448,6 +1424,7 @@ dnl ------------------------------------------------------------------------
 dnl add OS to list of configured
 echo $OS >> system.list
 
-AC_CONFIG_HEADER(include/wx/gtk/setup.h:src/gtk/setup/setup.hin)
-AC_OUTPUT(src/gtk/setup/substit,src/gtk/setup/general/createall)
+AC_CONFIG_HEADER(./include/wx/gtk/setup.h:./setup/setup.hin)
+AC_OUTPUT(./setup/substit ./wx-config:./wx-config.in,./setup/general/createall)
+
 AC_OVERRIDES_DONE