]> git.saurik.com Git - wxWidgets.git/blobdiff - configure.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removed some bugs
[wxWidgets.git] / configure.in
diff --git a/configure.in b/configure.in
index 0d44fab9c32bea0f4595d87dc653271672c95357..5cb887560ba4eadc14cdaa9ca44b4603b728f3f7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl ////////////////////////////////////////////////////////////////////////
 dnl
 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 and Martin Sperl.
 dnl
 dnl This script is under the wxWindows licence.
@@ -14,9 +14,9 @@ AC_DEFUN(AM_PATH_GTK,
 [dnl 
 dnl Get the cflags and libraries from the gtk-config script
 dnl
 [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="")
             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
             gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
 
   if test x$gtk_config_exec_prefix != x ; then
@@ -263,12 +263,16 @@ SEARCH_INCLUDE="\
                               \
     /usr/include              \
     /usr/local/include        \
                               \
     /usr/include              \
     /usr/local/include        \
-    /usr/local/include/gtk    \
     /usr/unsupported/include  \
     /usr/athena/include       \
     /usr/local/x11r5/include  \
     /usr/lpp/Xamples/include  \
                               \
     /usr/unsupported/include  \
     /usr/athena/include       \
     /usr/local/x11r5/include  \
     /usr/lpp/Xamples/include  \
                               \
+    /usr/local/include/gtk    \
+    /usr/X11R6/include/Xm     \
+    /usr/X11/include/Xm       \
+    /usr/include/qt           \
+                              \
     /usr/openwin/include      \
     /usr/openwin/share/include \
     "
     /usr/openwin/include      \
     /usr/openwin/share/include \
     "
@@ -417,6 +421,13 @@ AC_CHECK_HEADER(sys/time.h)
 dnl   defines HAVE_SYS_TIME_H
 AC_CHECK_HEADER(unistd.h)
 dnl   defines HAVE_UNISTD_H
 dnl   defines HAVE_SYS_TIME_H
 AC_CHECK_HEADER(unistd.h)
 dnl   defines HAVE_UNISTD_H
+dnl As it needs Linux 2.1.x for the moment: check whether the file exists (GL).
+AC_CHECK_HEADER(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 ###################
 dnl # checks typedefs #
 
 dnl ###################
 dnl # checks typedefs #
@@ -489,6 +500,7 @@ dnl ##########################
 dnl # checks system services #
 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
 AC_SYS_LONG_FILE_NAMES
 dnl   defines HAVE_LONG_FILENAMES if filenames longer then
 dnl                               14 chars are supported
@@ -537,11 +549,8 @@ dnl ------------------------------------------------------------------------
 dnl system settings
 dnl ------------------------------------------------------------------------
 
 dnl system settings
 dnl ------------------------------------------------------------------------
 
-USE_GTK=1
 USE_UNIX=1
 
 USE_UNIX=1
 
-TOOLKIT=GTK
-TOOLKIT_DEF=__GTK__
 
 USE_LINUX=
 USE_SGI=
 
 USE_LINUX=
 USE_SGI=
@@ -633,56 +642,85 @@ dnl ------------------------------------------------------------------------
 
 AC_OVERRIDES_PREPARE
 
 
 AC_OVERRIDES_PREPARE
 
-DEFAULT_USE_SHARED=0
+DEFAULT_USE_GTK=1
+DEFAULT_USE_QT=0
+DEFAULT_USE_MOTIF=0
+
+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_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_ZLIB=1
 DEFAULT_USE_GDK_IMLIB=1
 DEFAULT_USE_LIBPNG=1
+DEFAULT_USE_ODBC=1
 
 
-DEFAULT_USE_STORABLE_CLASSES=1
-DEFAULT_USE_AUTOTRANS=1
-DEFAULT_USE_AFM_FOR_POSTSCRIPT=1
-DEFAULT_WX_NORMALIZED_PS_FONTS=1
-
-DEFAULT_USE_IOSTREAMH=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_THREADS=0
-DEFAULT_USE_THREADS_SGI=0
-DEFAULT_USE_THREADS_POSIX=0
-DEFAULT_USE_OPENGL=0
+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_WX_NORMALIZED_PS_FONTS=1
 DEFAULT_USE_POSTSCRIPT=1
 DEFAULT_USE_POSTSCRIPT=1
+
 DEFAULT_USE_IPC=1
 DEFAULT_USE_RESOURCES=1
 DEFAULT_USE_IPC=1
 DEFAULT_USE_RESOURCES=1
-DEFAULT_USE_TIMEDATE=1
-DEFAULT_USE_FRACTION=1
 DEFAULT_USE_CONSTRAINTS=1
 DEFAULT_USE_CONSTRAINTS=1
-DEFAULT_USE_TOOLBAR=1
-DEFAULT_USE_GAUGE=1
-DEFAULT_USE_SCROLLBAR=1
+DEFAULT_USE_CLIPBOARD=0
+DEFAULT_USE_DND=1
+
+DEFAULT_USE_MDI_ARCHITECTURE=1
 DEFAULT_USE_DOC_VIEW_ARCHITECTURE=1
 DEFAULT_USE_PRINTING_ARCHITECTURE=1
 
 DEFAULT_USE_DOC_VIEW_ARCHITECTURE=1
 DEFAULT_USE_PRINTING_ARCHITECTURE=1
 
+DEFAULT_USE_PROLOGIO=1
+DEFAULT_USE_WX_RESOURCES=1
+DEFAULT_USE_RPC=0
+
+DEFAULT_USE_OPENGL=0
 DEFAULT_USE_METAFILE=0
 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_WXGRAPH=0
 DEFAULT_USE_WXTREE=0
-DEFAULT_USE_ENHANCED_DIALOG=0
+DEFAULT_USE_HELP=0
 
 
-DEFAULT_USE_FORM=0
-DEFAULT_USE_PROLOGIO=0
-DEFAULT_USE_RPC=0
-DEFAULT_USE_WX_RESOURCES=1
+dnl ----------------------------------------------------------------
+dnl toolkit options
+dnl ----------------------------------------------------------------
+
+AC_OVERRIDES(gtk,gtk,
+**--with-gtk              use GTK,
+USE_GTK)
+
+AC_OVERRIDES(qt,qt,
+**--with-qt               use Qt,
+USE_QT)
+
+AC_OVERRIDES(motif,motif,
+**--with-motif            use Motif/Lesstif,
+USE_MOTIF)
 
 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
-dnl user options
+dnl compile options
 dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(shared,shared,
 dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(shared,shared,
@@ -690,60 +728,132 @@ AC_OVERRIDES(shared,shared,
 USE_SHARED)
 
 AC_OVERRIDES(optimise,optimise,
 USE_SHARED)
 
 AC_OVERRIDES(optimise,optimise,
-**--without-optimise      create unoptimised code,
+**--with-optimise         create optimised code,
 USE_OPTIMISE)
 
 AC_OVERRIDES(debug_flag,debug_flag,
 USE_OPTIMISE)
 
 AC_OVERRIDES(debug_flag,debug_flag,
-**--with-debug_flag       create code with DEBUG define set to 1,
+**--with-debug_flag       create code with WXDEBUG define set to 1,
 USE_DEBUG_FLAG)
 
 AC_OVERRIDES(debug_info,debug_info,
 USE_DEBUG_FLAG)
 
 AC_OVERRIDES(debug_info,debug_info,
-**--with-debug_info       create code with debuging information included,
+**--with-debug_info       create code with debuging information,
 USE_DEBUG_INFO)
 
 AC_OVERRIDES(mem_tracing,mem_tracing,
 **--with-mem_traing       create code with memory tracing,
 USE_MEM_TRACING)
 
 USE_DEBUG_INFO)
 
 AC_OVERRIDES(mem_tracing,mem_tracing,
 **--with-mem_traing       create code with memory tracing,
 USE_MEM_TRACING)
 
+AC_OVERRIDES(dmalloc,dmalloc,
+**--with-dmalloc          use dmalloc memory debug library (www.letters.com/dmalloc/),
+USE_DMALLOC)
+
 AC_OVERRIDES(profile,profile,
 AC_OVERRIDES(profile,profile,
-**--with-profile          create code with profiling information included,
+**--with-profile          create code with profiling information,
 USE_PROFILE)
 
 USE_PROFILE)
 
+AC_OVERRIDES(apple_ieee, apple_ieee,
+**--with_apple_ieee      use the Apple IEEE codec,
+USE_APPLE_IEEE)
+
 dnl ----------------------------------------------------------------
 dnl ----------------------------------------------------------------
-dnl user options for libraries (no choice yet)
+dnl user options for libraries
 dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(zlib,zlib,
 dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(zlib,zlib,
-**--with-zlib          use zlib (LZW comression),
+**--with-zlib             use zlib for LZW comression,
 USE_ZLIB)
 
 AC_OVERRIDES(gdk_imlib,gdk_imlib,
 USE_ZLIB)
 
 AC_OVERRIDES(gdk_imlib,gdk_imlib,
-**--with-gdk_imlib     use Raster's gdk_imlib (Image library),
+**--with-gdk_imlib        use Raster's gdk_imlib (Image library),
 USE_GDK_IMLIB)
 
 AC_OVERRIDES(libpng,libpng,
 USE_GDK_IMLIB)
 
 AC_OVERRIDES(libpng,libpng,
-**--with-libpng        use libpng (PNG image format),
+**--with-libpng           use libpng (PNG image format),
 USE_LIBPNG)
 
 USE_LIBPNG)
 
-AC_OVERRIDES(threads,threads,
-**--with-threads       use threads,
-USE_THREADS)
+AC_OVERRIDES(odbc,odbc,
+**--with-odbc             use iODBC and wxODBC classes,
+USE_ODBC)
 
 AC_OVERRIDES(opengl,opengl,
 
 AC_OVERRIDES(opengl,opengl,
-**--with-opengl        use opengl (OpenGL or Mesa),
+**--with-opengl           use OpenGL (or Mesa),
 USE_OPENGL)
 
 dnl ----------------------------------------------------------------
 USE_OPENGL)
 
 dnl ----------------------------------------------------------------
-dnl user options for code features (no choice yet)
+dnl user options for GUI control classes
+dnl ----------------------------------------------------------------
+
+AC_OVERRIDES(gauge,gauge,
+**--with-gauge            use wxGauge class,
+USE_GAUGE)
+
+AC_OVERRIDES(scrollbar,scrollbar,
+**--with-scrollbar        use wxScrollbar class,
+USE_SCROLLBAR)
+
+AC_OVERRIDES(listctrl,listctrl,
+**--with-listctrl         use wxListCtrl class,
+USE_LISTCTRL)
+
+AC_OVERRIDES(treectrl,treectrl,
+**--with-treectrl         use wxTreeCtrl class,
+USE_TREECTRL)
+
+AC_OVERRIDES(grid,grid,
+**--with-grid             use wxGrid class,
+USE_GRID)
+
+AC_OVERRIDES(tab_dialog,tab_dialog,
+**--with-tab_dialog       use wxTabDia class,
+USE_TAB_DIALOG)
+
+AC_OVERRIDES(notebook,notebook,
+**--with-notebook         use wxNotebook class,
+USE_NOTEBOOK)
+
+dnl ----------------------------------------------------------------
+dnl user options for non-GUI classes
 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
 
-AC_OVERRIDES(storable,storable,
-**--with-storable          use storable classes,
-USE_STORABLE_CLASSES)
+AC_OVERRIDES(timedate, timedate,
+**--with-timedate         use wxTime and wxDate classes,
+USE_TIMEDATE)
+
+AC_OVERRIDES(fraction,fraction,
+**--with-fraction         use wxFraction class,
+USE_FRACTION)
+
+AC_OVERRIDES(log,log,
+**--with-log              use logging system,
+USE_LOG)
+
+AC_OVERRIDES(intl,intl,
+**--with-intl             use internationalization system,
+USE_INTL)
+
+AC_OVERRIDES(config,config,
+**--with-config           use wxConfig class,
+USE_CONFIG)
+
+AC_OVERRIDES(streams,streams,
+**--with-streams          use wxStream etc classes,
+USE_STREAMS)
+
+AC_OVERRIDES(serial,serial,
+**--with-serial           use class serialization,
+USE_SERIAL)
 
 
-AC_OVERRIDES(autotrans,autotrans,
-**--with-autotrans         use gettext automatic translation,
-USE_AUTOTRANS)
+AC_OVERRIDES(file,file,
+**--with-file             use wxFile class,
+USE_FILE)
+
+AC_OVERRIDES(textfile,textfile,
+**--with-textfile         use wxTextFile class,
+USE_TEXTFILE)
+
+dnl ----------------------------------------------------------------
+dnl user options for PostScript
+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,
@@ -753,77 +863,57 @@ AC_OVERRIDES(normalized, normalized,
 **--with-PS-normalized    use normalized PS fonts,
 WX_NORMALIZED_PS_FONTS)
 
 **--with-PS-normalized    use normalized PS fonts,
 WX_NORMALIZED_PS_FONTS)
 
-AC_OVERRIDES(rpc,RPC,
-**--with-rpc              use RPC,
-USE_RPC)
+AC_OVERRIDES(postscript, postscript,
+**--with-postscript       use wxPostscriptDC device context,
+USE_POSTSCRIPT)
+
+dnl ----------------------------------------------------------------
+dnl user options for Prolog and Resources
+dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(wxresources,wxresources,
 
 AC_OVERRIDES(wxresources,wxresources,
-**--with-wxresources      use wxresources,
+**--with-wxresources      use wxWindows's resources,
 USE_WX_RESOURCES)
 
 AC_OVERRIDES(prologio,prologio,
 USE_WX_RESOURCES)
 
 AC_OVERRIDES(prologio,prologio,
-**--with-prologio         use prologio,
+**--with-prologio         use Prolog IO library,
 USE_PROLOGIO)
 
 USE_PROLOGIO)
 
-AC_OVERRIDES(postscript, postscript,
-**--with-postscript       use postscript-device-context,
-USE_POSTSCRIPT)
-
-AC_OVERRIDES(metafile, metafile,
-**--with-metafile         use metafile,
-USE_METAFILE)
-
-AC_OVERRIDES(form,form,
-**--with-form             use form,
-USE_FORM)
+AC_OVERRIDES(rpc,RPC,
+**--with-rpc              use Prolog's remote procedure calls,
+USE_RPC)
 
 
-AC_OVERRIDES(help,help,
-**--with-help             use help,
-USE_HELP)
+dnl ----------------------------------------------------------------
+dnl user options for misc stuff
+dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(ipc,IPC,
 
 AC_OVERRIDES(ipc,IPC,
-**--with-ipc              use ipc,
+**--with-ipc              use interprocess communication (wxSocket etc.),
 USE_IPC)
 
 USE_IPC)
 
-AC_OVERRIDES(enhanceddialog,enhanced dialog,
-**--with-enhanceddialog   use enhanced dialog,
-USE_ENHANCED_DIALOG)
-
 AC_OVERRIDES(resources,resources,
 AC_OVERRIDES(resources,resources,
-**--with-resources        use resources,
+**--with-resources        use X resources for saving information,
 USE_RESOURCES)
 
 AC_OVERRIDES(clipboard,clipboard,
 USE_RESOURCES)
 
 AC_OVERRIDES(clipboard,clipboard,
-**--with-clipboard        use clipboard,
+**--with-clipboard        use wxClipboard classes,
 USE_CLIPBOARD)
 
 USE_CLIPBOARD)
 
-AC_OVERRIDES(timedate, timedate,
-**--with-timedate         use timedate,
-USE_TIMEDATE)
-
-AC_OVERRIDES(fraction,fraction,
-**--with-fraction         use fraction,
-USE_FRACTION)
+AC_OVERRIDES(dnd,dnd,
+**--with-dnd              use Drag'n'Drop classes,
+USE_DND)
 
 AC_OVERRIDES(constraints,constrains,
 
 AC_OVERRIDES(constraints,constrains,
-**--with-constraints      use constraints,
+**--with-constraints      use layout-constraints system,
 USE_CONSTRAINTS)
 
 USE_CONSTRAINTS)
 
-AC_OVERRIDES(toolbar,toolbar,
-**--with-toolbar          use toolbar,
-USE_TOOLBAR)
-
-AC_OVERRIDES(gauge,gauge,
-**--with-gauge            use gauge,
-USE_GAUGE)
-
-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,
+USE_MDI_ARCHITECTURE)
 
 AC_OVERRIDES(docview,docview,
 **--with-docview          use document view architecture,
 
 AC_OVERRIDES(docview,docview,
 **--with-docview          use document view architecture,
@@ -833,86 +923,151 @@ AC_OVERRIDES(printarch,printarch,
 **--with-printarch        use printing architecture,
 USE_PRINTING_ARCHITECTURE)
 
 **--with-printarch        use printing architecture,
 USE_PRINTING_ARCHITECTURE)
 
-AC_OVERRIDES(typetree,typetree,
-**--with-typetree         use typetree,
-USE_TYPETREE)
-
-AC_OVERRIDES(wxgraph,wxgraph,
-**--with-wxgraph          use wxgraph,
-USE_WXGRAPH)
-
-AC_OVERRIDES(wxtree,wxtree,
-**--with-wxtree           use wxtree,
-USE_WXTREE)
-
+dnl ----------------------------------------------------------------
+dnl user options with no effect yet
+dnl ----------------------------------------------------------------
+dnl
+dnl AC_OVERRIDES(metafile, metafile,
+dnl **--with-metafile         use metafile (no effect),
+dnl USE_METAFILE)
+dnl
+dnl AC_OVERRIDES(help,help,
+dnl **--with-help             use help (no effect),
+dnl USE_HELP)
+dnl
+dnl AC_OVERRIDES(wxgraph,wxgraph,
+dnl **--with-wxgraph          use wxgraph (no effect),
+dnl USE_WXGRAPH)
+dnl
+dnl AC_OVERRIDES(wxtree,wxtree,
+dnl **--with-wxtree           use wxtree (no effect),
+dnl USE_WXTREE)
+dnl
 dnl AC_OVERRIDES(package,message,helpmessage,variable)
 dnl AC_OVERRIDES(package,message,helpmessage,variable)
-
+dnl
 dnl ----------------------------------------------------------------
 dnl ----------------------------------------------------------------
-dnl register changes for Makefiles (via substit) and setup.h
+dnl Unix, obviously
 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
 
-ZLIB=NONE
-if test "$USE_ZLIB" = 1 ; then
-  ZLIB="ZLIB"
+if test "$USE_UNIX" = 1 ; then
+  AC_DEFINE(__UNIX__)
 fi
 
 fi
 
-GDK_IMLIB=NONE
-if test "$USE_GDK_IMLIB" = 1 ; then
-  GDK_IMLIB="GDK_IMLIB"
-fi
+dnl ----------------------------------------------------------------
+dnl search for toolkit (widget sets)
+dnl ----------------------------------------------------------------
 
 
-LIBPNG=NONE
-if test "$USE_LIBPNG" = 1 ; then
-  LIBPNG="LIBPNG"
+TOOLKIT=
+TOOLKIT_DEF=
+
+GUI_TK_INCLUDE=
+GUI_TK_LIBRARY=
+GUI_TK_LINK=
+
+MAKEINCLUDE=
+
+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(__WXGTK__)
+  TOOLKIT=GTK
+  TOOLKIT_DEF=__WXGTK__
+  MAKEINCLUDE=../gtk.inc
 fi
 
 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 "$USE_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="-lXext -lX11 -lqt -lm"
+  AC_DEFINE(__WXQT__)
+  TOOLKIT=QT
+  TOOLKIT_DEF=__WXQT__
+  MAKEINCLUDE=../qt.inc
 fi
 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 "$USE_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 or 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_INCLUDE $ac_path_to_link"
+       CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
+       AC_MSG_RESULT(found at $ac_find_libraries)
+     else
+       AC_MSG_ERROR(no)
+     fi
+  else
+     AC_MSG_ERROR(no)
+  fi
+  GUI_TK_LINK="-lXext -lXt -lX11 -lXm -lm"
+  AC_DEFINE(__WXMOTIF__)
+  TOOLKIT=MOTIF
+  TOOLKIT_DEF=__WXMOTIF__
+  MAKEINCLUDE=../motif.inc
 fi
 
 fi
 
-AUTOTRANS=NONE
-if test "$USE_AUTOTRANS" = 1 ; then
-  AUTOTRANS="AUTOTRANS"
-  AC_DEFINE_UNQUOTED(USE_AUTOTRANS,$USE_AUTOTRANS)
+if test "$TOOLKIT" = ""; then
+  AC_MSG_ERROR(You must specify a toolkit: --with-gtk --with-qt --with-motif) 
 fi
 
 fi
 
-DEBUG=
+AC_SUBST(GUI_TK_INCLUDE)
+AC_SUBST(GUI_TK_LIBRARY)
+AC_SUBST(GUI_TK_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 "$USE_DEBUG_INFO" = 1 ; then
 if test "$USE_DEBUG_INFO" = 1 ; then
-  DEBUG="-g"
+  WXDEBUG="-g -O0"
 fi
 fi
-AC_SUBST(DEBUG)
+AC_SUBST(WXDEBUG)
 
 if test "$USE_DEBUG_FLAG" = 1 ; then
 
 if test "$USE_DEBUG_FLAG" = 1 ; then
-  AC_DEFINE_UNQUOTED(DEBUG,$USE_DEBUG_FLAG)
+  AC_DEFINE_UNQUOTED(WXDEBUG,$USE_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)
 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)
+  dnl AC_DEFINE_UNQUOTED(USE_GLOBAL_MEMORY_OPERATORS,$USE_MEM_TRACING)
+fi
+
+EXTRA_LINK=
+if test "$USE_DMALLOC" = 1 ; then
+  EXTRA_LINK="$EXTRA_LINK -ldmalloc"
 fi
 fi
+AC_SUBST(EXTRA_LINK)
 
 PROFILE=
 if test "$USE_PROFILE" = 1 ; then
 
 PROFILE=
 if test "$USE_PROFILE" = 1 ; then
@@ -938,159 +1093,192 @@ else
 fi
 AC_SUBST(OPTIMISE)
 
 fi
 AC_SUBST(OPTIMISE)
 
+APPLE_IEEE=NONE
+if test "$USE_APPLE_IEEE" = 1 ; then
+  APPLE_IEEE="APPLE_IEEE"
+  AC_DEFINE_UNQUOTED(USE_APPLE_IEEE,$USE_APPLE_IEEE)
+fi
+
 USE_IOSTREAMH=$DEFAULT_USE_IOSTREAMH
 AC_DEFINE_UNQUOTED(USE_IOSTREAMH,$USE_IOSTREAMH)
 
 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)
+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
 fi
-AC_SUBST(RPC)
 
 
-WXRESOURCES=NONE
-if test "$USE_WX_RESOURCES" = 1 ; then
-  WXRESOURCES="WXRESOURCES"
-  AC_DEFINE_UNQUOTED(USE_WX_RESOURCES,$USE_WX_RESOURCES)
+if test "$USE_GDK_IMLIB" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_GDK_IMLIB,$USE_GDK_IMLIB)
 fi
 fi
-AC_SUBST(WXRESOURCES)
 
 
-PROLOGIO=NONE
-PROLOGIOSRC=NONE
-if test "$USE_PROLOGIO" = 1 ; then
-  PROLOGIO="PROLOGIO"
-  PROLOGIOSRC="PROLOGIOSRC"
-  AC_DEFINE_UNQUOTED(USE_PROLOGIO)
+if test "$USE_LIBPNG" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_LIBPNG,$USE_LIBPNG) 
 fi
 fi
-AC_SUBST(PROLOGIO)
-AC_SUBST(PROLOGIOSRC)
 
 
-POSTSCRIPTDC=NONE
-if test "$USE_POSTSCRIPT" = 1 ; then
-  POSTSCRIPTDC="POSTSCRIPTDC"
-  AC_DEFINE_UNQUOTED(USE_POSTSCRIPT)
+if test "$USE_ODBC" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_ODBC,$USE_ODBC) 
 fi
 fi
-AC_SUBST(POSTSCRIPTDC)
 
 
-METAFILE=NONE
-if test "$USE_METAFILE" = 1 ; then
-  METAFILE="METAFILE"
-  AC_DEFINE_UNQUOTED(USE_METAFILE,$USE_METAFILE)
+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)
 fi
 fi
-AC_SUBST(METAFILE)
 
 
-FORM=NONE
-if test "$USE_FORM" = 1 ; then
-  FORM="FORM"
-  AC_DEFINE_UNQUOTED(USE_FORM,$USE_FORM)
+if test "$USE_SCROLLBAR" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_SCROLLBAR,$USE_SCROLLBAR)
 fi
 fi
-AC_SUBST(FORM)
 
 
-HELP=NONE
-if test "$USE_HELP" = 1 ; then
-  HELP="HELP"
-  AC_DEFINE_UNQUOTED(USE_HELP,$USE_HELP)
+if test "$USE_LISTCTRL" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_LISTCTRL,$USE_LISTCTRL)
 fi
 fi
-AC_SUBST(HELP)
 
 
-IPC=NONE
-if test "$USE_IPC" = 1 ; then
-  IPC="IPC"
-  AC_DEFINE_UNQUOTED(USE_IPC)
+if test "$USE_TREECTRL" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_TREECTRL,$USE_TREECTRL)
 fi
 fi
-AC_SUBST(IPC)
 
 
-ENHDIALOGBOX=NONE
-if test "$USE_ENHANCED_DIALOG" = 1 ; then
-  ENHDIALOGBOX="ENHDIALOGBOX"
-  AC_DEFINE_UNQUOTED(USE_ENHANCED_DIALOG,$USE_ENHANCED_DIALOG)
+if test "$USE_GRID" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_GRID,$USE_GRID)
 fi
 fi
-AC_SUBST(ENHDIALOGBOX)
 
 
-XRESOURCES=NONE
-if test "$USE_RESOURCES" = 1 ; then
-  XRESOURCES="XRESOURCES"
-  AC_DEFINE_UNQUOTED(USE_RESOURCES,$USE_RESOURCES)
+if test "$USE_TAB_DIALOG" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_TAB_DIALOG,$USE_TAB_DIALOG)
 fi
 fi
-AC_SUBST(XRESOURCES)
 
 
-CLIPBOARD=NONE
-if test "$USE_CLIPBOARD" = 1 ; then
-  CLIPBOARD="CLIPBOARD"
-  AC_DEFINE_UNQUOTED(USE_CLIPBOARD,$USE_CLIPBOARD)
+if test "$USE_NOTEBOOK" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_NOTEBOOK,$USE_NOTEBOOK)
 fi
 fi
-AC_SUBST(CLIPBOARD)
 
 
-CONSTRAINTS=NONE
-if test "$USE_CONSTRAINTS" = 1 ; then
-  CONSTRAINTS="CONSTRAINTS"
-  AC_DEFINE_UNQUOTED(USE_CONSTRAINTS,$USE_CONSTRAINTS)
+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)
 fi
 fi
-AC_SUBST(CONSTRAINTS)
 
 
-TIMEDATE=NONE
 if test "$USE_TIMEDATE" = 1 ; then
 if test "$USE_TIMEDATE" = 1 ; then
-  TIMEDATE="TIMEDATE"
   AC_DEFINE_UNQUOTED(USE_TIMEDATE,$USE_TIMEDATE)
 fi
   AC_DEFINE_UNQUOTED(USE_TIMEDATE,$USE_TIMEDATE)
 fi
-AC_SUBST(TIMEDATE)
 
 
-FRACTION=NONE
 if test "$USE_FRACTION" = 1 ; then
 if test "$USE_FRACTION" = 1 ; then
-  FRACTION="FRACTION"
   AC_DEFINE_UNQUOTED(USE_FRACTION,$USE_FRACTION)
 fi
   AC_DEFINE_UNQUOTED(USE_FRACTION,$USE_FRACTION)
 fi
-AC_SUBST(FRACTION)
 
 
-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 "$USE_LOG" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_LOG,$USE_LOG)
 fi
 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 "$USE_INTL" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_INTL,$USE_INTL)
 fi
 
 fi
 
-VIRLISTBOX=NONE
-if test "$USE_VLBOX" = 1 ; then
-  VIRTLISTBOX="VIRLISTBOX"
-  AC_DEFINE_UNQUOTED(USE_VIRLISTBOX,$USE_VIRLISTBOX)
+if test "$USE_STREAMS" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_STREAMS,$USE_STREAMS)
 fi
 fi
-AC_SUBST(VIRLISTBOX)
 
 
-SCROLLBAR=NONE
-if test "$USE_SCROLLBAR" = 1 ; then
-  SCROLLBAR="SCROLLBAR"
-  AC_DEFINE_UNQUOTED(USE_SCROLLBAR,$USE_SCROLLBAR)
+if test "$USE_SERIAL" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_SERIAL,$USE_SERIAL)
+fi
+
+if test "$USE_FILE" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_FILE,$USE_FILE)
+fi
+
+if test "$USE_TEXTFILE" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_TEXTFILE,$USE_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)
+fi
+
+if test "$USE_WX_RESOURCES" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_WX_RESOURCES,$USE_WX_RESOURCES)
+fi
+
+if test "$USE_PROLOGIO" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_PROLOGIO)
+fi
+
+dnl ----------------------------------------------------------------
+dnl Register PostScript options for makefiles and setup.h
+dnl ----------------------------------------------------------------
+
+if test "$USE_POSTSCRIPT" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_POSTSCRIPT)
+fi
+
+AC_DEFINE_UNQUOTED(USE_AFM_FOR_POSTSCRIPT,$USE_AFM_FOR_POSTSCRIPT)
+
+AC_DEFINE_UNQUOTED(WX_NORMALIZED_PS_FONTS,$WX_NORMALIZED_PS_FONTS)
+
+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)
 fi
 fi
-AC_SUBST(SCROLLBAR)
 
 
-DOCVIEW=NONE
 if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
 if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
-  DOCVIEW="DOCVIEW"
   AC_DEFINE_UNQUOTED(USE_DOC_VIEW_ARCHITECTURE,$USE_DOC_VIEW_ARCHITECTURE)
 fi
   AC_DEFINE_UNQUOTED(USE_DOC_VIEW_ARCHITECTURE,$USE_DOC_VIEW_ARCHITECTURE)
 fi
-AC_SUBST(DOCVIEW)
 
 
-PRINTPREVIEW=NONE
 if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
 if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
-  PRINTPREVIEW="PRINTPREVIEW"
   AC_DEFINE_UNQUOTED(USE_PRINTING_ARCHITECTURE,$USE_PRINTING_ARCHITECTURE)
 fi
   AC_DEFINE_UNQUOTED(USE_PRINTING_ARCHITECTURE,$USE_PRINTING_ARCHITECTURE)
 fi
-AC_SUBST(PRINTPREVIEW)
 
 
-TYPETREE=NONE
-if test "$USE_TYPETREE" = 1 ; then
-  TYPETREE="TYPETREE"
-  AC_DEFINE_UNQUOTED(USE_TYPETREE,$USE_TYPETREE)
+dnl ----------------------------------------------------------------
+dnl Register misc options for makefiles and setup.h
+dnl ----------------------------------------------------------------
+
+if test "$USE_IPC" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_IPC)
+fi
+
+if test "$USE_RESOURCES" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_RESOURCES,$USE_RESOURCES)
+fi
+
+if test "$USE_CLIPBOARD" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_CLIPBOARD,$USE_CLIPBOARD)
+fi
+
+if test "$USE_DND" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_DND,$USE_DND)
+fi
+
+if test "$USE_CONSTRAINTS" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_CONSTRAINTS,$USE_CONSTRAINTS)
+fi
+
+dnl ----------------------------------------------------------------
+dnl No effect
+dnl ----------------------------------------------------------------
+
+METAFILE=NONE
+if test "$USE_METAFILE" = 1 ; then
+  METAFILE="METAFILE"
+  AC_DEFINE_UNQUOTED(USE_METAFILE,$USE_METAFILE)
+fi
+AC_SUBST(METAFILE)
+
+HELP=NONE
+if test "$USE_HELP" = 1 ; then
+  HELP="HELP"
+  AC_DEFINE_UNQUOTED(USE_HELP,$USE_HELP)
 fi
 fi
-AC_SUBST(TYPETREE)
+AC_SUBST(HELP)
 
 WXGRAPH=NONE
 if test "$USE_WXGRAPH" = 1 ; then
 
 WXGRAPH=NONE
 if test "$USE_WXGRAPH" = 1 ; then
@@ -1111,39 +1299,64 @@ if test "$USE_OPENGL" = 1 ; then
   GLCANVAS="GLCANVAS"
 fi
 
   GLCANVAS="GLCANVAS"
 fi
 
-AC_DEFINE_UNQUOTED(USE_AFM_FOR_POSTSCRIPT,$USE_AFM_FOR_POSTSCRIPT)
-
-AC_DEFINE_UNQUOTED(WX_NORMALIZED_PS_FONTS,$WX_NORMALIZED_PS_FONTS)
-
 dnl ----------------------------------------------------------------
 dnl ----------------------------------------------------------------
-dnl Unix, obviously
+dnl select  dynamic loader (used by iODBC to load drivers)
 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
 
-if test "$USE_UNIX" = 1 ; then
-  AC_DEFINE(__UNIX__)
-fi
+DL_LIBRARY=-ldl
+
+AC_SUBST(DL_LIBRARY)
 
 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
-dnl search for GTK
+dnl thread support
 dnl ----------------------------------------------------------------
 
 dnl ----------------------------------------------------------------
 
-GUI_TK_INCLUDE=
-GUI_TK_LIBRARY=
-GUI_TK_LINK=
+USE_THREADS=1
+THREADS_LINK=""
+UNIX_THREAD=""
+
+AC_ARG_WITH(threads,
+[**--without-threads       Force disabling threads ],
+[USE_THREADS="$withval"])
+
+if test "$USE_THREADS" = "1"; then
+  UNIX_THREAD="gtk/threadno.cpp"
+
+  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"
+    ])
+  ])
+  AC_CHECK_LIB(pthreads, pthread_setcanceltype, [
+     UNIX_THREAD="gtk/threadpsx.cpp"
+     THREADS_LINK="-lpthreads"
+  ])
+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 -z "$UNIX_THREAD"; then
+  USE_THREADS=0
 fi
 fi
-AC_SUBST(GUI_TK_INCLUDE)
-AC_SUBST(GUI_TK_LIBRARY)
-AC_SUBST(GUI_TK_LINK)
 
 
-AC_SUBST(TOOLKIT)
-AC_SUBST(TOOLKIT_DEF)
+AC_SUBST(UNIX_THREAD)
+AC_SUBST(THREADS_LINK)
+AC_DEFINE(USE_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 USE_THREADS if thread support is activated. (GL)
 
 dnl ----------------------------------------------------------------
 dnl search for opengl
 
 dnl ----------------------------------------------------------------
 dnl search for opengl
@@ -1192,121 +1405,6 @@ if test "$USE_OPENGL" = 1; then
   fi
 fi
 
   fi
 fi
 
-dnl ----------------------------------------------------------------
-dnl search for gdk_imlib
-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)
-
-dnl ----------------------------------------------------------------
-dnl search for libpng
-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) 
-    fi
-dnl AC_SUBST(LIBPNG_INCLUDE)
-dnl AC_SUBST(LIBPNG_LIBRARY)
-dnl AC_SUBST(LIBPNG_LINK)
-
-dnl ----------------------------------------------------------------
-dnl search for Python
-dnl ----------------------------------------------------------------
-
-dnl ----------------------------------------------------------------
-dnl search for ODBC
-dnl ----------------------------------------------------------------
-
 dnl ----------------------------------------------------------------
 dnl left-over
 dnl ----------------------------------------------------------------
 dnl ----------------------------------------------------------------
 dnl left-over
 dnl ----------------------------------------------------------------
@@ -1448,6 +1546,7 @@ dnl ------------------------------------------------------------------------
 dnl add OS to list of configured
 echo $OS >> system.list
 
 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
 AC_OVERRIDES_DONE
wxWidgets (Impactor)