ugh. Nesting the (per class) plugin sentries can require them to

[wxWidgets.git] / configure.in
diff --git a/configure.in b/configure.in

index c054d21ba7dfae88b808cd66a1ec757c5f4f1b06..eb66fb25ad3a2a0f702fa870d43f681f069869b3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,8 +3,8 @@ AC_REVISION($Id$)dnl
  
  dnl ---------------------------------------------------------------------------
  dnl
  
  dnl ---------------------------------------------------------------------------
  dnl
-dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker and
-dnl Vadim Zeitlin
+dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker,
+dnl Vadim Zeitlin and Ron Lee
  dnl
  dnl This script is under the wxWindows licence.
  dnl
  dnl
  dnl This script is under the wxWindows licence.
  dnl
@@ -32,7 +32,7 @@ for ac_dir in $1;
  ])
  
  dnl ---------------------------------------------------------------------------
  ])
  
  dnl ---------------------------------------------------------------------------
-dnl call WX_PATH_FIND_LIBRARIES(search path, header name), sets ac_find_includes
+dnl call WX_PATH_FIND_LIBRARIES(search path, header name), sets ac_find_libraries
  dnl to the full name of the file that was found or leaves it empty if not found
  dnl ---------------------------------------------------------------------------
  AC_DEFUN(WX_PATH_FIND_LIBRARIES,
  dnl to the full name of the file that was found or leaves it empty if not found
  dnl ---------------------------------------------------------------------------
  AC_DEFUN(WX_PATH_FIND_LIBRARIES,
@@ -40,7 +40,7 @@ AC_DEFUN(WX_PATH_FIND_LIBRARIES,
  ac_find_libraries=
  for ac_dir in $1;
    do
  ac_find_libraries=
  for ac_dir in $1;
    do
-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib; do
        if test -f "$ac_dir/lib$2.$ac_extension"; then
          ac_find_libraries=$ac_dir
          break 2
        if test -f "$ac_dir/lib$2.$ac_extension"; then
          ac_find_libraries=$ac_dir
          break 2
@@ -60,7 +60,7 @@ AC_DEFUN(WX_INCLUDE_PATH_EXIST,
    if test $result = 0; then
      ac_path_to_include=""
    else
    if test $result = 0; then
      ac_path_to_include=""
    else
-    ac_path_to_include="-I$1"
+    ac_path_to_include=" -I$1"
    fi
  ])
  
    fi
  ])
  
@@ -74,7 +74,7 @@ AC_DEFUN(WX_LINK_PATH_EXIST,
    if test $result = 0; then
      ac_path_to_link=""
    else
    if test $result = 0; then
      ac_path_to_link=""
    else
-    ac_path_to_link="-L$1"
+    ac_path_to_link=" -L$1"
    fi
  ])
  
    fi
  ])
  
@@ -205,7 +205,7 @@ AC_DEFUN(WX_ARG_CACHE_FLUSH,
          ])
  
  dnl this macro checks for a three-valued command line --with argument:
          ])
  
  dnl this macro checks for a three-valued command line --with argument:
-dnl   possible arguments are 'yes', 'no', or 'sys'
+dnl   possible arguments are 'yes', 'no', 'sys', or 'builtin'
  dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
  AC_DEFUN(WX_ARG_SYS_WITH,
          [
  dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
  AC_DEFUN(WX_ARG_SYS_WITH,
          [
@@ -219,8 +219,10 @@ AC_DEFUN(WX_ARG_SYS_WITH,
                            ac_cv_use_$1='$3=no'
                          elif test "$withval" = sys; then
                            ac_cv_use_$1='$3=sys'
                            ac_cv_use_$1='$3=no'
                          elif test "$withval" = sys; then
                            ac_cv_use_$1='$3=sys'
+                        elif test "$withval" = builtin; then
+                          ac_cv_use_$1='$3=builtin'
                          else
                          else
-                          AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no or sys])
+                          AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
                          fi
                        ],
                        [
                          fi
                        ],
                        [
@@ -245,8 +247,10 @@ AC_DEFUN(WX_ARG_SYS_WITH,
              AC_MSG_RESULT(no)
            elif test "$$3" = sys; then
              AC_MSG_RESULT(system version)
              AC_MSG_RESULT(no)
            elif test "$$3" = sys; then
              AC_MSG_RESULT(system version)
+          elif test "$$3" = builtin; then
+            AC_MSG_RESULT(builtin version)
            else
            else
-            AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no or sys])
+            AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
            fi
          ])
  
            fi
          ])
  
@@ -361,12 +365,14 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
  
  WX_MAJOR_VERSION_NUMBER=2
  WX_MINOR_VERSION_NUMBER=3
  
  WX_MAJOR_VERSION_NUMBER=2
  WX_MINOR_VERSION_NUMBER=3
-WX_RELEASE_NUMBER=1
+WX_RELEASE_NUMBER=3
  
  WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
  WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
  
  
  WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
  WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
  
-WX_CURRENT=0
+WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
+
+WX_CURRENT=2
  WX_REVISION=0
  WX_AGE=0
  
  WX_REVISION=0
  WX_AGE=0
  
@@ -378,6 +384,7 @@ dnl ------------------------------------------------------------------------
  dnl assume Unix
  USE_UNIX=1
  USE_WIN32=0
  dnl assume Unix
  USE_UNIX=1
  USE_WIN32=0
+USE_DOS=0
  USE_BEOS=0
  USE_MAC=0
  
  USE_BEOS=0
  USE_MAC=0
  
@@ -393,13 +400,12 @@ USE_SUNOS=
  USE_ALPHA=
  USE_OSF=
  USE_BSD=
  USE_ALPHA=
  USE_OSF=
  USE_BSD=
+USE_DARWIN=
  USE_FREEBSD=
  USE_OPENBSD=
  USE_NETBSD=
  USE_VMS=
  USE_ULTRIX=
  USE_FREEBSD=
  USE_OPENBSD=
  USE_NETBSD=
  USE_VMS=
  USE_ULTRIX=
-USE_CYGWIN=
-USE_MINGW=
  USE_DATA_GENERAL=
  
  dnl on some platforms xxx_r() functions are declared inside "#ifdef
  USE_DATA_GENERAL=
  
  dnl on some platforms xxx_r() functions are declared inside "#ifdef
@@ -407,10 +413,13 @@ dnl _REENTRANT" and it's easier to just define this symbol for these platforms
  dnl than checking it during run-time
  NEEDS_D_REENTRANT_FOR_R_FUNCS=0
  
  dnl than checking it during run-time
  NEEDS_D_REENTRANT_FOR_R_FUNCS=0
  
+dnl the additional define needed for MT programs
+CPP_MT_FLAG=-D_REENTRANT
+
  dnl the list of all available toolkits
  dnl
  dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
  dnl the list of all available toolkits
  dnl
  dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
-ALL_TOOLKITS="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE"
+ALL_TOOLKITS="GTK MAC MGL MOTIF MSW PM WINE"
  
  dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
  dnl     which are either yes or no
  
  dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
  dnl     which are either yes or no
@@ -434,6 +443,7 @@ DEFAULT_DEFAULT_wxUSE_PM=0
  DEFAULT_DEFAULT_wxUSE_WINE=0
  
  PROGRAM_EXT=
  DEFAULT_DEFAULT_wxUSE_WINE=0
  
  PROGRAM_EXT=
+SO_SUFFIX=so
  
  dnl to support a new system, you need to add its canonical name (as determined
  dnl by config.sub or specified by the configure command line) to this "case"
  
  dnl to support a new system, you need to add its canonical name (as determined
  dnl by config.sub or specified by the configure command line) to this "case"
@@ -444,6 +454,7 @@ case "${host}" in
      USE_HPUX=1
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
      NEEDS_D_REENTRANT_FOR_R_FUNCS=1
      USE_HPUX=1
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
      NEEDS_D_REENTRANT_FOR_R_FUNCS=1
+    SO_SUFFIX=sl
      AC_DEFINE(__HPUX__)
    ;;
    *-*-linux* )
      AC_DEFINE(__HPUX__)
    ;;
    *-*-linux* )
@@ -485,6 +496,7 @@ case "${host}" in
    *-*-freebsd*)
      USE_BSD=1
      USE_FREEBSD=1
    *-*-freebsd*)
      USE_BSD=1
      USE_FREEBSD=1
+    CPP_MT_FLAG=-D_THREAD_SAFE
      AC_DEFINE(__FREEBSD__)
      AC_DEFINE(__BSD__)
      DEFAULT_DEFAULT_wxUSE_GTK=1
      AC_DEFINE(__FREEBSD__)
      AC_DEFINE(__BSD__)
      DEFAULT_DEFAULT_wxUSE_GTK=1
@@ -538,6 +550,7 @@ case "${host}" in
    *-*-cygwin* | *-*-mingw32* )
      USE_UNIX=0
      USE_WIN32=1
    *-*-cygwin* | *-*-mingw32* )
      USE_UNIX=0
      USE_WIN32=1
+    SO_SUFFIX=dll
      AC_DEFINE(__WIN32__)
      AC_DEFINE(__WIN95__)
      AC_DEFINE(__WINDOWS__)
      AC_DEFINE(__WIN32__)
      AC_DEFINE(__WIN95__)
      AC_DEFINE(__WINDOWS__)
@@ -545,21 +558,34 @@ case "${host}" in
      AC_DEFINE(STRICT)
      AC_DEFINE(WINVER, 0x0400)
      PROGRAM_EXT=".exe"
      AC_DEFINE(STRICT)
      AC_DEFINE(WINVER, 0x0400)
      PROGRAM_EXT=".exe"
+    RESCOMP=windres
      DEFAULT_DEFAULT_wxUSE_MSW=1
    ;;
  
      DEFAULT_DEFAULT_wxUSE_MSW=1
    ;;
  
-  *-pc-os2_emx )
+  *-pc-msdosdjgpp )
+    USE_UNIX=0
+    USE_DOS=1
+    AC_DEFINE(__DOS__)
+    PROGRAM_EXT=".exe"
+    DEFAULT_DEFAULT_wxUSE_MGL=1
+    DEFAULT_DEFAULT_wxUSE_SHARED=0
+  ;;
+
+  *-pc-os2_emx | *-pc-os2-emx )
      AC_DEFINE(__EMX__)
      PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_PM=1
    ;;
  
      AC_DEFINE(__EMX__)
      PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_PM=1
    ;;
  
-  *-*-darwin* )
+  powerpc-*-darwin* )
+    dnl PowerPC Darwin based distributions (including Mac OS X)
      USE_BSD=1
      USE_BSD=1
-    USE_MAC=1
-    AC_DEFINE(__MAC__)
+    USE_DARWIN=1
+    CPP_MT_FLAG=
+    SO_SUFFIX=dylib
      AC_DEFINE(__BSD__)
      AC_DEFINE(__BSD__)
-    AC_DEFINE(__UNIX__)
+    AC_DEFINE(__DARWIN__)
+    AC_DEFINE(__POWERPC__)
      DEFAULT_DEFAULT_wxUSE_MAC=1
    ;;
  
      DEFAULT_DEFAULT_wxUSE_MAC=1
    ;;
  
@@ -576,19 +602,28 @@ esac
  if test "$USE_UNIX" = 1 ; then
      wxUSE_UNIX=yes
      AC_DEFINE(__UNIX__)
  if test "$USE_UNIX" = 1 ; then
      wxUSE_UNIX=yes
      AC_DEFINE(__UNIX__)
-
-    SRC_SUBDIRS="$SRC_SUBDIRS unix"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
  fi
  
  fi
  
-if test "$USE_BEOS" = 1; then
-    SRC_SUBDIRS="$SRC_SUBDIRS be"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be"
-fi
-
-dnl Linux: test for libc5/glibc2: glibc2 has gettext() included
+dnl check for glibc version
  if test "$USE_LINUX" = 1; then
  if test "$USE_LINUX" = 1; then
-  AC_CHECK_LIB(c,gettext,AC_DEFINE(wxHAVE_GLIBC2))
+    AC_CACHE_CHECK([for glibc 2.1 or later], wx_lib_glibc21,
+        AC_TRY_COMPILE([#include <features.h>],
+            [
+                #if !__GLIBC_PREREQ(2, 1)
+                    #error not glibc2.1
+                #endif
+            ],
+            [
+                wx_lib_glibc21=yes
+            ],
+            [
+                wx_lib_glibc21=no
+            ]
+        )
+    )
+    if test "$wx_lib_glibc21" = "yes"; then
+        AC_DEFINE(wxHAVE_GLIBC2)
+    fi
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -612,12 +647,12 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_THREADS=yes
  
    DEFAULT_wxUSE_SHARED=yes
    DEFAULT_wxUSE_THREADS=yes
  
    DEFAULT_wxUSE_SHARED=yes
-  DEFAULT_wxUSE_BURNT_NAME=no
+  DEFAULT_wxUSE_SONAME=no
    DEFAULT_wxUSE_OPTIMISE=no
    DEFAULT_wxUSE_PROFILE=no
    DEFAULT_wxUSE_NO_DEPS=no
    DEFAULT_wxUSE_OPTIMISE=no
    DEFAULT_wxUSE_PROFILE=no
    DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_NO_RTTI=no
-  DEFAULT_wxUSE_NO_EXCEPTIONS=no
+  DEFAULT_wxUSE_NO_RTTI=yes
+  DEFAULT_wxUSE_NO_EXCEPTIONS=yes
    DEFAULT_wxUSE_PERMISSIVE=no
    DEFAULT_wxUSE_DEBUG_FLAG=yes
    DEFAULT_wxUSE_DEBUG_INFO=yes
    DEFAULT_wxUSE_PERMISSIVE=no
    DEFAULT_wxUSE_DEBUG_FLAG=yes
    DEFAULT_wxUSE_DEBUG_INFO=yes
@@ -625,15 +660,18 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_MEM_TRACING=no
    DEFAULT_wxUSE_DEBUG_CONTEXT=no
    DEFAULT_wxUSE_DMALLOC=no
    DEFAULT_wxUSE_MEM_TRACING=no
    DEFAULT_wxUSE_DEBUG_CONTEXT=no
    DEFAULT_wxUSE_DMALLOC=no
+  DEFAULT_wxUSE_PRECOMP=yes
    DEFAULT_wxUSE_APPLE_IEEE=no
  
    DEFAULT_wxUSE_LOG=yes
    DEFAULT_wxUSE_LOGWINDOW=no
    DEFAULT_wxUSE_LOGGUI=no
    DEFAULT_wxUSE_APPLE_IEEE=no
  
    DEFAULT_wxUSE_LOG=yes
    DEFAULT_wxUSE_LOGWINDOW=no
    DEFAULT_wxUSE_LOGGUI=no
+  DEFAULT_wxUSE_LOGDIALOG=no
  
    DEFAULT_wxUSE_GUI=yes
    DEFAULT_wxUSE_CONTROLS=no
  
  
    DEFAULT_wxUSE_GUI=yes
    DEFAULT_wxUSE_CONTROLS=no
  
+  DEFAULT_wxUSE_REGEX=no
    DEFAULT_wxUSE_ZLIB=no
    DEFAULT_wxUSE_LIBPNG=no
    DEFAULT_wxUSE_LIBJPEG=no
    DEFAULT_wxUSE_ZLIB=no
    DEFAULT_wxUSE_LIBPNG=no
    DEFAULT_wxUSE_LIBJPEG=no
@@ -652,6 +690,7 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_STOPWATCH=no
    DEFAULT_wxUSE_FILE=no
    DEFAULT_wxUSE_FFILE=no
    DEFAULT_wxUSE_STOPWATCH=no
    DEFAULT_wxUSE_FILE=no
    DEFAULT_wxUSE_FFILE=no
+  DEFAULT_wxUSE_TEXTBUFFER=no
    DEFAULT_wxUSE_TEXTFILE=no
    DEFAULT_wxUSE_WAVE=no
    DEFAULT_wxUSE_INTL=no
    DEFAULT_wxUSE_TEXTFILE=no
    DEFAULT_wxUSE_WAVE=no
    DEFAULT_wxUSE_INTL=no
@@ -660,9 +699,9 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_STREAMS=no
    DEFAULT_wxUSE_SOCKETS=no
    DEFAULT_wxUSE_DIALUP_MANAGER=no
    DEFAULT_wxUSE_STREAMS=no
    DEFAULT_wxUSE_SOCKETS=no
    DEFAULT_wxUSE_DIALUP_MANAGER=no
-  DEFAULT_wxUSE_SERIAL=no
    DEFAULT_wxUSE_JOYSTICK=no
    DEFAULT_wxUSE_DYNLIB_CLASS=no
    DEFAULT_wxUSE_JOYSTICK=no
    DEFAULT_wxUSE_DYNLIB_CLASS=no
+  DEFAULT_wxUSE_DYNAMIC_LOADER=no
    DEFAULT_wxUSE_LONGLONG=no
    DEFAULT_wxUSE_GEOMETRY=no
  
    DEFAULT_wxUSE_LONGLONG=no
    DEFAULT_wxUSE_GEOMETRY=no
  
@@ -674,6 +713,7 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_CLIPBOARD=no
    DEFAULT_wxUSE_TOOLTIPS=no
    DEFAULT_wxUSE_DRAG_AND_DROP=no
    DEFAULT_wxUSE_CLIPBOARD=no
    DEFAULT_wxUSE_TOOLTIPS=no
    DEFAULT_wxUSE_DRAG_AND_DROP=no
+  DEFAULT_wxUSE_DRAGIMAGE=no
    DEFAULT_wxUSE_SPLINES=no
  
    DEFAULT_wxUSE_MDI_ARCHITECTURE=no
    DEFAULT_wxUSE_SPLINES=no
  
    DEFAULT_wxUSE_MDI_ARCHITECTURE=no
@@ -685,21 +725,28 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_CONSTRAINTS=no
    DEFAULT_wxUSE_IPC=no
    DEFAULT_wxUSE_HELP=no
    DEFAULT_wxUSE_CONSTRAINTS=no
    DEFAULT_wxUSE_IPC=no
    DEFAULT_wxUSE_HELP=no
-  DEFAULT_wxUSE_WXTREE=no
+  DEFAULT_wxUSE_MS_HTML_HELP=no
+  DEFAULT_wxUSE_WXHTML_HELP=no
+  DEFAULT_wxUSE_TREELAYOUT=no
    DEFAULT_wxUSE_METAFILE=no
    DEFAULT_wxUSE_MIMETYPE=no
    DEFAULT_wxUSE_METAFILE=no
    DEFAULT_wxUSE_MIMETYPE=no
+  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
  
    DEFAULT_wxUSE_COMMONDLGS=no
    DEFAULT_wxUSE_CHOICEDLG=no
    DEFAULT_wxUSE_COLOURDLG=no
    DEFAULT_wxUSE_DIRDLG=no
    DEFAULT_wxUSE_FILEDLG=no
  
    DEFAULT_wxUSE_COMMONDLGS=no
    DEFAULT_wxUSE_CHOICEDLG=no
    DEFAULT_wxUSE_COLOURDLG=no
    DEFAULT_wxUSE_DIRDLG=no
    DEFAULT_wxUSE_FILEDLG=no
+  DEFAULT_wxUSE_FINDREPLDLG=no
    DEFAULT_wxUSE_FONTDLG=no
    DEFAULT_wxUSE_MSGDLG=no
    DEFAULT_wxUSE_NUMBERDLG=no
    DEFAULT_wxUSE_TEXTDLG=no
    DEFAULT_wxUSE_FONTDLG=no
    DEFAULT_wxUSE_MSGDLG=no
    DEFAULT_wxUSE_NUMBERDLG=no
    DEFAULT_wxUSE_TEXTDLG=no
+  DEFAULT_wxUSE_SPLASH=no
    DEFAULT_wxUSE_STARTUP_TIPS=no
    DEFAULT_wxUSE_PROGRESSDLG=no
    DEFAULT_wxUSE_STARTUP_TIPS=no
    DEFAULT_wxUSE_PROGRESSDLG=no
+  DEFAULT_wxUSE_WIZARDDLG=no
+
    DEFAULT_wxUSE_MENUS=no
    DEFAULT_wxUSE_MINIFRAME=no
    DEFAULT_wxUSE_HTML=no
    DEFAULT_wxUSE_MENUS=no
    DEFAULT_wxUSE_MINIFRAME=no
    DEFAULT_wxUSE_HTML=no
@@ -726,6 +773,7 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_LISTBOX=no
    DEFAULT_wxUSE_LISTCTRL=no
    DEFAULT_wxUSE_NOTEBOOK=no
    DEFAULT_wxUSE_LISTBOX=no
    DEFAULT_wxUSE_LISTCTRL=no
    DEFAULT_wxUSE_NOTEBOOK=no
+  DEFAULT_wxUSE_PROPSHEET=no
    DEFAULT_wxUSE_RADIOBOX=no
    DEFAULT_wxUSE_RADIOBTN=no
    DEFAULT_wxUSE_SASH=no
    DEFAULT_wxUSE_RADIOBOX=no
    DEFAULT_wxUSE_RADIOBTN=no
    DEFAULT_wxUSE_SASH=no
@@ -746,10 +794,13 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_TOOLBAR_NATIVE=no
    DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
    DEFAULT_wxUSE_TREECTRL=no
    DEFAULT_wxUSE_TOOLBAR_NATIVE=no
    DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
    DEFAULT_wxUSE_TREECTRL=no
+  DEFAULT_wxUSE_POPUPWIN=no
+  DEFAULT_wxUSE_TIPWINDOW=no
  
    DEFAULT_wxUSE_UNICODE=no
    DEFAULT_wxUSE_WCSRTOMBS=no
  
  
    DEFAULT_wxUSE_UNICODE=no
    DEFAULT_wxUSE_WCSRTOMBS=no
  
+  DEFAULT_wxUSE_PALETTE=no
    DEFAULT_wxUSE_IMAGE=no
    DEFAULT_wxUSE_GIF=no
    DEFAULT_wxUSE_PCX=no
    DEFAULT_wxUSE_IMAGE=no
    DEFAULT_wxUSE_GIF=no
    DEFAULT_wxUSE_PCX=no
@@ -761,12 +812,12 @@ else
    DEFAULT_wxUSE_THREADS=yes
  
    DEFAULT_wxUSE_SHARED=yes
    DEFAULT_wxUSE_THREADS=yes
  
    DEFAULT_wxUSE_SHARED=yes
-  DEFAULT_wxUSE_BURNT_NAME=no
+  DEFAULT_wxUSE_SONAME=no
    DEFAULT_wxUSE_OPTIMISE=yes
    DEFAULT_wxUSE_PROFILE=no
    DEFAULT_wxUSE_NO_DEPS=no
    DEFAULT_wxUSE_OPTIMISE=yes
    DEFAULT_wxUSE_PROFILE=no
    DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_NO_RTTI=no
-  DEFAULT_wxUSE_NO_EXCEPTIONS=no
+  DEFAULT_wxUSE_NO_RTTI=yes
+  DEFAULT_wxUSE_NO_EXCEPTIONS=yes
    DEFAULT_wxUSE_PERMISSIVE=no
    DEFAULT_wxUSE_DEBUG_FLAG=no
    DEFAULT_wxUSE_DEBUG_INFO=no
    DEFAULT_wxUSE_PERMISSIVE=no
    DEFAULT_wxUSE_DEBUG_FLAG=no
    DEFAULT_wxUSE_DEBUG_INFO=no
@@ -774,12 +825,17 @@ else
    DEFAULT_wxUSE_MEM_TRACING=no
    DEFAULT_wxUSE_DEBUG_CONTEXT=no
    DEFAULT_wxUSE_DMALLOC=no
    DEFAULT_wxUSE_MEM_TRACING=no
    DEFAULT_wxUSE_DEBUG_CONTEXT=no
    DEFAULT_wxUSE_DMALLOC=no
+  DEFAULT_wxUSE_PRECOMP=yes
    DEFAULT_wxUSE_APPLE_IEEE=yes
  
    DEFAULT_wxUSE_LOG=yes
    DEFAULT_wxUSE_APPLE_IEEE=yes
  
    DEFAULT_wxUSE_LOG=yes
+  DEFAULT_wxUSE_LOGWINDOW=yes
+  DEFAULT_wxUSE_LOGGUI=yes
+  DEFAULT_wxUSE_LOGDIALOG=yes
  
    DEFAULT_wxUSE_GUI=yes
  
  
    DEFAULT_wxUSE_GUI=yes
  
+  DEFAULT_wxUSE_REGEX=yes
    DEFAULT_wxUSE_ZLIB=yes
    DEFAULT_wxUSE_LIBPNG=yes
    DEFAULT_wxUSE_LIBJPEG=yes
    DEFAULT_wxUSE_ZLIB=yes
    DEFAULT_wxUSE_LIBPNG=yes
    DEFAULT_wxUSE_LIBJPEG=yes
@@ -798,6 +854,7 @@ else
    DEFAULT_wxUSE_STOPWATCH=yes
    DEFAULT_wxUSE_FILE=yes
    DEFAULT_wxUSE_FFILE=yes
    DEFAULT_wxUSE_STOPWATCH=yes
    DEFAULT_wxUSE_FILE=yes
    DEFAULT_wxUSE_FFILE=yes
+  DEFAULT_wxUSE_TEXTBUFFER=yes
    DEFAULT_wxUSE_TEXTFILE=yes
    DEFAULT_wxUSE_WAVE=no
    DEFAULT_wxUSE_INTL=yes
    DEFAULT_wxUSE_TEXTFILE=yes
    DEFAULT_wxUSE_WAVE=no
    DEFAULT_wxUSE_INTL=yes
@@ -806,9 +863,9 @@ else
    DEFAULT_wxUSE_STREAMS=yes
    DEFAULT_wxUSE_SOCKETS=yes
    DEFAULT_wxUSE_DIALUP_MANAGER=yes
    DEFAULT_wxUSE_STREAMS=yes
    DEFAULT_wxUSE_SOCKETS=yes
    DEFAULT_wxUSE_DIALUP_MANAGER=yes
-  DEFAULT_wxUSE_SERIAL=yes
    DEFAULT_wxUSE_JOYSTICK=yes
    DEFAULT_wxUSE_JOYSTICK=yes
-  DEFAULT_wxUSE_DYNLIB_CLASS=yes
+  DEFAULT_wxUSE_DYNLIB_CLASS=no
+  DEFAULT_wxUSE_DYNAMIC_LOADER=yes
    DEFAULT_wxUSE_LONGLONG=yes
    DEFAULT_wxUSE_GEOMETRY=yes
  
    DEFAULT_wxUSE_LONGLONG=yes
    DEFAULT_wxUSE_GEOMETRY=yes
  
@@ -820,6 +877,7 @@ else
    DEFAULT_wxUSE_CLIPBOARD=yes
    DEFAULT_wxUSE_TOOLTIPS=yes
    DEFAULT_wxUSE_DRAG_AND_DROP=yes
    DEFAULT_wxUSE_CLIPBOARD=yes
    DEFAULT_wxUSE_TOOLTIPS=yes
    DEFAULT_wxUSE_DRAG_AND_DROP=yes
+  DEFAULT_wxUSE_DRAGIMAGE=yes
    DEFAULT_wxUSE_SPLINES=yes
  
    DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
    DEFAULT_wxUSE_SPLINES=yes
  
    DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
@@ -831,21 +889,28 @@ else
    DEFAULT_wxUSE_CONSTRAINTS=yes
    DEFAULT_wxUSE_IPC=yes
    DEFAULT_wxUSE_HELP=yes
    DEFAULT_wxUSE_CONSTRAINTS=yes
    DEFAULT_wxUSE_IPC=yes
    DEFAULT_wxUSE_HELP=yes
-  DEFAULT_wxUSE_WXTREE=yes
+  DEFAULT_wxUSE_MS_HTML_HELP=yes
+  DEFAULT_wxUSE_WXHTML_HELP=yes
+  DEFAULT_wxUSE_TREELAYOUT=yes
    DEFAULT_wxUSE_METAFILE=yes
    DEFAULT_wxUSE_MIMETYPE=yes
    DEFAULT_wxUSE_METAFILE=yes
    DEFAULT_wxUSE_MIMETYPE=yes
+  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
  
    DEFAULT_wxUSE_COMMONDLGS=yes
    DEFAULT_wxUSE_CHOICEDLG=yes
    DEFAULT_wxUSE_COLOURDLG=yes
    DEFAULT_wxUSE_DIRDLG=yes
    DEFAULT_wxUSE_FILEDLG=yes
  
    DEFAULT_wxUSE_COMMONDLGS=yes
    DEFAULT_wxUSE_CHOICEDLG=yes
    DEFAULT_wxUSE_COLOURDLG=yes
    DEFAULT_wxUSE_DIRDLG=yes
    DEFAULT_wxUSE_FILEDLG=yes
+  DEFAULT_wxUSE_FINDREPLDLG=yes
    DEFAULT_wxUSE_FONTDLG=yes
    DEFAULT_wxUSE_MSGDLG=yes
    DEFAULT_wxUSE_NUMBERDLG=yes
    DEFAULT_wxUSE_TEXTDLG=yes
    DEFAULT_wxUSE_FONTDLG=yes
    DEFAULT_wxUSE_MSGDLG=yes
    DEFAULT_wxUSE_NUMBERDLG=yes
    DEFAULT_wxUSE_TEXTDLG=yes
+  DEFAULT_wxUSE_SPLASH=yes
    DEFAULT_wxUSE_STARTUP_TIPS=yes
    DEFAULT_wxUSE_PROGRESSDLG=yes
    DEFAULT_wxUSE_STARTUP_TIPS=yes
    DEFAULT_wxUSE_PROGRESSDLG=yes
+  DEFAULT_wxUSE_WIZARDDLG=yes
+
    DEFAULT_wxUSE_MENUS=yes
    DEFAULT_wxUSE_MINIFRAME=yes
    DEFAULT_wxUSE_HTML=yes
    DEFAULT_wxUSE_MENUS=yes
    DEFAULT_wxUSE_MINIFRAME=yes
    DEFAULT_wxUSE_HTML=yes
@@ -872,6 +937,7 @@ else
    DEFAULT_wxUSE_LISTBOX=yes
    DEFAULT_wxUSE_LISTCTRL=yes
    DEFAULT_wxUSE_NOTEBOOK=yes
    DEFAULT_wxUSE_LISTBOX=yes
    DEFAULT_wxUSE_LISTCTRL=yes
    DEFAULT_wxUSE_NOTEBOOK=yes
+  DEFAULT_wxUSE_PROPSHEET=yes
    DEFAULT_wxUSE_RADIOBOX=yes
    DEFAULT_wxUSE_RADIOBTN=yes
    DEFAULT_wxUSE_SASH=yes
    DEFAULT_wxUSE_RADIOBOX=yes
    DEFAULT_wxUSE_RADIOBTN=yes
    DEFAULT_wxUSE_SASH=yes
@@ -892,10 +958,13 @@ else
    DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
    DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
    DEFAULT_wxUSE_TREECTRL=yes
    DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
    DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
    DEFAULT_wxUSE_TREECTRL=yes
+  DEFAULT_wxUSE_POPUPWIN=yes
+  DEFAULT_wxUSE_TIPWINDOW=yes
  
    DEFAULT_wxUSE_UNICODE=no
    DEFAULT_wxUSE_WCSRTOMBS=no
  
  
    DEFAULT_wxUSE_UNICODE=no
    DEFAULT_wxUSE_WCSRTOMBS=no
  
+  DEFAULT_wxUSE_PALETTE=yes
    DEFAULT_wxUSE_IMAGE=yes
    DEFAULT_wxUSE_GIF=yes
    DEFAULT_wxUSE_PCX=yes
    DEFAULT_wxUSE_IMAGE=yes
    DEFAULT_wxUSE_GIF=yes
    DEFAULT_wxUSE_PCX=yes
@@ -939,10 +1008,9 @@ AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$wi
  AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
  AC_ARG_WITH(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
  AC_ARG_WITH(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(cygwin,        [  --with-cygwin           use Cygwin for MS-Windows], [wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(mingw,         [  --with-mingw            use GCC Minimal MS-Windows], [wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW TOOLKIT_GIVEN=1])
  AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(mgl,           [  --with-mgl              use MGL], [wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1])
  
  AC_ARG_ENABLE(gtk2,        [  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)],wxUSE_GTK2=1,wxUSE_GTK2=0)
  
  
  AC_ARG_ENABLE(gtk2,        [  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)],wxUSE_GTK2=1,wxUSE_GTK2=0)
  
@@ -955,23 +1023,23 @@ WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxU
  fi
  dnl for GUI only
  
  fi
  dnl for GUI only
  
-WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
+WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC)
+WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
  WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
  WX_ARG_WITH(odbc,          [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
  
  WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
  WX_ARG_WITH(odbc,          [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
  
-dnl ====================
-dnl compile-time options
-dnl ====================
-
  dnl ---------------------------------------------------------------------------
  dnl compile options
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code], wxUSE_SHARED)
  dnl ---------------------------------------------------------------------------
  dnl compile options
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code], wxUSE_SHARED)
-WX_ARG_ENABLE(burnt_name,  [  --enable-burnt_name     create set name in shared library ], wxUSE_BURNT_NAME)
+WX_ARG_ENABLE(soname,      [  --enable-soname         set the DT_SONAME field in ELF shared libraries], wxUSE_SONAME)
  WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
  WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
  
  WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
  WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
  
+dnl allow the precompiled header option to be disabled under Mac OS X
+WX_ARG_ENABLE(precomp,     [  --enable-precomp        enable use of precompiled headers (Mac OS X)], wxUSE_PRECOMP)
+
  if test "$wxUSE_DEBUG" = "yes"; then
    DEFAULT_wxUSE_DEBUG_FLAG=yes
    DEFAULT_wxUSE_DEBUG_INFO=yes
  if test "$wxUSE_DEBUG" = "yes"; then
    DEFAULT_wxUSE_DEBUG_FLAG=yes
    DEFAULT_wxUSE_DEBUG_INFO=yes
@@ -987,12 +1055,12 @@ WX_ARG_ENABLE(debug_cntxt,   [  --enable-debug_cntxt    use wxDebugContext], wxU
  WX_ARG_ENABLE(mem_tracing,   [  --enable-mem_tracing    create code with memory tracing], wxUSE_MEM_TRACING)
  WX_ARG_ENABLE(profile,       [  --enable-profile        create code with profiling information], wxUSE_PROFILE)
  WX_ARG_ENABLE(no_rtti,       [  --enable-no_rtti        create code without RTTI information], wxUSE_NO_RTTI)
  WX_ARG_ENABLE(mem_tracing,   [  --enable-mem_tracing    create code with memory tracing], wxUSE_MEM_TRACING)
  WX_ARG_ENABLE(profile,       [  --enable-profile        create code with profiling information], wxUSE_PROFILE)
  WX_ARG_ENABLE(no_rtti,       [  --enable-no_rtti        create code without RTTI information], wxUSE_NO_RTTI)
-WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without exceptions information], wxUSE_NO_EXCEPTIONS)
+WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without C++ exceptions handling], wxUSE_NO_EXCEPTIONS)
  WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
  WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
  
  WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
  WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
  
-WX_ARG_ENABLE(compat20,      [  --enable-compat20       enable wxWin 2.0 compatibility], WXWIN_COMPATIBILITY_2)
-WX_ARG_ENABLE(compat22,      [  --enable-compat22       enable wxWin 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
+WX_ARG_ENABLE(compat20,      [  --enable-compat20       enable wxWindows 2.0 compatibility], WXWIN_COMPATIBILITY_2)
+WX_ARG_ENABLE(compat22,      [  --enable-compat22       enable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
  
  dnl ---------------------------------------------------------------------------
  dnl (small) optional non GUI classes
  
  dnl ---------------------------------------------------------------------------
  dnl (small) optional non GUI classes
@@ -1015,16 +1083,17 @@ WX_ARG_ENABLE(timer,         [  --enable-timer          use wxTimer class], wxUS
  WX_ARG_ENABLE(wave,          [  --enable-wave           use wxWave class], wxUSE_WAVE)
  WX_ARG_ENABLE(fraction,      [  --enable-fraction       use wxFraction class], wxUSE_FRACTION)
  WX_ARG_ENABLE(dynlib,        [  --enable-dynlib         use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS)
  WX_ARG_ENABLE(wave,          [  --enable-wave           use wxWave class], wxUSE_WAVE)
  WX_ARG_ENABLE(fraction,      [  --enable-fraction       use wxFraction class], wxUSE_FRACTION)
  WX_ARG_ENABLE(dynlib,        [  --enable-dynlib         use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS)
+WX_ARG_ENABLE(dynamicloader, [  --enable-dynamicloader  use (new) wxDynamicLibrary class], wxUSE_DYNAMIC_LOADER)
  WX_ARG_ENABLE(longlong,      [  --enable-longlong       use wxLongLong class], wxUSE_LONGLONG)
  WX_ARG_ENABLE(geometry,      [  --enable-geometry       use geometry class], wxUSE_GEOMETRY)
  WX_ARG_ENABLE(log,           [  --enable-log            use logging system], wxUSE_LOG)
  WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
  WX_ARG_ENABLE(file,          [  --enable-file           use wxFile classes], wxUSE_FILE)
  WX_ARG_ENABLE(ffile,         [  --enable-ffile          use wxFFile classes], wxUSE_FFILE)
  WX_ARG_ENABLE(longlong,      [  --enable-longlong       use wxLongLong class], wxUSE_LONGLONG)
  WX_ARG_ENABLE(geometry,      [  --enable-geometry       use geometry class], wxUSE_GEOMETRY)
  WX_ARG_ENABLE(log,           [  --enable-log            use logging system], wxUSE_LOG)
  WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
  WX_ARG_ENABLE(file,          [  --enable-file           use wxFile classes], wxUSE_FILE)
  WX_ARG_ENABLE(ffile,         [  --enable-ffile          use wxFFile classes], wxUSE_FFILE)
-WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile classes], wxUSE_TEXTFILE)
+WX_ARG_ENABLE(textbuf,       [  --enable-textbuf        use wxTextBuffer class], wxUSE_TEXTBUFFER)
+WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
  WX_ARG_ENABLE(fontmap,       [  --enable-fontmap        use font encodings conversion classes], wxUSE_FONTMAP)
  WX_ARG_ENABLE(unicode,       [  --enable-unicode        compile wxString with Unicode support], wxUSE_UNICODE)
  WX_ARG_ENABLE(fontmap,       [  --enable-fontmap        use font encodings conversion classes], wxUSE_FONTMAP)
  WX_ARG_ENABLE(unicode,       [  --enable-unicode        compile wxString with Unicode support], wxUSE_UNICODE)
-WX_ARG_ENABLE(wcsrtombs,     [  --enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs], wxUSE_WCSRTOMBS)
  WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
  WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
  WX_ARG_ENABLE(filesystem,    [  --enable-filesystem     use virtual file systems classes], wxUSE_FILESYSTEM)
  WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
  WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
  WX_ARG_ENABLE(filesystem,    [  --enable-filesystem     use virtual file systems classes], wxUSE_FILESYSTEM)
@@ -1035,14 +1104,14 @@ WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], w
  WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION)
  WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
  
  WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION)
  WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
  
-WX_ARG_ENABLE(mimetype,    [  --enable-mimetypes      use wxMimeTypesManager], wxUSE_MIMETYPE)
+WX_ARG_ENABLE(mimetype,      [  --enable-mimetype       use wxMimeTypesManager], wxUSE_MIMETYPE)
+WX_ARG_ENABLE(system_options,[  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
  
  dnl ---------------------------------------------------------------------------
  dnl "big" options (i.e. those which change a lot of things throughout the library)
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_ENABLE(threads,     [  --enable-threads        use threads], wxUSE_THREADS)
  
  dnl ---------------------------------------------------------------------------
  dnl "big" options (i.e. those which change a lot of things throughout the library)
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_ENABLE(threads,     [  --enable-threads        use threads], wxUSE_THREADS)
-WX_ARG_ENABLE(serial,      [  --enable-serial         use class serialization], wxUSE_SERIAL)
  
  if test "$wxUSE_GUI" = "yes"; then
  
  
  if test "$wxUSE_GUI" = "yes"; then
  
@@ -1051,12 +1120,16 @@ dnl "big" GUI options
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_ENABLE(docview,     [  --enable-docview        use document view architecture], wxUSE_DOC_VIEW_ARCHITECTURE)
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_ENABLE(docview,     [  --enable-docview        use document view architecture], wxUSE_DOC_VIEW_ARCHITECTURE)
-WX_ARG_ENABLE(help,        [  --enable-help           use help (using external browser at present)], wxUSE_HELP)
+WX_ARG_ENABLE(help,        [  --enable-help           use help subsystem], wxUSE_HELP)
+WX_ARG_ENABLE(mshtmlhelp,  [  --enable-mshtmlhelp     use MS HTML Help (win32)], wxUSE_MS_HTML_HELP)
+WX_ARG_ENABLE(html,        [  --enable-html           use wxHTML sub-library], wxUSE_HTML)
+WX_ARG_ENABLE(htmlhelp,    [  --enable-htmlhelp       use wxHTML-based help], wxUSE_WXHTML_HELP)
  WX_ARG_ENABLE(constraints, [  --enable-constraints    use layout-constraints system], wxUSE_CONSTRAINTS)
  WX_ARG_ENABLE(printarch,   [  --enable-printarch      use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
  WX_ARG_ENABLE(mdi,         [  --enable-mdi            use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE)
  WX_ARG_ENABLE(loggui,      [  --enable-loggui         use standard GUI logger], wxUSE_LOGGUI)
  WX_ARG_ENABLE(logwin,      [  --enable-logwin         use wxLogWindow], wxUSE_LOGWINDOW)
  WX_ARG_ENABLE(constraints, [  --enable-constraints    use layout-constraints system], wxUSE_CONSTRAINTS)
  WX_ARG_ENABLE(printarch,   [  --enable-printarch      use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
  WX_ARG_ENABLE(mdi,         [  --enable-mdi            use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE)
  WX_ARG_ENABLE(loggui,      [  --enable-loggui         use standard GUI logger], wxUSE_LOGGUI)
  WX_ARG_ENABLE(logwin,      [  --enable-logwin         use wxLogWindow], wxUSE_LOGWINDOW)
+WX_ARG_ENABLE(logdialog,   [  --enable-logdialog      use wxLogDialog], wxUSE_LOGDIALOG)
  
  dnl ---------------------------------------------------------------------------
  dnl PostScript options
  
  dnl ---------------------------------------------------------------------------
  dnl PostScript options
@@ -1084,8 +1157,7 @@ WX_ARG_ENABLE(clipboard,   [  --enable-clipboard      use wxClipboard classes],
  WX_ARG_ENABLE(dnd,         [  --enable-dnd            use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
  WX_ARG_ENABLE(metafile,    [  --enable-metafile       use win32 metafiles], wxUSE_METAFILE)
  
  WX_ARG_ENABLE(dnd,         [  --enable-dnd            use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
  WX_ARG_ENABLE(metafile,    [  --enable-metafile       use win32 metafiles], wxUSE_METAFILE)
  
-dnl TODO: doesn't work yet
-WX_ARG_ENABLE(wxtree,      [  --enable-wxtree         make wxTree library], wxUSE_WXTREE)
+WX_ARG_ENABLE(treelayout,  [  --enable-treelayout     use wxTreeLayout classes], wxUSE_TREELAYOUT)
  
  dnl ---------------------------------------------------------------------------
  dnl optional GUI controls (in alphabetical order except the first one)
  
  dnl ---------------------------------------------------------------------------
  dnl optional GUI controls (in alphabetical order except the first one)
@@ -1113,6 +1185,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
    DEFAULT_wxUSE_LISTBOX=yes
    DEFAULT_wxUSE_LISTCTRL=yes
    DEFAULT_wxUSE_NOTEBOOK=yes
    DEFAULT_wxUSE_LISTBOX=yes
    DEFAULT_wxUSE_LISTCTRL=yes
    DEFAULT_wxUSE_NOTEBOOK=yes
+  DEFAULT_wxUSE_PROPSHEET=yes
    DEFAULT_wxUSE_RADIOBOX=yes
    DEFAULT_wxUSE_RADIOBTN=yes
    DEFAULT_wxUSE_SASH=yes
    DEFAULT_wxUSE_RADIOBOX=yes
    DEFAULT_wxUSE_RADIOBTN=yes
    DEFAULT_wxUSE_SASH=yes
@@ -1132,6 +1205,8 @@ if test "$wxUSE_CONTROLS" = "yes"; then
    DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
    DEFAULT_wxUSE_TOOLTIPS=yes
    DEFAULT_wxUSE_TREECTRL=yes
    DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
    DEFAULT_wxUSE_TOOLTIPS=yes
    DEFAULT_wxUSE_TREECTRL=yes
+  DEFAULT_wxUSE_POPUPWIN=yes
+  DEFAULT_wxUSE_TIPWINDOW=yes
  elif test "$wxUSE_CONTROLS" = "no"; then
    DEFAULT_wxUSE_ACCEL=no
    DEFAULT_wxUSE_BMPBUTTON=no
  elif test "$wxUSE_CONTROLS" = "no"; then
    DEFAULT_wxUSE_ACCEL=no
    DEFAULT_wxUSE_BMPBUTTON=no
@@ -1149,6 +1224,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
    DEFAULT_wxUSE_LISTBOX=no
    DEFAULT_wxUSE_LISTCTRL=no
    DEFAULT_wxUSE_NOTEBOOK=no
    DEFAULT_wxUSE_LISTBOX=no
    DEFAULT_wxUSE_LISTCTRL=no
    DEFAULT_wxUSE_NOTEBOOK=no
+  DEFAULT_wxUSE_PROPSHEET=no
    DEFAULT_wxUSE_RADIOBOX=no
    DEFAULT_wxUSE_RADIOBTN=no
    DEFAULT_wxUSE_SASH=no
    DEFAULT_wxUSE_RADIOBOX=no
    DEFAULT_wxUSE_RADIOBTN=no
    DEFAULT_wxUSE_SASH=no
@@ -1168,6 +1244,8 @@ elif test "$wxUSE_CONTROLS" = "no"; then
    DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
    DEFAULT_wxUSE_TOOLTIPS=no
    DEFAULT_wxUSE_TREECTRL=no
    DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
    DEFAULT_wxUSE_TOOLTIPS=no
    DEFAULT_wxUSE_TREECTRL=no
+  DEFAULT_wxUSE_POPUPWIN=no
+  DEFAULT_wxUSE_TIPWINDOW=no
  fi
  
  WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
  fi
  
  WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
@@ -1186,6 +1264,7 @@ WX_ARG_ENABLE(imaglist,    [  --enable-imaglist       use wxImageList class], wx
  WX_ARG_ENABLE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
  WX_ARG_ENABLE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
  WX_ARG_ENABLE(notebook,    [  --enable-notebook       use wxNotebook class], wxUSE_NOTEBOOK)
  WX_ARG_ENABLE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
  WX_ARG_ENABLE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
  WX_ARG_ENABLE(notebook,    [  --enable-notebook       use wxNotebook class], wxUSE_NOTEBOOK)
+WX_ARG_ENABLE(propsheet,   [  --enable-propsheet      use wxPropertySheet class], wxUSE_PROPSHEET)
  WX_ARG_ENABLE(radiobox,    [  --enable-radiobox       use wxRadioBox class], wxUSE_RADIOBOX)
  WX_ARG_ENABLE(radiobtn,    [  --enable-radiobtn       use wxRadioButton class], wxUSE_RADIOBTN)
  WX_ARG_ENABLE(sash,        [  --enable-sash           use wxSashWindow class], wxUSE_SASH)
  WX_ARG_ENABLE(radiobox,    [  --enable-radiobox       use wxRadioBox class], wxUSE_RADIOBOX)
  WX_ARG_ENABLE(radiobtn,    [  --enable-radiobtn       use wxRadioButton class], wxUSE_RADIOBTN)
  WX_ARG_ENABLE(sash,        [  --enable-sash           use wxSashWindow class], wxUSE_SASH)
@@ -1206,41 +1285,52 @@ WX_ARG_ENABLE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUS
  WX_ARG_ENABLE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
  WX_ARG_ENABLE(tbarsmpl,    [  --enable-tbarsmpl       use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
  WX_ARG_ENABLE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)
  WX_ARG_ENABLE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
  WX_ARG_ENABLE(tbarsmpl,    [  --enable-tbarsmpl       use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
  WX_ARG_ENABLE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)
+WX_ARG_ENABLE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)
+WX_ARG_ENABLE(popupwin,    [  --enable-popupwin       use wxPopUpWindow class], wxUSE_POPUPWIN)
  
  dnl ---------------------------------------------------------------------------
  
  dnl ---------------------------------------------------------------------------
-dnl misc GUI options
+dnl common dialogs
  dnl ---------------------------------------------------------------------------
  
  dnl ---------------------------------------------------------------------------
  
-WX_ARG_ENABLE(commondlg,   [  --enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)], wxUSE_COMMONDLGS)
+WX_ARG_ENABLE(commondlg,   [  --enable-commondlg      use all common dialogs], wxUSE_COMMONDLGS)
  WX_ARG_ENABLE(choicedlg,   [  --enable-choicedlg      use wxChoiceDialog], wxUSE_CHOICEDLG)
  WX_ARG_ENABLE(coldlg,      [  --enable-coldlg         use wxColourDialog], wxUSE_COLOURDLG)
  WX_ARG_ENABLE(filedlg,     [  --enable-filedlg        use wxFileDialog], wxUSE_FILEDLG)
  WX_ARG_ENABLE(choicedlg,   [  --enable-choicedlg      use wxChoiceDialog], wxUSE_CHOICEDLG)
  WX_ARG_ENABLE(coldlg,      [  --enable-coldlg         use wxColourDialog], wxUSE_COLOURDLG)
  WX_ARG_ENABLE(filedlg,     [  --enable-filedlg        use wxFileDialog], wxUSE_FILEDLG)
+WX_ARG_ENABLE(finddlg,     [  --enable-finddlg        use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
  WX_ARG_ENABLE(fontdlg,     [  --enable-fontdlg        use wxFontDialog], wxUSE_FONTDLG)
  WX_ARG_ENABLE(dirdlg,      [  --enable-dirdlg         use wxDirDialog], wxUSE_DIRDLG)
  WX_ARG_ENABLE(msgdlg,      [  --enable-msgdlg         use wxMessageDialog], wxUSE_MSGDLG)
  WX_ARG_ENABLE(numberdlg,   [  --enable-numberdlg      use wxNumberEntryDialog], wxUSE_NUMBERDLG)
  WX_ARG_ENABLE(fontdlg,     [  --enable-fontdlg        use wxFontDialog], wxUSE_FONTDLG)
  WX_ARG_ENABLE(dirdlg,      [  --enable-dirdlg         use wxDirDialog], wxUSE_DIRDLG)
  WX_ARG_ENABLE(msgdlg,      [  --enable-msgdlg         use wxMessageDialog], wxUSE_MSGDLG)
  WX_ARG_ENABLE(numberdlg,   [  --enable-numberdlg      use wxNumberEntryDialog], wxUSE_NUMBERDLG)
+WX_ARG_ENABLE(splash,      [  --enable-splash         use wxSplashScreen], wxUSE_SPLASH)
  WX_ARG_ENABLE(textdlg,     [  --enable-textdlg        use wxTextDialog], wxUSE_TEXTDLG)
  WX_ARG_ENABLE(tipdlg,      [  --enable-tipdlg         use startup tips], wxUSE_STARTUP_TIPS)
  WX_ARG_ENABLE(progressdlg, [  --enable-progressdlg    use wxProgressDialog], wxUSE_PROGRESSDLG)
  WX_ARG_ENABLE(textdlg,     [  --enable-textdlg        use wxTextDialog], wxUSE_TEXTDLG)
  WX_ARG_ENABLE(tipdlg,      [  --enable-tipdlg         use startup tips], wxUSE_STARTUP_TIPS)
  WX_ARG_ENABLE(progressdlg, [  --enable-progressdlg    use wxProgressDialog], wxUSE_PROGRESSDLG)
+WX_ARG_ENABLE(wizarddlg,   [  --enable-wizarddlg      use wxWizard], wxUSE_WIZARDDLG)
+
+dnl ---------------------------------------------------------------------------
+dnl misc GUI options
+dnl ---------------------------------------------------------------------------
+
  WX_ARG_ENABLE(menus,       [  --enable-menus          use wxMenu/wxMenuBar/wxMenuItem classes], wxUSE_MENUS)
  WX_ARG_ENABLE(miniframe,   [  --enable-miniframe      use wxMiniFrame class], wxUSE_MINIFRAME)
  WX_ARG_ENABLE(menus,       [  --enable-menus          use wxMenu/wxMenuBar/wxMenuItem classes], wxUSE_MENUS)
  WX_ARG_ENABLE(miniframe,   [  --enable-miniframe      use wxMiniFrame class], wxUSE_MINIFRAME)
-WX_ARG_ENABLE(html,        [  --enable-html           use wxHTML sub-library], wxUSE_HTML)
  WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUSE_TOOLTIPS)
  WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
  WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
  WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
  WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUSE_TOOLTIPS)
  WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
  WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
  WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
-WX_ARG_ENABLE(joystick,    [  --enable-joystick       compile in joystick support (Linux only)], wxUSE_JOYSTICK)
+WX_ARG_ENABLE(joystick,    [  --enable-joystick       use wxJoystick (Linux only)], wxUSE_JOYSTICK)
  WX_ARG_ENABLE(metafile,    [  --enable-metafiles      use wxMetaFile (Windows only)], wxUSE_METAFILE)
  WX_ARG_ENABLE(metafile,    [  --enable-metafiles      use wxMetaFile (Windows only)], wxUSE_METAFILE)
+WX_ARG_ENABLE(dragimage,   [  --enable-dragimage      use wxDragImage], wxUSE_DRAGIMAGE)
  
  dnl ---------------------------------------------------------------------------
  dnl support for image formats that do not rely on external library
  dnl ---------------------------------------------------------------------------
  
  
  dnl ---------------------------------------------------------------------------
  dnl support for image formats that do not rely on external library
  dnl ---------------------------------------------------------------------------
  
+WX_ARG_ENABLE(palette,     [  --enable-palette        use wxPalette class], wxUSE_PALETTE)
  WX_ARG_ENABLE(image,       [  --enable-image          use wxImage class], wxUSE_IMAGE)
  WX_ARG_ENABLE(gif,         [  --enable-gif            use gif images (GIF file format)], wxUSE_GIF)
  WX_ARG_ENABLE(pcx,         [  --enable-pcx            use pcx images (PCX file format)], wxUSE_PCX)
  WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
  WX_ARG_ENABLE(image,       [  --enable-image          use wxImage class], wxUSE_IMAGE)
  WX_ARG_ENABLE(gif,         [  --enable-gif            use gif images (GIF file format)], wxUSE_GIF)
  WX_ARG_ENABLE(pcx,         [  --enable-pcx            use pcx images (PCX file format)], wxUSE_PCX)
  WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
-WX_ARG_ENABLE(pnm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
+WX_ARG_ENABLE(xpm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
  
  fi
  dnl for GUI only
  
  fi
  dnl for GUI only
@@ -1255,80 +1345,78 @@ AC_MSG_CHECKING(for toolkit)
  
  if test "$wxUSE_GUI" = "yes"; then
  
  
  if test "$wxUSE_GUI" = "yes"; then
  
-if test "$USE_BEOS" = 1; then
-    AC_MSG_ERROR([BeOS GUI is not supported yet, use --disable-gui])
-fi
+    if test "$USE_BEOS" = 1; then
+        AC_MSG_ERROR([BeOS GUI is not supported yet, use --disable-gui])
+    fi
  
  
-if test "$TOOLKIT_GIVEN" = 1; then
-  dnl convert "yes" to 1 and "no" to 0
-  for toolkit in `echo $ALL_TOOLKITS`; do
-    var=wxUSE_$toolkit
-    eval "value=\$${var}"
-    eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
-  done
-else
-  dnl try to guess the most apropriate toolkit for this platform
-  for toolkit in `echo $ALL_TOOLKITS`; do
-    if test "$has_toolkit_in_cache" != 1; then
-      var=DEFAULT_DEFAULT_wxUSE_$toolkit
+    if test "$TOOLKIT_GIVEN" = 1; then
+      dnl convert "yes" to 1 and "no" to 0
+      for toolkit in `echo $ALL_TOOLKITS`; do
+        var=wxUSE_$toolkit
+        eval "value=\$${var}"
+        eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
+      done
      else
      else
-      var=DEFAULT_wxUSE_$toolkit
+      dnl try to guess the most apropriate toolkit for this platform
+      for toolkit in `echo $ALL_TOOLKITS`; do
+        if test "$has_toolkit_in_cache" != 1; then
+          var=DEFAULT_DEFAULT_wxUSE_$toolkit
+        else
+          var=DEFAULT_wxUSE_$toolkit
+        fi
+        eval "wxUSE_$toolkit=\$${var}"
+      done
      fi
      fi
-    eval "wxUSE_$toolkit=\$${var}"
-  done
-fi
  
  
-dnl we suppose that expr is available (maybe there is a better way to do
-dnl this? what about using ALL_TOOLKITS? TODO)
-NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_MGL:-0}`
-
-dnl Allow wxUSE_PM only for OS/2 with EMX.
-dnl Path separator; ':' for unix.
-dnl Stem for flex output; lexyy for OS/2, lex.yy otherwise
-dnl Extension for programs; '.exe' for OS/2 and msw builds (set later).
-case "${host}" in
-  *-pc-os2_emx )
-    NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
-    # PATH_IFS is autodetected by OS/2's configure (usually ';')
-    LEX_STEM="lexyy"
-  ;;
-  *)
-    PATH_IFS=':'
-    LEX_STEM="lex.yy"
-  ;;
-esac
+    dnl we suppose that expr is available (maybe there is a better way to do
+    dnl this? what about using ALL_TOOLKITS? TODO)
+    NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0}  \
+                  + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0}`
  
  
-case "$NUM_TOOLKITS" in
-  1)
-  ;;
-  0)
-    AC_MSG_ERROR(Please specify a toolkit - cannot determine the default for ${host})
-  ;;
-  *)
-    AC_MSG_ERROR(Please specify at most one toolkit (may be some are cached?))
-esac
+    dnl Allow wxUSE_PM only for OS/2 with EMX.
+    dnl Path separator; ':' for unix.
+    dnl Stem for flex output; lexyy for OS/2, lex.yy otherwise
+    case "${host}" in
+      *-pc-os2_emx | *-pc-os2-emx )
+        # PATH_IFS is autodetected by OS/2's configure (usually ';')
+        NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
+        LEX_STEM="lexyy"
+      ;;
+      *)
+        PATH_IFS=':'
+        LEX_STEM="lex.yy"
+      ;;
+    esac
  
  
-dnl cache the wxUSE_<TOOLKIT> values too
-for toolkit in `echo $ALL_TOOLKITS`; do
-  var=wxUSE_$toolkit
-  eval "value=\$${var}"
-  if test "x$value" != x; then
-    cache_var=CACHE_$toolkit
-    eval "cache=\$${cache_var}"
-    if test "$cache" = 1; then
-      echo "$var=$value" >> ${wx_arg_cache_file}
-    fi
-    if test "$value" = 1; then
-      toolkit_echo=`echo $toolkit | tr [[A-Z]] [[a-z]]`
-      AC_MSG_RESULT($toolkit_echo)
-    fi
-  fi
-done
+    case "$NUM_TOOLKITS" in
+      1)
+      ;;
+      0)
+        AC_MSG_ERROR(Please specify a toolkit - cannot determine the default for ${host})
+      ;;
+      *)
+        AC_MSG_ERROR(Please specify at most one toolkit (may be some are cached?))
+    esac
  
  
-dnl from "if wxUSE_GUI"
+    dnl cache the wxUSE_<TOOLKIT> values too
+    for toolkit in `echo $ALL_TOOLKITS`; do
+      var=wxUSE_$toolkit
+      eval "value=\$${var}"
+      if test "x$value" != x; then
+        cache_var=CACHE_$toolkit
+        eval "cache=\$${cache_var}"
+        if test "$cache" = 1; then
+          echo "$var=$value" >> ${wx_arg_cache_file}
+        fi
+        if test "$value" = 1; then
+          toolkit_echo=`echo $toolkit | tr [[A-Z]] [[a-z]]`
+          AC_MSG_RESULT($toolkit_echo)
+        fi
+      fi
+    done
  else
      PATH_IFS=':'
  else
      PATH_IFS=':'
-    AC_MSG_RESULT(base only)
+    AC_MSG_RESULT(base ($host_alias hosted) only)
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -1341,15 +1429,19 @@ AC_CACHE_SAVE
  dnl cross-compiling support: we're cross compiling if the build system is
  dnl different from the target one (assume host and target be always the same)
  if test "$build" != "$host" ; then
  dnl cross-compiling support: we're cross compiling if the build system is
  dnl different from the target one (assume host and target be always the same)
  if test "$build" != "$host" ; then
-    CC=$host_alias-gcc
-    CXX=$host_alias-c++
-    AR=$host_alias-ar
-    RANLIB=$host_alias-ranlib
-    DLLTOOL=$host_alias-dlltool
-    RESCOMP=$host_alias-windres
-    LD=$host_alias-ld
-    NM=$host_alias-nm
-    STRIP=$host_alias-strip
+    if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 ; then
+        CC=$host_alias-gcc
+        CXX=$host_alias-c++
+        AR=$host_alias-ar
+        RANLIB=$host_alias-ranlib
+        DLLTOOL=$host_alias-dlltool
+        RESCOMP=$host_alias-windres
+        LD=$host_alias-ld
+        NM=$host_alias-nm
+        STRIP=$host_alias-strip
+    else
+        AC_MSG_ERROR($build_alias -> $host_alias cross compilation not supported yet.)
+    fi
  fi
  
  dnl C-compiler checks
  fi
  
  dnl C-compiler checks
@@ -1361,10 +1453,6 @@ AC_PROG_CC
  
  CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
  
  
  CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
  
-dnl what is the c-preprocessor
-dnl   defines CPP with the c-preprocessor
-AC_PROG_CPP
-
  dnl is -traditional needed for correct compilations
  dnl   adds -traditional for gcc if needed
  AC_PROG_GCC_TRADITIONAL
  dnl is -traditional needed for correct compilations
  dnl   adds -traditional for gcc if needed
  AC_PROG_GCC_TRADITIONAL
@@ -1379,10 +1467,6 @@ dnl   defines GXX empty if not using gxx
  dnl   defines CXXFLAGS
  AC_PROG_CXX
  
  dnl   defines CXXFLAGS
  AC_PROG_CXX
  
-dnl what is the C++-preprocessor
-dnl   defines CXXCPP with the C++-preprocessor
-AC_PROG_CXXCPP
-
  CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
  
  AC_LANG_RESTORE
  CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
  
  AC_LANG_RESTORE
@@ -1398,13 +1482,25 @@ AC_CHECK_PROG(AR, ar, ar, ar)
  dnl install checks
  dnl   defines INSTALL with the appropriate command
  AC_PROG_INSTALL
  dnl install checks
  dnl   defines INSTALL with the appropriate command
  AC_PROG_INSTALL
+case "${host}" in
+
+    dnl The other BSD's should probably go in here too, since this is
+    dnl to workaround a strange static lib BSDism.
+    dnl Mac OS X install seems to ignore -p option...
+    powerpc-*-darwin* )
+        INSTALL_PROGRAM="cp -fp"
+        INSTALL_DATA="cp -fp"
+        ;;
+    *)
+        ;;
+esac
  
  dnl strip command
  dnl   defines STRIP as strip or nothing if not found
  AC_CHECK_PROG(STRIP, strip, strip, true)
  
  dnl check if VPATH works
  
  dnl strip command
  dnl   defines STRIP as strip or nothing if not found
  AC_CHECK_PROG(STRIP, strip, strip, true)
  
  dnl check if VPATH works
-AC_MSG_CHECKING([make for VPATH support])
+AC_MSG_CHECKING(make for VPATH support)
  dnl create Makefile
  cat - << EOF > confMake
  check : file
  dnl create Makefile
  cat - << EOF > confMake
  check : file
@@ -1537,71 +1633,334 @@ dnl ------------------------------------------------------------------------
  dnl flush the cache because checking for libraries below might abort
  AC_CACHE_SAVE
  
  dnl flush the cache because checking for libraries below might abort
  AC_CACHE_SAVE
  
-dnl ----------------------------------------------------------------
-dnl search for toolkit (widget sets)
-dnl ----------------------------------------------------------------
+dnl ---------------------------------------------------------------------------
+dnl Optional libraries
+dnl
+dnl   --with-<lib>=sys
+dnl       looks for system library and fails if not found
+dnl
+dnl   --with-<lib>
+dnl   --with-<lib>=yes
+dnl       looks for system library and, if not found, prints a warning,
+dnl       falls back to the builtin wx version, and continues configuration
+dnl
+dnl   --with-<lib>=builtin
+dnl       uses builtin wx version without searching for system library
+dnl
+dnl   --with-<lib>=no
+dnl   --without-<lib>
+dnl       do not use library (neither system nor builtin wx version)
+dnl
+dnl ---------------------------------------------------------------------------
  
  
-AFMINSTALL=
+dnl ------------------------------------------------------------------------
+dnl Check for regex libraries
+dnl ------------------------------------------------------------------------
  
  
-if test "$wxUSE_GUI" = "yes"; then
-    USE_GUI=1
+REGEX_INCLUDE=
+if test "$wxUSE_REGEX" != "no"; then
+    AC_DEFINE(wxUSE_REGEX)
  
  
-    TOOLKIT=
-    TOOLKIT_INCLUDE=
+    if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
+        dnl according to Unix 98 specs, regcomp() is in libc but I believe that
+        dnl on some old systems it may be in libregex - check for it too?
+        AC_CHECK_HEADER(regex.h, AC_CHECK_FUNCS(regcomp))
  
  
-    GUI_TK_LIBRARY=
-    GUI_TK_LINK=
+        if test "x$ac_cv_func_regcomp" != "xyes"; then
+            if test "$wxUSE_REGEX" = "sys" ; then
+                AC_MSG_ERROR([system regex library not found! Use --with-regex to use built-in version])
+            else
+                AC_MSG_WARN([system regex library not found, will use built-in instead])
+                wxUSE_REGEX=builtin
+            fi
+        else
+            dnl we are using the system library
+            wxUSE_REGEX=sys
+        fi
+    fi
  
  
-    WXGTK12=
-    WXGTK127=
-    WXGTK20=
+    if test "$wxUSE_REGEX" = "builtin" ; then
+        REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
+    fi
+fi
+
+dnl ------------------------------------------------------------------------
+dnl Check for zlib compression library
+dnl ------------------------------------------------------------------------
+
+ZLIB_INCLUDE=
+ZLIB_LINK=
+if test "$wxUSE_ZLIB" != "no" ; then
+    AC_DEFINE(wxUSE_ZLIB)
+
+    if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
+        AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, deflate, ZLIB_LINK=" -lz"))
+
+        if test "x$ZLIB_LINK" = "x" ; then
+            if test "$wxUSE_ZLIB" = "sys" ; then
+                AC_MSG_ERROR([system zlib compression library not found! Use --with-zlib=builtin to use built-in version])
+            else
+                AC_MSG_WARN([system zlib compression library not found, will use built-in instead])
+                wxUSE_ZLIB=builtin
+            fi
+        else
+            dnl we are using the system library
+            wxUSE_ZLIB=sys
+        fi
+    fi
+
+    if test "$wxUSE_ZLIB" = "builtin" ; then
+        ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
+    fi
+fi
+
+dnl ------------------------------------------------------------------------
+dnl Check for png library
+dnl ------------------------------------------------------------------------
+
+PNG_INCLUDE=
+PNG_LINK=
+if test "$wxUSE_LIBPNG" != "no" ; then
+    AC_DEFINE(wxUSE_LIBPNG)
+
+    dnl for the check below to have a chance to succeed, we must already have
+    dnl libz somewhere
+    if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+        AC_MSG_WARN([system png library doesn't work without system zlib, will use built-in instead])
+        wxUSE_LIBPNG=builtin
+    fi
  
  
-    WXWINE=
+    if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+        AC_CHECK_HEADER(png.h,
+                        AC_CHECK_LIB(png, png_check_sig,
+                                     PNG_LINK=" -lpng",
+                                     ,
+                                     [-lz -lm])
+                       )
  
  
-    if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
-        if test "$cross_compiling" = "yes" ; then
-            dnl mingw32 will find them even if they're not in one of standard paths
-            AC_MSG_WARN(skipping windows.h check for cross-compilation)
+        if test "x$PNG_LINK" = "x" ; then
+            if test "$wxUSE_LIBPNG" = "sys" ; then
+                AC_MSG_ERROR([system png library not found! Use --with-libpng=builtin to use built-in version])
+            else
+                AC_MSG_WARN([system png library not found, will use built-in instead])
+                wxUSE_LIBPNG=builtin
+            fi
          else
          else
-            AC_MSG_CHECKING(for Windows headers)
-            WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
-            if test "$ac_find_includes" != "" ; then
-                AC_MSG_RESULT(found $ac_find_includes)
-                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+            dnl we are using the system library
+            wxUSE_LIBPNG=yes
+        fi
+    fi
+
+    if test "$wxUSE_LIBPNG" = "builtin" ; then
+        PNG_INCLUDE="-I\${top_srcdir}/src/png"
+    fi
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
+fi
+
+dnl ------------------------------------------------------------------------
+dnl Check for jpeg library
+dnl ------------------------------------------------------------------------
+
+JPEG_INCLUDE=
+JPEG_LINK=
+if test "$wxUSE_LIBJPEG" != "no" ; then
+    AC_DEFINE(wxUSE_LIBJPEG)
+
+    if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
+        dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
+        dnl HAVE_STDLIB_H which are already defined and this provokes
+        dnl a compiler warning which configure considers as an error...
+        AC_MSG_CHECKING(for jpeglib.h)
+        AC_CACHE_VAL(ac_cv_header_jpeglib_h,
+            AC_TRY_COMPILE(
+                [
+                    #undef HAVE_STDLIB_H
+                    #include <stdio.h>
+                    #include <jpeglib.h>
+                ],
+                [
+                ],
+                ac_cv_header_jpeglib_h=yes,
+                ac_cv_header_jpeglib_h=no
+            )
+        )
+        AC_MSG_RESULT($ac_cv_header_jpeglib_h)
+
+        if test "$ac_cv_header_jpeglib_h" = "yes"; then
+            AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
+        fi
+
+        if test "x$JPEG_LINK" = "x" ; then
+            if test "$wxUSE_LIBJPEG" = "sys" ; then
+                AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
              else
              else
-                AC_MSG_RESULT(no)
-                AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
+                AC_MSG_WARN([system jpeg library not found, will use built-in instead])
+                wxUSE_LIBJPEG=builtin
              fi
              fi
+        else
+            dnl we are using the system library
+            wxUSE_LIBJPEG=sys
          fi
          fi
+    fi
+
+    if test "$wxUSE_LIBJPEG" = "builtin" ; then
+        JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
+    fi
+fi
+
+dnl ------------------------------------------------------------------------
+dnl Check for tiff library
+dnl ------------------------------------------------------------------------
  
  
-        INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
-        dnl --- Quick & Dirty ; link against most/all libraries
-        dnl --- This will bloat the executable, but it'll work for now...
-        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+TIFF_INCLUDE=
+TIFF_LINK=
+if test "$wxUSE_LIBTIFF" != "no" ; then
+    AC_DEFINE(wxUSE_LIBTIFF)
+
+    if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
+        AC_CHECK_HEADER(tiffio.h,
+                        AC_CHECK_LIB(tiff, TIFFError,
+                                     TIFF_LINK=" -ltiff",
+                                     ,
+                                     -lm)
+                       )
  
  
-        dnl add extra odbc libs if we have compiled in odbc
-        if test "$wxUSE_ODBC" = "yes" ; then
-            LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
+        if test "x$TIFF_LINK" = "x" ; then
+            if test "$wxUSE_LIBTIFF" = "sys" ; then
+                AC_MSG_ERROR([system tiff library not found! Use --with-libtiff=builtin to use built-in version])
+            else
+                AC_MSG_WARN([system tiff library not found, will use built-in instead])
+                wxUSE_LIBTIFF=builtin
+            fi
+        else
+            dnl we are using the system library
+            wxUSE_LIBTIFF=sys
          fi
          fi
+    fi
+
+    if test "$wxUSE_LIBTIFF" = "builtin" ; then
+        TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
+    fi
+fi
+
+dnl ------------------------------------------------------------------------
+dnl Check for freetype library
+dnl ------------------------------------------------------------------------
+
+FREETYPE_INCLUDE=
+FREETYPE_LINK=
+if test "$wxUSE_FREETYPE" != "no" ; then
+    AC_DEFINE(wxUSE_FREETYPE)
+
+    if test "$wxUSE_FREETYPE" = "sys" -o "$wxUSE_FREETYPE" = "yes" ; then
+        AC_CHECK_HEADER(freetype.h,
+                        AC_CHECK_LIB(freetype, FT_Render_Glyph,
+                                     FREETYPE_LINK=" -lfreetype",
+                                     ,
+                                     [-lm])
+                       )
  
  
-        dnl -mwindows is needed to avoid that spawning of a console window
-        if test "$wxUSE_MINGW" = 1; then
-            LDFLAGS="$LDFLAGS -mwindows"
+        if test "x$FREETYPE_LINK" = "x" ; then
+            if test "$wxUSE_FREETYPE" = "sys" ; then
+                AC_MSG_ERROR([system freetype library not found! Use --with-freetype=builtin to use built-in version])
+            else
+                AC_MSG_WARN([system freetype library not found, will use built-in instead])
+                wxUSE_FREETYPE=builtin
+            fi
+        else
+            dnl we are using the system library
+            wxUSE_FREETYPE=sys
          fi
          fi
+    fi
+
+    if test "$wxUSE_FREETYPE" = "builtin" ; then
+        FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype"
+    fi
+fi
+
+dnl ----------------------------------------------------------------
+dnl search for toolkit (widget sets)
+dnl ----------------------------------------------------------------
+
+AFMINSTALL=
+
+TOOLKIT=
+TOOLKIT_INCLUDE=
+WIDGET_SET=
+
+dnl are we building for a win32 target environment?
+dnl If so, setup common stuff needed for both GUI and Base libs.
+if test "$USE_WIN32" = 1 ; then
+    AC_CHECK_HEADERS(w32api.h)
+    AC_CHECK_HEADER(windows.h, [],
+    [
+        AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
+    ])
+
+    dnl check if can use _WIN32_IE macro
+    AC_CACHE_CHECK([if w32api has good enough MSIE support], wx_cv_w32api_win32_ie,
+    [
+      AC_TRY_COMPILE([#include <w32api.h>],
+                     [
+                       #define wxCHECK_W32API_VERSION( major, minor ) \
+                       ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
+                       && ( ( __W32API_MAJOR_VERSION > (major) ) \
+                       || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor))))
+
+                       #if !wxCHECK_W32API_VERSION(1,1)
+                       #error You need w32api 1.1 or newer
+                       #endif
+                     ], [
+                        wx_cv_w32api_win32_ie=yes
+                     ], [
+                        wx_cv_w32api_win32_ie=no
+                     ])
+    ])
+    if test "$wx_cv_w32api_win32_ie" = "yes" ; then
+        CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
+    fi
+
+    dnl --- FIXME: This is still a somewhat random list of libs,
+    dnl ---        some of them should probably be included conditionally.
+    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+
+    case "${host}" in
+        *-*-cygwin* )
+            dnl Cygwin doesn't include these by default
+            LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
+    esac
+
+    dnl add extra odbc libs if we have compiled in odbc
+    if test "$wxUSE_ODBC" = "yes" ; then
+        LIBS=" -lodbc32 -lole32 -loleaut32$LIBS"
+    fi
+
+    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+    RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
+fi
+
+if test "$wxUSE_GUI" = "yes"; then
+    USE_GUI=1
+
+    GUI_TK_LIBRARY=
+
+    WXGTK12=
+    WXGTK127=
+    WXGTK20=
  
  
+    if test "$wxUSE_MSW" = 1 ; then
          TOOLKIT=MSW
          GUIDIST=MSW_DIST
  
          TOOLKIT=MSW
          GUIDIST=MSW_DIST
  
-        dnl we should calculate these
-        RCINCSWITCH="--include-dir"
-        RCDEFSWITCH="--define"
-        RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\""
-        RCINPUTSWITCH="-i"
-        RCOUTPUTSWITCH="-o"
-        RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__"
-
-        dnl set optinal RES_PROGRAM_OPT to RES_PROGRAM
-        RESPROGRAM="\$(RES_PROGRAM)"
+        dnl -mwindows causes a heap of other default gui libs to be linked in.
+        dnl FIXME: If cygwin needs this, please push it above, if not, please
+        dnl        remove this comment :-)
+        case "${host}" in
+            *-*-mingw32* )
+                LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
+        esac
      fi
  
      if test "$wxUSE_GTK" = 1; then
      fi
  
      if test "$wxUSE_GTK" = 1; then
@@ -1613,24 +1972,36 @@ if test "$wxUSE_GUI" = "yes"; then
                  dnl stupid GTK+ AM macros produce their own messages, so we
                  dnl have to pass to the next line
                  gtk_version_cached=0
                  dnl stupid GTK+ AM macros produce their own messages, so we
                  dnl have to pass to the next line
                  gtk_version_cached=0
-                AC_MSG_RESULT("")
+                AC_MSG_RESULT()
+
+                dnl we must link against lgthread unless the user
+                dnl used --disable-threads
+                GTK_MODULES=
+                if test "$wxUSE_THREADS" = "yes"; then
+                    GTK_MODULES=gthread
+                fi
  
                  wx_cv_lib_gtk=
                  if test "x$wxUSE_GTK2" = "xyes"; then
  
                  wx_cv_lib_gtk=
                  if test "x$wxUSE_GTK2" = "xyes"; then
-                    AM_PATH_GTK_2_0(1.3.1, wx_cv_lib_gtk=2.0, gthread)
+                    AM_PATH_GTK_2_0(1.3.1, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
                  fi
  
                  if test -z "$wx_cv_lib_gtk"; then
                  fi
  
                  if test -z "$wx_cv_lib_gtk"; then
-                    AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7)
+                    AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
                  fi
  
                  if test -z "$wx_cv_lib_gtk"; then
                  fi
  
                  if test -z "$wx_cv_lib_gtk"; then
-                    AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3)
+                    AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
                  fi
  
                  if test -z "$wx_cv_lib_gtk"; then
                      dnl looks better in AC_MSG_RESULT
                      wx_cv_lib_gtk=none
                  fi
  
                  if test -z "$wx_cv_lib_gtk"; then
                      dnl looks better in AC_MSG_RESULT
                      wx_cv_lib_gtk=none
+                else
+                    dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
+                    dnl subsequent runs
+                    wx_cv_cflags_gtk=$GTK_CFLAGS
+                    wx_cv_libs_gtk=$GTK_LIBS
                  fi
              ]
          )
                  fi
              ]
          )
@@ -1645,6 +2016,7 @@ if test "$wxUSE_GUI" = "yes"; then
              2.0)    WXGTK20=1
                      ;;
              1.2.7)  WXGTK127=1
              2.0)    WXGTK20=1
                      ;;
              1.2.7)  WXGTK127=1
+                    WXGTK12=1
                      ;;
              1.2.3)  WXGTK12=1
                      ;;
                      ;;
              1.2.3)  WXGTK12=1
                      ;;
@@ -1657,8 +2029,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                      ;;
          esac
  
                      ;;
          esac
  
-        TOOLKIT_INCLUDE="$GTK_CFLAGS"
-        GUI_TK_LIBRARY="$GTK_LIBS"
+        TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
+        GUI_TK_LIBRARY="$wx_cv_libs_gtk"
  
          AFMINSTALL=afminstall
          TOOLKIT=GTK
  
          AFMINSTALL=afminstall
          TOOLKIT=GTK
@@ -1669,8 +2041,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
      fi
  
      if test "$wxUSE_MGL" = 1; then
      fi
  
      if test "$wxUSE_MGL" = 1; then
-        dnl FIXME_MGL - test for MGL's variants for freebsd etc.
-
          AC_MSG_CHECKING(for SciTech MGL library)
          if test "x$MGL_ROOT" = x ; then
              AC_MSG_RESULT(not found)
          AC_MSG_CHECKING(for SciTech MGL library)
          if test "x$MGL_ROOT" = x ; then
              AC_MSG_RESULT(not found)
@@ -1679,24 +2049,38 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              AC_MSG_RESULT($MGL_ROOT)
          fi
  
              AC_MSG_RESULT($MGL_ROOT)
          fi
  
-        MGL_OS=linux/gcc/glibc
-        MGL_LIB_TYPE=""
+        dnl Find MGL library that we want
+        dnl FIXME_MGL - test for MGL variants for freebsd etc.
+        case "${host}" in
+            *-*-linux* )
+              mgl_os=linux/gcc/glibc
+              ;;
+            *-pc-msdosdjgpp )
+              mgl_os=dos32/dj2
+              ;;
+            *)
+              AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
+        esac
+
+        mgl_lib_type=""
  
          if test "$wxUSE_DEBUG_FLAG" = yes ; then
  
          if test "$wxUSE_DEBUG_FLAG" = yes ; then
-            if test -f $MGL_ROOT/lib/debug/$MGL_OS/libmgl.a ; then
-                MGL_LIB_TYPE=debug
+            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
+                    -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then
+                mgl_lib_type=debug
              fi
          fi
              fi
          fi
-        if test "x$MGL_LIB_TYPE" = x ; then
-            if test -f $MGL_ROOT/lib/release/$MGL_OS/libmgl.a ; then
-                MGL_LIB_TYPE=release
+        if test "x$mgl_lib_type" = x ; then
+            if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \
+                    -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then
+                mgl_lib_type=release
              else
                  AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
              fi
          fi
  
          TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
              else
                  AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
              fi
          fi
  
          TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
-        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$MGL_LIB_TYPE/$MGL_OS -lmgl -lmglcpp -lpm"
+        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
  
          AFMINSTALL=afminstall
          TOOLKIT=MGL
  
          AFMINSTALL=afminstall
          TOOLKIT=MGL
@@ -1704,22 +2088,17 @@ equivalent variable and GTK+ is version 1.2.3 or above.
      fi
  
      if test "$wxUSE_WINE" = 1; then
      fi
  
      if test "$wxUSE_WINE" = 1; then
-        AC_MSG_CHECKING(for WINE includes)
-        WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
-        if test "$ac_find_includes" != "" ; then
-            AC_MSG_RESULT(found $ac_find_includes)
-            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
-        else
-            AC_MSG_RESULT(no)
+        AC_CHECK_HEADER(windows.h, [],
+        [
              AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
              AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
-        fi
+        ])
  
  
-        XPM_LINK=""
+        xpm_link=
          AC_MSG_CHECKING(for Xpm library)
          WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
          if test "$ac_find_libraries" != "" ; then
              GUI_TK_LIBRARY="-L$ac_find_libraries"
          AC_MSG_CHECKING(for Xpm library)
          WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
          if test "$ac_find_libraries" != "" ; then
              GUI_TK_LIBRARY="-L$ac_find_libraries"
-            XPM_LINK="-lXpm"
+            xpm_link=" -lXpm"
              AC_DEFINE(wxHAVE_LIB_XPM)
              AC_MSG_RESULT(found at $ac_find_libraries)
          else
              AC_DEFINE(wxHAVE_LIB_XPM)
              AC_MSG_RESULT(found at $ac_find_libraries)
          else
@@ -1727,68 +2106,35 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              AC_MSG_WARN(library will be compiled without support for images in XPM format)
          fi
  
              AC_MSG_WARN(library will be compiled without support for images in XPM format)
          fi
  
-        MESA_LINK=""
+        mesa_link=
          AC_MSG_CHECKING(for Mesa library)
          WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
          if test "$ac_find_libraries" != "" ; then
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
          AC_MSG_CHECKING(for Mesa library)
          WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
          if test "$ac_find_libraries" != "" ; then
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
-            MESA_LINK="-lMesaGL"
+            mesa_link=" -lMesaGL"
              AC_MSG_RESULT(found at $ac_find_libraries)
          else
              AC_MSG_ERROR(no)
          fi
  
              AC_MSG_RESULT(found at $ac_find_libraries)
          else
              AC_MSG_ERROR(no)
          fi
  
-        GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
-        WXWINE=1
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
          TOOLKIT=MSW
          GUIDIST=MSW_DIST
          TOOLKIT=MSW
          GUIDIST=MSW_DIST
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__"
      fi
  
      fi
  
-    dnl use standard macros to check for X headers/libs, this brings support
-    dnl for the standard configure options --x-includes and --x-libraries;
-    dnl the path to the X headers/libs is not only needed for motif, but also
-    dnl by the OpenGL and XKBlib.h checks further down
-
-    AC_PATH_XTRA
-    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    LDFLAGS="$LDFLAGS $X_LIBS"
-
      if test "$wxUSE_MOTIF" = 1; then
      if test "$wxUSE_MOTIF" = 1; then
+        dnl use standard macros to check for X headers/libs, this brings support
+        dnl for the standard configure options --x-includes and --x-libraries
+        AC_PATH_XTRA
+
          if test "$no_x" = "yes"; then
            AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
          fi
  
          GUI_TK_LIBRARY="$X_LIBS"
          TOOLKIT_INCLUDE="$X_CFLAGS"
          if test "$no_x" = "yes"; then
            AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options)
          fi
  
          GUI_TK_LIBRARY="$X_LIBS"
          TOOLKIT_INCLUDE="$X_CFLAGS"
-
          AFMINSTALL=afminstall
          AFMINSTALL=afminstall
-
-        dnl manual check for X11 headers/libs
-        dnl
-        dnl    AC_MSG_CHECKING(for X11 headers)
-        dnl    WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, X11/Intrinsic.h)
-        dnl    if test "$ac_find_includes" != "" ; then
-        dnl        AC_MSG_RESULT(found $ac_find_includes)
-        dnl    else
-        dnl        AC_MSG_RESULT(no)
-        dnl        AC_MSG_ERROR(please set CFLAGS to contain the location of X11/Intrinsic.h)
-        dnl    fi
-        dnl
-        dnl    AC_MSG_CHECKING(for X11 libraries)
-        dnl    WX_PATH_FIND_LIBRARIES($SEARCH_LIB, X11)
-        dnl    if test "$ac_find_libraries" != "" ; then
-        dnl        WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
-        dnl        WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
-        dnl
-        dnl        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-        dnl        TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
-        dnl        AC_MSG_RESULT(found at $ac_find_libraries)
-        dnl    else
-        dnl        AC_MSG_RESULT(no)
-        dnl        AC_MSG_ERROR(please set LDFLAGS to contain the location of libX11)
-        dnl    fi
-
          COMPILED_X_PROGRAM=0
  
          AC_MSG_CHECKING(for Motif/Lesstif headers)
          COMPILED_X_PROGRAM=0
  
          AC_MSG_CHECKING(for Motif/Lesstif headers)
@@ -1802,7 +2148,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                  ],
                  [
                      int version;
                  ],
                  [
                      int version;
-
                      version = xmUseVersion;
                  ],
                  [
                      version = xmUseVersion;
                  ],
                  [
@@ -1823,8 +2168,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                  WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
                  WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
  
                  WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
                  WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
  
-                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
                  AC_MSG_RESULT(found at $ac_find_libraries)
              else
                  dnl it might happen that we found headers in one of the standard
                  AC_MSG_RESULT(found at $ac_find_libraries)
              else
                  dnl it might happen that we found headers in one of the standard
@@ -1836,7 +2181,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                      ],
                      [
                          int version;
                      ],
                      [
                          int version;
-
                          version = xmUseVersion;
                      ],
                      [
                          version = xmUseVersion;
                      ],
                      [
@@ -1851,45 +2195,13 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              fi
          fi
  
              fi
          fi
  
-        dnl we don't need this as we used AC_PATH_XTRA above which does it for us
-        dnl
-        dnl dnl if we already compiled a sample program, X libs are surely there
-        dnl if test "$COMPILED_X_PROGRAM" = 0; then
-        dnl     AC_MSG_CHECKING(for Xt library)
-        dnl     WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt)
-        dnl     if test "$ac_find_libraries" != "" ; then
-        dnl         WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
-        dnl         GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-        dnl         AC_MSG_RESULT(found at $ac_find_libraries)
-        dnl     else
-        dnl         AC_TRY_COMPILE
-        dnl         (
-        dnl             [
-        dnl                 #include <X11/Intrinsic.h>
-        dnl             ],
-        dnl             [
-        dnl                 char *p;
-        dnl                 p = XtMalloc(5);
-        dnl             ],
-        dnl             [
-        dnl                 AC_MSG_RESULT(found in default search path)
-        dnl                 COMPILED_X_PROGRAM=1
-        dnl             ],
-        dnl             [
-        dnl                 AC_MSG_RESULT(no)
-        dnl                 AC_MSG_ERROR(please set LDFLAGS to contain the location of libXt)
-        dnl             ]
-        dnl         )
-        dnl     fi
-        dnl fi
-
-        XPM_LINK=""
+        xpm_link=
          AC_MSG_CHECKING(for Xpm library)
          WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
          if test "$ac_find_libraries" != "" ; then
              WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
          AC_MSG_CHECKING(for Xpm library)
          WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
          if test "$ac_find_libraries" != "" ; then
              WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-            XPM_LINK="-lXpm "
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+            xpm_link=" -lXpm"
              AC_DEFINE(wxHAVE_LIB_XPM)
              AC_MSG_RESULT(found at $ac_find_libraries)
          else
              AC_DEFINE(wxHAVE_LIB_XPM)
              AC_MSG_RESULT(found at $ac_find_libraries)
          else
@@ -1899,12 +2211,11 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                  ],
                  [
                      int version;
                  ],
                  [
                      int version;
-
                      version = XpmLibraryVersion();
                  ],
                  [
                      version = XpmLibraryVersion();
                  ],
                  [
-                XPM_LINK="-lXpm "
-                AC_DEFINE(wxHAVE_LIB_XPM)
+                    xpm_link=" -lXpm"
+                    AC_DEFINE(wxHAVE_LIB_XPM)
                      AC_MSG_RESULT(found in default search path)
                      COMPILED_X_PROGRAM=0
                  ],
                      AC_MSG_RESULT(found in default search path)
                      COMPILED_X_PROGRAM=0
                  ],
@@ -1915,13 +2226,22 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              )
          fi
  
              )
          fi
  
-        GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link -lXmu -lXext -lXt -lX11"
+        TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
          TOOLKIT=MOTIF
          GUIDIST=MOTIF_DIST
      fi
  
      if test "$wxUSE_MAC" = 1; then
          TOOLKIT=MOTIF
          GUIDIST=MOTIF_DIST
      fi
  
      if test "$wxUSE_MAC" = 1; then
+        if test "$wxUSE_PRECOMP" = "yes"; then
+            CPPFLAGS="$CPPFLAGS -cpp-precomp"
+        fi
+        CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
+        CFLAGS="$CFLAGS -fpascal-strings"
+        CXXFLAGS="$CXXFLAGS -fpascal-strings"
+        TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -DTARGET_CARBON"
+
+        TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
          TOOLKIT=MAC
          dnl we can't call this MAC_DIST or autoconf thinks its a macro
          GUIDIST=MACX_DIST
          TOOLKIT=MAC
          dnl we can't call this MAC_DIST or autoconf thinks its a macro
          GUIDIST=MACX_DIST
@@ -1933,57 +2253,28 @@ equivalent variable and GTK+ is version 1.2.3 or above.
      fi
  
      dnl the name of the directory where the files for this toolkit live
      fi
  
      dnl the name of the directory where the files for this toolkit live
-    if test "$TOOLKIT" != "PM" ; then
-        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"`
-    else
+    if test "$TOOLKIT" = "PM" ; then
          TOOLKIT_DIR="os2"
          TOOLKIT_DIR="os2"
+    else
+        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"`
      fi
  
      fi
  
-    dnl the (base) name of the library and support files for this toolkit
-    TOOLKIT_NAME="${TOOLKIT_DIR}"
-
-    dnl the list of paths containing the files for this toolkit
-    TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
-
-    dnl need to add an extra dir for wxMotif
-    if test "$TOOLKIT_NAME" = "motif"; then
-        TOOLKIT_VPATH="${TOOLKIT_VPATH}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
-    fi
+    dnl misc other files depending on the port
+    PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
  
  
-    dnl are we using the generic version with this low level toolkit?
      if test "$wxUSE_UNIVERSAL" = "yes"; then
      if test "$wxUSE_UNIVERSAL" = "yes"; then
-        TOOLKIT_NAME="${TOOLKIT_NAME}univ"
-        UNIV_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes"
-        TOOLKIT_VPATH="${UNIV_VPATH}${PATH_IFS}${TOOLKIT_VPATH}"
-        SETUPH_DIR="univ"
-    else
-        SETUPH_DIR="${TOOLKIT_DIR}"
-    fi
-
-    dnl append 'd' to the debug library name
-    if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-        TOOLKIT_NAME="${TOOLKIT_NAME}d"
-    fi
-
-    dnl the symbol which allows conditional compilation for the given toolkit
-    TOOLKIT_DEF="-D__WX${TOOLKIT}__"
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__"
-    fi
-
-    dnl the name of the (libtool) library
-    WX_LIBRARY="wx_${TOOLKIT_NAME}"
-
-    dnl collect together all the object files for this port
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+        ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+        PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
+        TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
+        WIDGET_SET=univ
      else
          ALL_OBJECTS="\$(GUIOBJS)"
      fi
  
      ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
  
      else
          ALL_OBJECTS="\$(GUIOBJS)"
      fi
  
      ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
  
-    if test "$TOOLKIT" != "MSW"; then
+    if test "$TOOLKIT" != "MSW" -a "$USE_DOS" != 1; then
          ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
      fi
  
          ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
      fi
  
@@ -1992,296 +2283,342 @@ equivalent variable and GTK+ is version 1.2.3 or above.
      fi
  
      dnl ODBC objects are Unix only
      fi
  
      dnl ODBC objects are Unix only
-    if test "$TOOLKIT" != "MSW"; then
-        if test "$wxUSE_ODBC" = "yes" ; then
-            ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
-        fi
+    if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
      fi
      fi
-
-    if test "$wxUSE_LIBJPEG" = "yes" ; then
+    if test "$wxUSE_LIBJPEG" = "builtin" ; then
          ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
      fi
          ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
      fi
-    if test "$wxUSE_LIBTIFF" = "yes" ; then
+    if test "$wxUSE_LIBTIFF" = "builtin" ; then
          ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)"
      fi
          ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)"
      fi
-    if test "$wxUSE_LIBPNG" = "yes" ; then
+    if test "$wxUSE_LIBPNG" = "builtin" ; then
          ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
      fi
          ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
      fi
-    if test "$wxUSE_ZLIB" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
-    fi
-    if test "$wxUSE_FREETYPE" = "yes" ; then
+    if test "$wxUSE_FREETYPE" = "builtin" ; then
          ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
      fi
  
          ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
      fi
  
-    dnl collect all .d files together as well
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS) \$(UNIVDEPS)"
-    else
-        ALL_DEPFILES="\$(GUIDEPS)"
-    fi
-
-    ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS)"
-
-    if test "$TOOLKIT" != "MSW"; then
-        ALL_DEPFILES="${ALL_DEPFILES} \$(UNIXDEPS)"
-    fi
-
-    if test "$wxUSE_HTML" = "yes"; then
-        ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)"
-    fi
-
-    dnl misc other files depending on the port
-    PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
-    fi
-    RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
-    RPM_SPEC="wx\$(TOOLKIT).spec"
-
      dnl distribute samples/demos/utils with GUI versions
      GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
      DISTDIR="wx\$(TOOLKIT)"
  else
      USE_GUI=0
  
      dnl distribute samples/demos/utils with GUI versions
      GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
      DISTDIR="wx\$(TOOLKIT)"
  else
      USE_GUI=0
  
-    dnl this may be (almost) unneccesary for wxBase now we use TOOLKIT_NAME
+    dnl this doesn't quite work right for wxBase, but the places
+    dnl where it is wrong aren't fatal (yet) though.
      TOOLKIT_DIR="base"
  
      TOOLKIT_DIR="base"
  
-    dnl the base name of the library and wxXXX-config files
-    if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-        TOOLKIT_NAME="${TOOLKIT_DIR}d"
+    dnl the sources, their dependenices and the headers
+    if test "$USE_WIN32" = 1 ; then
+        ALL_OBJECTS="\${BASE_OBJS} \${BASE_MSW_OBJS}"
+        TOOLKIT_VPATH="\${top_srcdir}/src/msw"
+
+        dnl yes, the toolkit for wxBase on win32 is actually MSW
+        dnl wxBase on unix does not need a 'TOOLKIT' defined.
+        TOOLKIT="MSW"
      else
      else
-        TOOLKIT_NAME="${TOOLKIT_DIR}"
+        ALL_OBJECTS="\${BASE_OBJS} \${BASE_UNIX_OBJS}"
+        TOOLKIT_VPATH="\${top_srcdir}/src/unix"
      fi
  
      fi
  
-    TOOLKIT_DEF="-D__WXBASE__"
+    PORT_FILES="\${top_srcdir}/src/files.lst"
  
  
-    dnl the sources, their dependenices and the headers
-    ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)"
-    ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)"
+    dnl distribute only wxBase sources/headers
+    GUIDIST="BASE_DIST"
+    DISTDIR="wxBase"
+fi
+
+dnl ---------------------------------------------------------------------------
+dnl Optional libraries included when system library is not used
+dnl ---------------------------------------------------------------------------
+if test "$wxUSE_REGEX" = "builtin" ; then
+    ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+fi
+if test "$wxUSE_ZLIB" = "builtin" ; then
+    ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+fi
  
  
-    if test "$wxUSE_ZLIB" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+dnl ---------------------------------------------------------------------------
+dnl OpenGL libraries
+dnl ---------------------------------------------------------------------------
+if test "$wxUSE_OPENGL" = "yes"; then
+    if test "$wxUSE_MAC" = 1; then
+        OPENGL_LIBS="-framework OpenGL -framework AGL"
+    else
+
+        AC_CHECK_HEADER(GL/gl.h,
+            [
+                AC_MSG_CHECKING([for -lGL])
+                WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],[GL])
+                if test "$ac_find_libraries" != "" ; then
+                    WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                    LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+                    OPENGL_LIBS="-lGL -lGLU"
+                    AC_MSG_RESULT([yes])
+                else
+                    AC_MSG_RESULT([no])
+                    AC_MSG_CHECKING([for -lMesaGL])
+                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],[MesaGL])
+                    if test "$ac_find_libraries" != "" ; then
+                        WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                        LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+                        OPENGL_LIBS="-lMesaGL -lMesaGLU"
+                        AC_MSG_RESULT([yes])
+                    else
+                        AC_MSG_RESULT([no])
+                    fi
+                fi
+            ])
+
+    dnl check for OpenGL libs availability first
+    dnl -lGL requires -lm with soem OpenGL versions
+
+#    AC_CHECK_HEADER(GL/gl.h,
+#        [
+#            AC_CHECK_LIB(GL, glFlush,
+#                [
+#                    OPENGL_LIBS="-lGL -lGLU"
+#                ],
+#                [
+#                    AC_CHECK_LIB(MesaGL, glFlush,
+#                        [
+#                            OPENGL_LIBS="-lMesaGL -lMesaGLU"
+#                        ],
+#                        [],
+#                        [-lm])
+#                ],
+#                [-lm])
+#        ])
+
+        if test "x$OPENGL_LIBS" = "x"; then
+            dnl it should be an error and not a warning because OpenGL is not on
+            dnl by default and so if it had been explicitely requested, we
+            dnl shouldn't just fall back to compiling the library without it
+            AC_MSG_ERROR(OpenGL libraries not available)
+        fi
+    fi
+
+    if test "$wxUSE_OPENGL" = "yes"; then
+        AC_DEFINE(wxUSE_OPENGL)
+        AC_DEFINE(wxUSE_GLCANVAS)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
      fi
      fi
+fi
+
+if test -z "$TOOLKIT_VPATH" ; then
+    TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
+fi
  
  
-    dnl building wxBase only
-    WX_LIBRARY="wx_${TOOLKIT_NAME}"
+dnl the symbol which allows conditional compilation for the given toolkit
+if test -n "$TOOLKIT" ; then
+    TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__"
+fi
  
  
-    PORT_FILES="src/files.lst"
-    RPM_FILES="src/rpmfiles.lst"
-    RPM_SPEC="wxBase.spec"
+lib_unicode_suffix=
+if test "$wxUSE_UNICODE" = "yes"; then
+    lib_unicode_suffix=u
+fi
  
  
-    dnl distribute only wxBase sources/headers
-    GUIDIST="BASE_DIST"
-    DISTDIR="wxBase"
+lib_debug_suffix=
+if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+    lib_debug_suffix=d
  fi
  
  fi
  
-dnl the name of the (libtool) library
-WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
-WX_LIBRARY_NAME_GL="lib${WX_LIBRARY}_gl.la"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
  
  
-dnl the name of the static library
-WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
-WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
+if test "$cross_compiling" = "yes"; then
+    TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
+    TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"
+fi
+
+dnl library link name
+WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
+WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
  
  dnl the name of the shared library
  
  dnl the name of the shared library
-WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
  
  dnl the name of the links to the shared library
  
  dnl the name of the links to the shared library
-WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
-WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
-WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
-WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
-
-dnl shared library settings
-SHARED_LD=
-PIC_FLAG=
-WX_ALL=
-WX_ALL_INSTALLED=
-BURNT_LIBRARY_NAME=
-WX_TARGET_LIBRARY_SONAME=
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}"
+WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
+WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+
+dnl the name of the resources file for wxMac
+WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
+WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
+
+case "${host}" in
+    *-*-cygwin* | *-*-mingw32* )
+
+        dnl If we are cross compiling we want to use the 'full' unix type name for the
+        dnl lib, but for a native install use the windows style naming convention.
+        dnl (excepting again that we strip the ELF style version numbers off it).
+
+        dnl FIXME: is this GL stuff actually even used for wxMSW?  should it be??
+
+        if test "$cross_compiling" != "yes"; then
+            WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
+            WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
+            WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
+            WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
+        else
+            WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
+            WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+        fi
+
+esac
+
+dnl the name of the static library
+WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
+
+dnl define which libs wx-config should link.
+WXCONFIG_LIBS="-l${WX_LIBRARY}"
+WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a"
+
+if test "$wxUSE_OPENGL" = "yes"; then
+    WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
+    WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}"
+fi
+
  
  dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
  
  if test "$wxUSE_SHARED" = "yes"; then
  
  dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
  
  if test "$wxUSE_SHARED" = "yes"; then
+
+    dnl install targets
+    if test "$wxUSE_OPENGL" = "yes"; then
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}"
+    else
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}"
+    fi
+
+    dnl the extra compiler flags needed for compilation of shared library
+    if test "$GCC" = "yes"; then
+        dnl the switch for gcc is the same under all platforms
+        PIC_FLAG="-fPIC"
+    fi
+
+    dnl the command to use for creating the shared library
+    SHARED_LD="${CXX} -shared -o"
+
      case "${host}" in
        *-hp-hpux* )
      case "${host}" in
        *-hp-hpux* )
-        if test "$GCC" = yes ; then
-            SHARED_LD="${CC} -shared -fPIC -o"
-            PIC_FLAG="-fPIC"
-        else
+        dnl default settings are good for gcc but not for the native HP-UX
+        if test "$GCC" != "yes"; then
              dnl no idea why it wants it, but it does
              dnl no idea why it wants it, but it does
-            LDFLAGS="-L/usr/lib"
+            LDFLAGS="$LDFLAGS -L/usr/lib"
  
              SHARED_LD="${CXX} -b -o"
              PIC_FLAG="+Z"
          fi
  
              SHARED_LD="${CXX} -b -o"
              PIC_FLAG="+Z"
          fi
-        WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_NAME}.sl"
-        WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_NAME}_gl.sl"
+
+        dnl install shared libs without symlinks
          if test "$wxUSE_OPENGL" = "yes"; then
              WX_ALL_INSTALLED="preinstall_gl"
          if test "$wxUSE_OPENGL" = "yes"; then
              WX_ALL_INSTALLED="preinstall_gl"
-            WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
          else
          else
-            WX_ALL="${WX_LIBRARY_NAME_SHARED}"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
          fi
        ;;
  
          fi
        ;;
  
-      dnl in fact, these settings are for any platform using gcc
        *-*-linux* )
        *-*-linux* )
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        if test "$wxUSE_BURNT_NAME" = "yes" ; then
-            BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
-            BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
+        if test "$GCC" != "yes"; then
+            AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc,
+            [
+                AC_TRY_COMPILE([],
+                    [
+                        #ifndef __INTEL_COMPILER
+                        #error Not icc
+                        #endif
+                    ],
+                    wx_cv_prog_icc=yes,
+                    wx_cv_prog_icc=no
+                )
+            ])
+            if test "$wx_cv_prog_icc" = "yes"; then
+                PIC_FLAG="-KPIC"
+            fi
+        fi
+
+        if test "$wxUSE_SONAME" = "yes" ; then
+            SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
+            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
              dnl substitute this in makelib.env for the contrib libs
              WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
          fi
              dnl substitute this in makelib.env for the contrib libs
              WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
          fi
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-        else
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-            WX_ALL="CREATE_LINKS"
-        fi
-      ;;
-      *-*-irix5* | *-*-irix6* )
-        if test "$GCC" = yes ; then
-           SHARED_LD="${CC} -shared -o"
-           PIC_FLAG="-fPIC"
-        else
-           SHARED_LD="${CXX} -shared -o"
-        fi
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-        else
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-            WX_ALL="CREATE_LINKS"
-        fi
        ;;
        ;;
+
        *-*-solaris2* )
          if test "$GCC" = yes ; then
        *-*-solaris2* )
          if test "$GCC" = yes ; then
-            SHARED_LD="${CC} -shared -o"
-            PIC_FLAG="-fPIC"
-
              dnl newer versions of gcc need -isystem to compile X headers on
              dnl Solaris (which use old style C syntax)
              CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
          else
              SHARED_LD="${CXX} -G -o"
              PIC_FLAG="-KPIC"
              dnl newer versions of gcc need -isystem to compile X headers on
              dnl Solaris (which use old style C syntax)
              CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
          else
              SHARED_LD="${CXX} -G -o"
              PIC_FLAG="-KPIC"
-        fi
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-        else
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-            WX_ALL="CREATE_LINKS"
-        fi
-      ;;
-      *-*-sunos4* )
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* )
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-        else
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-            WX_ALL="CREATE_LINKS"
+            SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
+            SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED}"
          fi
        ;;
          fi
        ;;
+
        *-*-darwin* )
        *-*-darwin* )
-        SHARED_LD="${CXX} -dynamiclib -o"
+        CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
+        CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
+        SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
          PIC_FLAG="-dynamic -fPIC"
          PIC_FLAG="-dynamic -fPIC"
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-        else
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-            WX_ALL="CREATE_LINKS"
-        fi
-        dnl add the resources target
-        WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
-        dnl the name of the shared library
-        WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-        dnl the name of the links to the shared library
-        WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}"
-        WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.dylib"
-        WX_LIBRARY_LINK3="lib${WX_LIBRARY}.dylib"
-        WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}"
-        WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
-        WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"
-      ;;
-      *-*-osf* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-dgux5* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-sysv5* )
-        SHARED_LD="${CC} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
        ;;
        ;;
+
        *-*-aix* )
          SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
        *-*-aix* )
          SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
-        WX_ALL=${WX_LIBRARY_NAME_SHARED}
-      ;;
-      *-*-cygwin* )
-        dnl only static for now
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-        WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="preinstall_gl"
-            WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
-        else
-            WX_ALL="${WX_LIBRARY_NAME_STATIC}"
-        fi
        ;;
        ;;
-      *-*-mingw32* )
-        dnl only static for now
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-        WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
+
+      *-*-cygwin* | *-*-mingw32* )
+
+        WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
+
+        SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
+        TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
+
+        PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
+
+        dnl install shared libs without symlinks
          if test "$wxUSE_OPENGL" = "yes"; then
              WX_ALL_INSTALLED="preinstall_gl"
          if test "$wxUSE_OPENGL" = "yes"; then
              WX_ALL_INSTALLED="preinstall_gl"
-            WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
          else
          else
-            WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
          fi
        ;;
          fi
        ;;
-      *-pc-os2_emx )
+
+      *-pc-os2_emx | *-pc-os2-emx )
          dnl only static for now
          dnl only static for now
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+        wxUSE_SHARED=no
        ;;
        ;;
+
        *-*-beos* )
          dnl can't use gcc under BeOS for shared library creation because it
          dnl complains about missing 'main'
          SHARED_LD="${LD} -shared -o"
        *-*-beos* )
          dnl can't use gcc under BeOS for shared library creation because it
          dnl complains about missing 'main'
          SHARED_LD="${LD} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
        ;;
        ;;
+
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-sunos4* | \
+      *-*-irix5* | *-*-irix6* | \
+      *-*-osf* | \
+      *-*-dgux5* | \
+      *-*-sysv5* )
+        dnl defaults are ok
+      ;;
+
        *)
        *)
-        AC_MSG_ERROR(unknown system type ${host}.)
+        AC_MSG_ERROR(unknown system type $host.)
      esac
  
      dnl set target to shared if not explicitly chose static before
      esac
  
      dnl set target to shared if not explicitly chose static before
@@ -2289,43 +2626,74 @@ if test "$wxUSE_SHARED" = "yes"; then
          WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
          WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
      fi
          WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
          WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
      fi
+
      dnl do not alter the LIBRARY_TYPE strings "so" and "a", they are magic
      WX_TARGET_LIBRARY_TYPE="so"
      dnl do not alter the LIBRARY_TYPE strings "so" and "a", they are magic
      WX_TARGET_LIBRARY_TYPE="so"
-else
-    dnl set target to static
-    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-    WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
+    INSTALL_LIBRARY='$(INSTALL_PROGRAM)'
+fi
  
  
-    if test "$wxUSE_OPENGL" = "yes"; then
-        WX_ALL_INSTALLED="preinstall_gl"
-        WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
-    else
-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
-    fi
+dnl do not 'else' this, it may be changed in the above conditional.
+if test "$wxUSE_SHARED" = "no"; then
  
  
-    dnl give static wxBase build a working install target
-    if test "$wxUSE_GUI" = "no"; then
+    dnl give static wxBase and wxMSW build a working install target
+    if test "$wxUSE_GUI" = "no" -o "$USE_WIN32" = 1 ; then
          dnl we're here because WX_ALL_INSTALLED is empty, but play safe anyway
          WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
      fi
  
          dnl we're here because WX_ALL_INSTALLED is empty, but play safe anyway
          WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
      fi
  
+    if test "$wxUSE_MAC" = 1; then
+        WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
+    fi
+
+    if test "$wxUSE_OPENGL" = "yes"; then
+        WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}"
+    else
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
+    fi
+
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+    WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
+
      WX_TARGET_LIBRARY_TYPE="a"
      WX_TARGET_LIBRARY_TYPE="a"
+    INSTALL_LIBRARY='$(INSTALL_DATA)'
+fi
+
+if test "$wxUSE_MAC" = 1; then
+    dnl add the resources target for wxMac
+    WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
+    WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
+    AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
+    AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
+    LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
+    LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
+    LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for headers
  dnl ------------------------------------------------------------------------
  
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for headers
  dnl ------------------------------------------------------------------------
  
-dnl defines HAVE_STRINGS_H (where some string functions live on AIX for example)
-AC_CHECK_HEADERS(strings.h)
+dnl do not check for strings.h for wxMac
+dnl   it exists but is only a simple redirection to string.h
+dnl   it is in conflict with Strings.h in FlatCarbon headers
+if test "$wxUSE_MAC" != 1; then
+  dnl defines HAVE_STRINGS_H (where some string functions live on AIX for example)
+  AC_CHECK_HEADERS(strings.h)
+fi
+
  dnl defines HAVE_STDLIB_H
  AC_CHECK_HEADERS(stdlib.h)
  dnl defines HAVE_STDLIB_H
  AC_CHECK_HEADERS(stdlib.h)
+dnl defines HAVE_MALLOC_H
+AC_CHECK_HEADERS(malloc.h)
  dnl defines HAVE_UNISTD_H
  AC_CHECK_HEADERS(unistd.h)
  dnl defines HAVE_WCHAR_H
  AC_CHECK_HEADERS(wchar.h)
  dnl defines HAVE_WCSTR_H
  AC_CHECK_HEADERS(wcstr.h)
  dnl defines HAVE_UNISTD_H
  AC_CHECK_HEADERS(unistd.h)
  dnl defines HAVE_WCHAR_H
  AC_CHECK_HEADERS(wchar.h)
  dnl defines HAVE_WCSTR_H
  AC_CHECK_HEADERS(wcstr.h)
+dnl defined HAVE_WCTYPE_H
+AC_CHECK_HEADERS(wctype.h)
  dnl defines HAVE_FNMATCH_H
  AC_CHECK_HEADERS(fnmatch.h)
  dnl defines HAVE_ICONV_H (Unix98 encoding conversion routines)
  dnl defines HAVE_FNMATCH_H
  AC_CHECK_HEADERS(fnmatch.h)
  dnl defines HAVE_ICONV_H (Unix98 encoding conversion routines)
@@ -2356,23 +2724,29 @@ dnl   defines uid_t and gid_t if not already defined
  AC_TYPE_UID_T
  
  dnl   check for wchar_t
  AC_TYPE_UID_T
  
  dnl   check for wchar_t
+dnl   Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
+dnl   on Cygwin wchar.h needs stddef.h to be #included by hand
  AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
  [
  AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
  [
-    AC_TRY_COMPILE([#include <wchar.h>],
+    AC_TRY_COMPILE(
+        [
+            #ifdef HAVE_WCHAR_H
+            #  ifdef __CYGWIN__
+            #    include <stddef.h>
+            #  endif
+            #  include <wchar.h>
+            #endif
+            #ifdef HAVE_STDLIB_H
+            #  include <stdlib.h>
+            #endif
+        ],
          [
              wchar_t wc, *ws;
              wc = L'a';
              ws = L"Hello, world!";
          ],
          wx_cv_type_wchar_t=yes,
          [
              wchar_t wc, *ws;
              wc = L'a';
              ws = L"Hello, world!";
          ],
          wx_cv_type_wchar_t=yes,
-        AC_TRY_COMPILE([#include <stdlib.h>],
-            [
-                wchar_t wc, *ws;
-                wc = L'a';
-                ws = L"Hello, world!";
-            ],
-        wx_cv_type_wchar_t=yes,
-        wx_cv_type_wchar_t=no)
+        wx_cv_type_wchar_t=no
      )
  ])
  
      )
  ])
  
@@ -2477,13 +2851,16 @@ AC_CHECK_SIZEOF(long, 4)
  AC_CHECK_SIZEOF(long long, 0)
  
  dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
  AC_CHECK_SIZEOF(long long, 0)
  
  dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
-dnl wchar_t an AC_CHECK_SIZEOF only includes stdio.h
+dnl wchar_t and AC_CHECK_SIZEOF only includes stdio.h
  dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
  AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
  [
      AC_TRY_RUN(
          [
              #ifdef HAVE_WCHAR_H
  dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
  AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
  [
      AC_TRY_RUN(
          [
              #ifdef HAVE_WCHAR_H
+            #  ifdef __CYGWIN__
+            #    include <stddef.h>
+            #  endif
              #  include <wchar.h>
              #endif
              #ifdef HAVE_STDLIB_H
              #  include <wchar.h>
              #endif
              #ifdef HAVE_STDLIB_H
@@ -2522,34 +2899,43 @@ dnl ---------------------------------------------------------------------------
  dnl check for wcslen
  AC_CHECK_LIB(c, wcslen, [
              AC_DEFINE(HAVE_WCSLEN)
  dnl check for wcslen
  AC_CHECK_LIB(c, wcslen, [
              AC_DEFINE(HAVE_WCSLEN)
-            WCHAR_LINK=""
+            WCHAR_LINK=
          ], [
              AC_CHECK_LIB(w, wcslen, [
                  AC_DEFINE(HAVE_WCSLEN)
          ], [
              AC_CHECK_LIB(w, wcslen, [
                  AC_DEFINE(HAVE_WCSLEN)
-                WCHAR_LINK="-lw"
+                WCHAR_LINK=" -lw"
+            ], [
+                AC_CHECK_LIB(msvcrt, wcslen, [
+                    AC_DEFINE(HAVE_WCSLEN)
+                    WCHAR_LINK=
+                ])
              ])
          ])
  
              ])
          ])
  
+dnl use wcsrtombs instead of wcstombs which is buggy in old GNU libc versions
+dnl if possible
+AC_CHECK_FUNCS(wcsrtombs)
+
  dnl check for vprintf/vsprintf() which are GNU extensions
  AC_FUNC_VPRINTF
  
  dnl check for vprintf/vsprintf() which are GNU extensions
  AC_FUNC_VPRINTF
  
-
  dnl check for vsscanf() and vsnprintf() - on some platforms (Linux, glibc
  dnl 2.1.1 for the first one, HP-UX for the second) it's available in the
  dnl check for vsscanf() and vsnprintf() - on some platforms (Linux, glibc
  dnl 2.1.1 for the first one, HP-UX for the second) it's available in the
-dnl library but the prototype is missing, so we can't use AC_CHECK_FUNCS here,
-dnl do it manually
+dnl library but the prototype is missing, so we can't use AC_CHECK_FUNCS() here,
+dnl do it manually. We can't use AC_TRY_COMPILE(), either, because it doesn't
+dnl check if the symbol is available at linking time
  
  
-dnl we use AC_TRY_COMPILE() here instead of AC_TRY_RUN() to make the checks
-dnl work for cross-compilation, but AC_TRY_COMPILE() normally only compiles
+dnl we use AC_TRY_LINK() here instead of AC_TRY_RUN() to make the checks
+dnl work for cross-compilation, but AC_TRY_LINK() normally only compiles
  dnl one function while we need at least 2 - hence the ugly hack below. To
  dnl one function while we need at least 2 - hence the ugly hack below. To
-dnl understand why it works, remember that AC_TRY_COMPILE() just prepends
+dnl understand why it works, remember that AC_TRY_LINK() just prepends
  dnl "int main() {" in the beginning of the code and "; return 0; }" at the
  dnl end...
  
  dnl if we fail to find vsnprintf, also try for _vsnprintf as that is what
  dnl we'll find under MSW if it exists.
  
  dnl "int main() {" in the beginning of the code and "; return 0; }" at the
  dnl end...
  
  dnl if we fail to find vsnprintf, also try for _vsnprintf as that is what
  dnl we'll find under MSW if it exists.
  
-dnl final note: AC_TRY_COMPILE will only be executed if there is nothing in
+dnl final note: AC_TRY_LINK will only be executed if there is nothing in
  dnl the cache so we have to do AC_DEFINE(HAVE_VSNPRINTF) below and not inside
  dnl it or the symbol wouldn't be defined for the 2nd and subsequent configure
  dnl runs
  dnl the cache so we have to do AC_DEFINE(HAVE_VSNPRINTF) below and not inside
  dnl it or the symbol wouldn't be defined for the 2nd and subsequent configure
  dnl runs
@@ -2557,7 +2943,7 @@ dnl runs
  dnl check for vsnprintf() - a safe version of vsprintf()
  AC_CACHE_CHECK([for vsnprintf], wx_cv_func_vsnprintf,
  [
  dnl check for vsnprintf() - a safe version of vsprintf()
  AC_CACHE_CHECK([for vsnprintf], wx_cv_func_vsnprintf,
  [
-  AC_TRY_COMPILE([
+  AC_TRY_LINK([
                      #include <stdio.h>
                      #include <stdarg.h>
                   ], [
                      #include <stdio.h>
                      #include <stdarg.h>
                   ], [
@@ -2578,7 +2964,7 @@ AC_CACHE_CHECK([for vsnprintf], wx_cv_func_vsnprintf,
                   ], [
                      wx_cv_func_vsnprintf=yes
                   ], [
                   ], [
                      wx_cv_func_vsnprintf=yes
                   ], [
-                    AC_TRY_COMPILE([
+                    AC_TRY_LINK([
                                        #include <stdio.h>
                                        #include <stdarg.h>
                                     ], [
                                        #include <stdio.h>
                                        #include <stdarg.h>
                                     ], [
@@ -2607,7 +2993,7 @@ AC_CACHE_CHECK([for vsnprintf], wx_cv_func_vsnprintf,
  if test "$wx_cv_func_vsnprintf" = yes; then
      AC_DEFINE(HAVE_VSNPRINTF)
  else
  if test "$wx_cv_func_vsnprintf" = yes; then
      AC_DEFINE(HAVE_VSNPRINTF)
  else
-    AC_MSG_WARN(unsafe function sprintf will be used instead of snprintf)
+    AC_MSG_WARN(unsafe function vsprintf will be used instead of vsnprintf)
  fi
  
  dnl check for vsscanf()
  fi
  
  dnl check for vsscanf()
@@ -2702,6 +3088,70 @@ fi
  dnl check for vfork() (even if it's the same as fork() in modern Unices)
  AC_CHECK_FUNCS(vfork)
  
  dnl check for vfork() (even if it's the same as fork() in modern Unices)
  AC_CHECK_FUNCS(vfork)
  
+dnl check for the function for temp files creation
+AC_CHECK_FUNCS(mkstemp mktemp, break)
+
+dnl get the library function to use for wxGetDiskSpace(): it is statfs() under
+dnl Linux and *BSD and statvfs() under Solaris
+AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
+    AC_TRY_COMPILE(
+        [
+             #if defined(__BSD__)
+               #include <sys/param.h>
+               #include <sys/mount.h>
+             #else
+               #include <sys/vfs.h>
+             #endif
+        ],
+        [
+             long l;
+             struct statfs fs;
+             statfs("/", &fs);
+             l = fs.f_bsize;
+             l += fs.f_blocks;
+             l += fs.f_bavail;
+        ],
+        [
+             wx_cv_func_statfs=yes
+        ],
+        [
+             wx_cv_func_statfs=no
+        ]
+    )
+)
+
+if test "$wx_cv_func_statfs" = "yes"; then
+    AC_DEFINE(HAVE_STATFS)
+else
+    AC_CACHE_CHECK(for statvfs, wx_cv_func_statvfs,
+        AC_TRY_COMPILE(
+            [
+                 #include <sys/statvfs.h>
+            ],
+            [
+                 long l;
+                 struct statvfs fs;
+                 statvfs("/", &fs);
+                 l = fs.f_bsize;
+                 l += fs.f_blocks;
+                 l += fs.f_bavail;
+            ],
+            [
+                 wx_cv_func_statvfs=yes
+            ],
+            [
+                 wx_cv_func_statvfs=no
+            ]
+        )
+    )
+
+    if test "$wx_cv_func_statvfs" = "yes"; then
+        AC_DEFINE(HAVE_STATVFS)
+    else
+        AC_MSG_WARN([wxGetDiskSpace() function won't work without statfs()])
+    fi
+fi
+
  dnl check for fcntl() or at least flock() needed by Unix implementation of
  dnl wxSingleInstanceChecker
  if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
  dnl check for fcntl() or at least flock() needed by Unix implementation of
  dnl wxSingleInstanceChecker
  if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
@@ -2727,7 +3177,7 @@ if test "$USE_BEOS" = 1; then
      HAVE_SOME_SLEEP_FUNC=1
  fi
  
      HAVE_SOME_SLEEP_FUNC=1
  fi
  
-if test "$USE_MAC" = 1; then
+if test "$USE_DARWIN" = 1; then
      dnl Mac OS X has both nanosleep and usleep
      dnl but only usleep is defined in unistd.h
      AC_DEFINE(HAVE_USLEEP)
      dnl Mac OS X has both nanosleep and usleep
      dnl but only usleep is defined in unistd.h
      AC_DEFINE(HAVE_USLEEP)
@@ -2743,7 +3193,7 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
              AC_CHECK_LIB(posix4, nanosleep,
                  [
                      AC_DEFINE(HAVE_NANOSLEEP)
              AC_CHECK_LIB(posix4, nanosleep,
                  [
                      AC_DEFINE(HAVE_NANOSLEEP)
-                    POSIX4_LINK="-lposix4"
+                    POSIX4_LINK=" -lposix4"
                  ],
                  [
                      AC_CHECK_FUNCS(usleep,
                  ],
                  [
                      AC_CHECK_FUNCS(usleep,
@@ -2792,7 +3242,7 @@ AC_CHECK_FUNCS(inet_aton,
  
  if test "x$INET_LINK" != "x"; then
      AC_DEFINE(HAVE_INET_ADDR)
  
  if test "x$INET_LINK" != "x"; then
      AC_DEFINE(HAVE_INET_ADDR)
-    INET_LINK="-l$INET_LINK"
+    INET_LINK=" -l$INET_LINK"
  fi
  
  fi
  fi
  
  fi
@@ -2812,194 +3262,204 @@ dnl ---------------------------------------------------------------------------
  dnl under MSW we always have thread support
  if test "$TOOLKIT" != "MSW"; then
  
  dnl under MSW we always have thread support
  if test "$TOOLKIT" != "MSW"; then
  
-dnl the code below:
-dnl   defines THREADS_OBJ which contains the object files to build
-dnl   defines THREADS_LINK which contains the thread library to link with
-dnl   defines wxUSE_THREADS=1 if thread support is activated
-
-THREADS_LINK=""
-THREADS_OBJ=""
-
-if test "$wxUSE_THREADS" = "yes" ; then
-    if test "$wxUSE_WINE" = 1 ; then
-        AC_MSG_WARN([Threads are not supported under WINE])
-        wxUSE_THREADS="no"
-    elif test "$USE_BEOS" = 1; then
-        AC_MSG_WARN([BeOS threads are not yet supported])
-        wxUSE_THREADS="no"
+    dnl the code below:
+    dnl   defines THREADS_OBJ which contains the object files to build
+    dnl   defines THREADS_LINK which contains the thread library to link with
+    dnl   defines wxUSE_THREADS=1 if thread support is activated
+
+    THREADS_LINK=
+    THREADS_OBJ=
+    CODE_GEN_FLAGS=
+    CODE_GEN_FLAGS_CXX=
+
+    if test "$wxUSE_THREADS" = "yes" ; then
+        if test "$wxUSE_WINE" = 1 ; then
+            AC_MSG_WARN([Threads are not supported under WINE... disabled])
+            wxUSE_THREADS="no"
+        elif test "$USE_BEOS" = 1; then
+            AC_MSG_WARN([BeOS threads are not yet supported... disabled])
+            wxUSE_THREADS="no"
+        fi
      fi
      fi
-fi
  
  
-if test "$wxUSE_THREADS" = "yes" ; then
-    dnl find if POSIX threads are available
+    if test "$wxUSE_THREADS" = "yes" ; then
+        dnl find if POSIX threads are available
  
  
-    dnl AIX calls the library libpthreads - thanks IBM!
-    if test "$USE_AIX" = 1; then
-        THREADS_LIB=pthreads
-    else
-        THREADS_LIB=pthread
-    fi
+        dnl AIX calls the library libpthreads - thanks IBM!
+        if test "$USE_AIX" = 1; then
+            THREADS_LIB=pthreads
+        else
+            THREADS_LIB=pthread
+        fi
  
  
-    dnl standard lib name is pthread
-    dnl We no longer test for pthread-0.7 as it breaks compilation on some
-    dnl glibc2 systems, especially for static linkage.
-    AC_CHECK_LIB($THREADS_LIB, pthread_create, [
-            THREADS_OBJ="threadpsx.lo"
-            THREADS_LINK=$THREADS_LIB
-        ], [
-            dnl thread functions are in libc_r under FreeBSD
-            AC_CHECK_LIB(c_r, pthread_create, [
+        dnl standard lib name is pthread
+        dnl We no longer test for pthread-0.7 as it breaks compilation on some
+        dnl glibc2 systems, especially for static linkage.
+        AC_CHECK_LIB($THREADS_LIB, pthread_create, [
                  THREADS_OBJ="threadpsx.lo"
                  THREADS_OBJ="threadpsx.lo"
-                THREADS_LINK="c_r"
+                THREADS_LINK=$THREADS_LIB
              ], [
              ], [
-                dnl VZ: SGI threads are not supported currently
-                AC_CHECK_HEADER(sys/prctl.h, [
-                    THREADS_OBJ="threadsgi.lo"
+                dnl thread functions are in libc_r under FreeBSD
+                AC_CHECK_LIB(c_r, pthread_create, [
+                    THREADS_OBJ="threadpsx.lo"
+                    THREADS_LINK="c_r"
+                ], [
+                    dnl VZ: SGI threads are not supported currently
+                    AC_CHECK_HEADER(sys/prctl.h, [
+                        THREADS_OBJ="threadsgi.lo"
+                    ])
                  ])
              ])
                  ])
              ])
-        ])
  
  
-    if test -z "$THREADS_OBJ" ; then
-        wxUSE_THREADS=no
-        AC_MSG_WARN(No thread support on this system)
+        if test -z "$THREADS_OBJ" ; then
+            wxUSE_THREADS=no
+            AC_MSG_WARN([No thread support on this system... disabled])
+        fi
      fi
      fi
-fi
  
  
-dnl do other tests only if we are using threads
-if test "$wxUSE_THREADS" = "yes" ; then
-  AC_CHECK_FUNCS(thr_setconcurrency)
-
-  dnl define autoconf macro to check for given function in both pthread and
-  dnl posix4 libraries
-  dnl usage: AC_FUNC_THREAD(FUNCTION_NAME)
-  dnl VZ: TODO
-  dnl AC_DEFUN(AC_FUNC_THREAD,
-  dnl [
-  dnl     AC_CHECK_LIB($THREADS_LINK, $1,
-  dnl            AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'),
-  dnl            [AC_CHECK_LIB([posix4], $1,
-  dnl                [AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'))
-  dnl                 POSIX4_LINK="-lposix4"
-  dnl             ])
-  dnl            ])
-  dnl ])
-
-  AC_CHECK_HEADERS(sched.h)
-
-  AC_CHECK_LIB($THREADS_LINK, sched_yield,
-               AC_DEFINE(HAVE_SCHED_YIELD),
-               [AC_CHECK_LIB([posix4], sched_yield,
-                   [AC_DEFINE(HAVE_SCHED_YIELD) POSIX4_LINK="-lposix4"],
-                   AC_MSG_WARN(wxThread::Yield will not work properly)
-                )]
-               )
-
-  dnl to be able to set the thread priority, we need to have all of the
-  dnl following functions:
-  dnl   1. pthread_attr_getschedpolicy
-  dnl   2. sched_get_priority_min and sched_get_priority_max
-  dnl      (this one can be in either libpthread or libposix4 (under Solaris))
-  dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
-  HAVE_PRIOR_FUNCS=0
-  AC_CHECK_LIB($THREADS_LINK, pthread_attr_getschedpolicy,
-                 AC_CHECK_LIB($THREADS_LINK, pthread_attr_setschedparam,
-                   AC_CHECK_LIB($THREADS_LINK, sched_get_priority_max,
-                       HAVE_PRIOR_FUNCS=1,
-                       AC_CHECK_LIB([posix4], sched_get_priority_max,
-                         [
-                            HAVE_PRIOR_FUNCS=1
-                            POSIX4_LINK="-lposix4"
-                         ],
+    dnl do other tests only if we are using threads
+    if test "$wxUSE_THREADS" = "yes" ; then
+      AC_CHECK_FUNCS(thr_setconcurrency)
+
+      dnl define autoconf macro to check for given function in both pthread and
+      dnl posix4 libraries
+      dnl usage: AC_FUNC_THREAD(FUNCTION_NAME)
+      dnl VZ: TODO
+      dnl AC_DEFUN(AC_FUNC_THREAD,
+      dnl [
+      dnl     AC_CHECK_LIB($THREADS_LINK, $1,
+      dnl            AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'),
+      dnl            [AC_CHECK_LIB([posix4], $1,
+      dnl                [AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'))
+      dnl                 POSIX4_LINK=" -lposix4"
+      dnl             ])
+      dnl            ])
+      dnl ])
+
+      AC_CHECK_HEADERS(sched.h)
+
+      AC_CHECK_LIB($THREADS_LINK, sched_yield,
+                   AC_DEFINE(HAVE_SCHED_YIELD),
+                   [AC_CHECK_LIB([posix4], sched_yield,
+                       [AC_DEFINE(HAVE_SCHED_YIELD) POSIX4_LINK=" -lposix4"],
+                       AC_MSG_WARN(wxThread::Yield will not work properly)
+                    )]
+                   )
+
+      dnl to be able to set the thread priority, we need to have all of the
+      dnl following functions:
+      dnl   1. pthread_attr_getschedpolicy
+      dnl   2. sched_get_priority_min and sched_get_priority_max
+      dnl      (this one can be in either libpthread or libposix4 (under Solaris))
+      dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
+      HAVE_PRIOR_FUNCS=0
+      AC_CHECK_LIB($THREADS_LINK, pthread_attr_getschedpolicy,
+                     AC_CHECK_LIB($THREADS_LINK, pthread_attr_setschedparam,
+                       AC_CHECK_LIB($THREADS_LINK, sched_get_priority_max,
+                           HAVE_PRIOR_FUNCS=1,
+                           AC_CHECK_LIB([posix4], sched_get_priority_max,
+                             [
+                                HAVE_PRIOR_FUNCS=1
+                                POSIX4_LINK=" -lposix4"
+                             ],
+                           )
                         )
                         )
+                     )
                     )
                     )
-                 )
-               )
  
  
-  if test "$HAVE_PRIOR_FUNCS" = 1; then
-    AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS)
-  else
-    AC_MSG_WARN(Setting thread priority will not work)
-  fi
+      if test "$HAVE_PRIOR_FUNCS" = 1; then
+        AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS)
+      else
+        AC_MSG_WARN(Setting thread priority will not work)
+      fi
  
  
-  AC_CHECK_LIB($THREADS_LINK, pthread_cancel,
-               AC_DEFINE(HAVE_PTHREAD_CANCEL),
-               AC_MSG_WARN([wxThread::Kill() will not work properly]))
+      AC_CHECK_LIB($THREADS_LINK, pthread_cancel,
+                   AC_DEFINE(HAVE_PTHREAD_CANCEL),
+                   AC_MSG_WARN([wxThread::Kill() will not work properly]))
  
  
-  AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup_push,
-  [
-    AC_TRY_COMPILE([#include <pthread.h>],
-                 [
-                    pthread_cleanup_push(NULL, NULL);
-                    pthread_cleanup_pop(0);
-                 ], [
-                    wx_cv_func_pthread_cleanup_push=yes
-                 ], [
-                    wx_cv_func_pthread_cleanup_push=no
-                 ])
-  ])
-
-  if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
-      AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
-  fi
+      AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup_push,
+      [
+        AC_TRY_COMPILE([#include <pthread.h>],
+                     [
+                        pthread_cleanup_push(NULL, NULL);
+                        pthread_cleanup_pop(0);
+                     ], [
+                        wx_cv_func_pthread_cleanup_push=yes
+                     ], [
+                        wx_cv_func_pthread_cleanup_push=no
+                     ])
+      ])
  
  
-  dnl mutexattr_t initialization is done in quite different ways on different
-  dnl platforms, so check for a few things:
-  dnl
-  dnl HAVE_MUTEX_RECURSIVE means that we can create recursive mutexes
-  dnl HAVE_MUTEXATTR_SETTYPE means that we do it using
-  dnl pthread_mutexattr_settype(PTHREAD_MUTEX_RECURSIVE) and if it is not
-  dnl defined, we do it by directly assigned
-  dnl PTHREAD_MUTEX_RECURSIVE_MUTEX_INITIALIZER_NP to attr
+      if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
+          AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
+      fi
  
  
-  AC_CACHE_CHECK([for pthread_mutexattr_t], wx_cv_type_pthread_mutexattr_t,
-  [
-    AC_TRY_COMPILE([#include <pthread.h>],
-        [
-           pthread_mutexattr_t attr;
-           pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-        ], [
-           wx_cv_type_pthread_mutexattr_t=yes
-        ], [
-           wx_cv_type_pthread_mutexattr_t=no
-        ]
-    )
-  ])
+      dnl mutexattr_t initialization is done in quite different ways on different
+      dnl platforms, so check for a few things:
+      dnl
+      dnl HAVE_MUTEX_RECURSIVE means that we can create recursive mutexes
+      dnl HAVE_MUTEXATTR_SETTYPE means that we do it using
+      dnl pthread_mutexattr_settype(PTHREAD_MUTEX_RECURSIVE) and if it is not
+      dnl defined, we do it by directly assigned
+      dnl PTHREAD_MUTEX_RECURSIVE_MUTEX_INITIALIZER_NP to attr
+
+      dnl we need _GNU_SOURCE to get PTHREAD_MUTEX_RECURSIVE with glibc 2.1+
+      dnl (strictly speaking we only need _XOPEN_SOURCE=500 but just defining
+      dnl this disables _BSD_SOURCE which breaks libtiff compilation, so it is
+      dnl simpler to just define _GNU_SOURCE to get everything)
+      if test "x$wx_lib_glibc21" = "xyes"; then
+          CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+      fi
  
  
-  if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
-    AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_T)
-  else
-    dnl don't despair, there may be another way to do it
-    AC_CACHE_CHECK([for PTHREAD_RECURSIVE_MUTEX_INITIALIZER],
-                   wx_cv_type_pthread_rec_mutex_init,
-    [
+      AC_CACHE_CHECK([for pthread_mutexattr_t], wx_cv_type_pthread_mutexattr_t,
+      [
          AC_TRY_COMPILE([#include <pthread.h>],
              [
          AC_TRY_COMPILE([#include <pthread.h>],
              [
-                pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+               pthread_mutexattr_t attr;
+               pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
              ], [
              ], [
-                wx_cv_type_pthread_rec_mutex_init=yes
+               wx_cv_type_pthread_mutexattr_t=yes
              ], [
              ], [
-                wx_cv_type_pthread_rec_mutex_init=no
+               wx_cv_type_pthread_mutexattr_t=no
              ]
          )
              ]
          )
-    ])
-    if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
-      AC_DEFINE(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
-    else
-      dnl this may break code working elsewhere, so at least warn about it
-      AC_MSG_WARN([wxMutex won't be recursive on this platform])
-    fi
-  fi
+      ])
+
+      if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
+        AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_T)
+      else
+        dnl don't despair, there may be another way to do it
+        AC_CACHE_CHECK([for PTHREAD_RECURSIVE_MUTEX_INITIALIZER],
+                       wx_cv_type_pthread_rec_mutex_init,
+        [
+            AC_TRY_COMPILE([#include <pthread.h>],
+                [
+                    pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+                ], [
+                    wx_cv_type_pthread_rec_mutex_init=yes
+                ], [
+                    wx_cv_type_pthread_rec_mutex_init=no
+                ]
+            )
+        ])
+        if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
+          AC_DEFINE(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
+        else
+          dnl this may break code working elsewhere, so at least warn about it
+          AC_MSG_WARN([wxMutex won't be recursive on this platform])
+        fi
+      fi
  
  
-  THREADS_LINK="-l$THREADS_LINK"
+      THREADS_LINK=" -l$THREADS_LINK"
  
  
-  dnl building MT programs under Solaris with the native compiler requires -mt
-  dnl switch
-  if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
-      CFLAGS="${CFLAGS} -mt"
-      CXXFLAGS="${CXXFLAGS} -mt"
-      LDFLAGS="${LDFLAGS} -mt"
-  fi
-fi
+      dnl building MT programs under Solaris with the native compiler requires -mt
+      dnl switch
+      if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
+          CPPFLAGS="$CFLAGS -mt"
+          CXXFLAGS="$CXXFLAGS -mt"
+          LDFLAGS="$LDFLAGS -mt"
+      fi
+    fi
  
  dnl from if !MSW
  fi
  
  dnl from if !MSW
  fi
@@ -3007,11 +3467,8 @@ fi
  if test "$wxUSE_THREADS" = "yes"; then
    AC_DEFINE(wxUSE_THREADS)
  
  if test "$wxUSE_THREADS" = "yes"; then
    AC_DEFINE(wxUSE_THREADS)
  
-  dnl must define _REENTRANT for multithreaded code except for Mac OS X
-  if test "$wxUSE_MAC" = "0"; then
-    CFLAGS="${CFLAGS} -D_REENTRANT"
-    CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
-  fi
+  dnl we must define _REENTRANT or something along these lines for MT code
+  TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS $CPP_MT_FLAG"
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
  else
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
  else
@@ -3020,8 +3477,7 @@ else
    if test "$ac_cv_func_strtok_r" = "yes"; then
      AC_MSG_CHECKING(if -D_REENTRANT is needed)
      if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
    if test "$ac_cv_func_strtok_r" = "yes"; then
      AC_MSG_CHECKING(if -D_REENTRANT is needed)
      if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
-        CFLAGS="${CFLAGS} -D_REENTRANT"
-        CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
          AC_MSG_RESULT(yes)
      else
          AC_MSG_RESULT(no)
          AC_MSG_RESULT(yes)
      else
          AC_MSG_RESULT(no)
@@ -3042,28 +3498,6 @@ if test "$WXGTK127" = 1 ; then
    AC_DEFINE_UNQUOTED(__WXGTK127__,$WXGTK127)
  fi
  
    AC_DEFINE_UNQUOTED(__WXGTK127__,$WXGTK127)
  fi
  
-if test "$WXWINE" = 1 ; then
-  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
-fi
-
-if test "$wxUSE_MAC" = 1 ; then
-  TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__POWERPC__ -DTARGET_CARBON"
-  CFLAGS="${CFLAGS} -fno-common -fpascal-strings"
-  CPPFLAGS="${CPPFLAGS} -cpp-precomp -fno-common -fpascal-strings"
-  AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
-  AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
-  RESCOMP=${REZ}
-  REZFLAGS="-d __UNIX__ -useDF"
-  DEREZFLAGS="Carbon.r -useDF"
-  RESFLAGS="Carbon.r -t APPL"
-  LIBWXMACRES="\$(LIBWX_MACRES)"
-  LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)"
-fi
-
-if test "$wxUSE_CYGWIN" = 1 ; then
-  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__"
-fi
-
  WXDEBUG=
  
  if test "$wxUSE_DEBUG_INFO" = "yes" ; then
  WXDEBUG=
  
  if test "$wxUSE_DEBUG_INFO" = "yes" ; then
@@ -3093,190 +3527,58 @@ if test "$wxUSE_MEM_TRACING" = "yes" ; then
  fi
  
  if test "$wxUSE_DMALLOC" = "yes" ; then
  fi
  
  if test "$wxUSE_DMALLOC" = "yes" ; then
-    DMALLOC_LINK="-ldmalloc"
+    DMALLOC_LIBS="-ldmalloc"
  fi
  
  PROFILE=
  if test "$wxUSE_PROFILE" = "yes" ; then
  fi
  
  PROFILE=
  if test "$wxUSE_PROFILE" = "yes" ; then
-    PROFILE="-pg"
+    PROFILE=" -pg"
  fi
  
  fi
  
-DEP_INFO_FLAGS=
-CODE_GEN_FLAGS=
-CODE_GEN_FLAGS_CXX=
-if test "$GCC" = yes ; then
+if test "$GCC" = "yes" ; then
      if test "$wxUSE_NO_RTTI" = "yes" ; then
      if test "$wxUSE_NO_RTTI" = "yes" ; then
-        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti"
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
      fi
      if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
      fi
      if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
-        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions"
-    fi
-    if test "$wxUSE_PERMISSIVE" = "yes" ; then
-       CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
-    fi
-    if test "$wxUSE_NO_DEPS" = "no" ; then
-        DEP_INFO_FLAGS="-MMD"
-    fi
-fi
-
-
-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
-if test "$wxUSE_OPTIMISE" = "no" ; then
-    OPTIMISE=
-else
-    if test "$GCC" = yes ; then
-        OPTIMISE="-O2"
-        case "${host}" in
-            i586-*-*|i686-*-* )
-            OPTIMISE="${OPTIMISE} "
-        ;;
-        esac
-    else
-        OPTIMISE="-O"
-    fi
-fi
-
-if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
-    AC_DEFINE(WXWIN_COMPATIBILITY_2)
-
-    WXWIN_COMPATIBILITY_2_2="yes"
-fi
-
-if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then
-    AC_DEFINE(WXWIN_COMPATIBILITY_2_2)
-fi
-
-dnl ---------------------------------------------------------------------------
-dnl Optional libraries
-dnl ---------------------------------------------------------------------------
-
-ZLIB_INCLUDE=
-if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
-  AC_DEFINE(wxUSE_ZLIB)
-  if test "$wxUSE_ZLIB" = "yes" ; then
-    ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
-  else
-    ZLIB_LINK=
-    AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, deflate, ZLIB_LINK="-lz"))
-    if test "x$ZLIB_LINK" = "x" ; then
-        AC_MSG_ERROR(system zlib compression library not found! Use --with-zlib=yes to use built-in zlib)
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions"
      fi
      fi
-  fi
-fi
-
-PNG_INCLUDE=
-if test "$wxUSE_LIBPNG" = "yes" -o "$wxUSE_LIBPNG" = "sys" ; then
-  AC_DEFINE(wxUSE_LIBPNG)
-  dnl for the check below to have a chance to succeed, we must already have
-  dnl libz somewhere
-  if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
-    AC_MSG_WARN([--with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead])
-    wxUSE_LIBPNG=yes
-  fi
-
-  if test "$wxUSE_LIBPNG" = "yes" ; then
-    PNG_INCLUDE="-I\${top_srcdir}/src/png"
-  else
-    PNG_LINK=
-    AC_CHECK_HEADER(png.h,
-                    AC_CHECK_LIB(png, png_check_sig,
-                                 PNG_LINK="-lpng",
-                                 ,
-                                 [-lz -lm])
-                   )
-    if test "x$PNG_LINK" = "x" ; then
-        AC_MSG_ERROR(system png library not found! Use --with-libpng=yes to use the built-in libpng)
-    fi
-  fi
-
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
-fi
-
-JPEG_INCLUDE=
-if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then
-  AC_DEFINE(wxUSE_LIBJPEG)
-  if test "$wxUSE_LIBJPEG" = "yes" ; then
-    JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
-  else
-    JPEG_LINK=
-    dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
-    dnl HAVE_STDLIB_H which are already defined and this provokes
-    dnl a compiler warning which configure considers as an error...
-    AC_MSG_CHECKING(for jpeglib.h)
-    AC_CACHE_VAL(ac_cv_header_jpeglib_h,
-        AC_TRY_COMPILE(
-            [
-                #undef HAVE_STDLIB_H
-                #include <stdio.h>
-                #include <jpeglib.h>
-            ],
-            [
-            ],
-            ac_cv_header_jpeglib_h=yes,
-            ac_cv_header_jpeglib_h=no
-        )
-    )
-    AC_MSG_RESULT($ac_cv_header_jpeglib_h)
-
-    if test "$ac_cv_header_jpeglib_h" = "yes"; then
-        AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK="-ljpeg")
+    if test "$wxUSE_PERMISSIVE" = "yes" ; then
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
      fi
      fi
-
-    if test "x$JPEG_LINK" = "x" ; then
-        AC_MSG_ERROR(system jpeg library not found! Use --with-libjpeg=yes to use the built-in one)
+    if test "$USE_WIN32" = 1 ; then
+        # I'm not even really sure what this was ever added to solve,
+        # but someone added it for mingw native builds, so I guess
+        # they had a reason, right??
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
      fi
      fi
-  fi
  fi
  
  fi
  
-TIFF_INCLUDE=
-if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then
-  AC_DEFINE(wxUSE_LIBTIFF)
-  if test "$wxUSE_LIBTIFF" = "yes" ; then
-    TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
-  else
-    TIFF_LINK=
-    AC_CHECK_HEADER(tiffio.h, AC_CHECK_LIB(tiff, TIFFError,
-                                           TIFF_LINK="-ltiff",
-                                           ,
-                                           -lm))
-    if test "x$TIFF_LINK" = "x" ; then
-        AC_MSG_ERROR(system tiff library not found! Use --with-libtiff=yes to use the built-in one)
+
+CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
+CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
+if test "$wxUSE_OPTIMISE" = "no" ; then
+    OPTIMISE=
+else
+    if test "$GCC" = yes ; then
+        OPTIMISE="-O2"
+        case "${host}" in
+            i586-*-*|i686-*-* )
+            OPTIMISE="${OPTIMISE} "
+        ;;
+        esac
+    else
+        OPTIMISE="-O"
      fi
      fi
-  fi
  fi
  
  fi
  
-FREETYPE_INCLUDE=
-if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then
-  AC_DEFINE(wxUSE_FREETYPE)
-  if test "$wxUSE_FREETYPE" = "yes" ; then
-    FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype"
-  else
-    FREETYPE_LINK=
-    AC_CHECK_HEADER(freetype.h,
-                    AC_CHECK_LIB(freetype, FT_Render_Glyph,
-                                 FREETYPE_LINK="-lfreetype",
-                                 ,
-                                 [-lm])
-                   )
-    if test "x$FREETYPE_LINK" = "x" ; then
-        AC_MSG_ERROR(system freetype library not found! Use --with-freetype=yes to use the built-in freetype)
-    fi
-  fi
+if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
+    AC_DEFINE(WXWIN_COMPATIBILITY_2)
+
+    WXWIN_COMPATIBILITY_2_2="yes"
  fi
  
  fi
  
-if test "$wxUSE_OPENGL" = "yes"; then
-  AC_CHECK_HEADER(GL/gl.h, [
-    AC_DEFINE(wxUSE_OPENGL)
-    AC_DEFINE(wxUSE_GLCANVAS)
-    AC_CHECK_LIB(GL, glFlush, [
-      OPENGL_LINK="-lGL -lGLU"
-    ],[
-        AC_CHECK_LIB(MesaGL, glFlush, [
-        OPENGL_LINK="-lMesaGL -lMesaGLU"
-      ],)
-     ],)
-    ],wxUSE_OPENGL=0)
+if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then
+    AC_DEFINE(WXWIN_COMPATIBILITY_2_2)
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -3381,9 +3683,13 @@ if test "$wxUSE_STD_IOSTREAM" = "yes"; then
    AC_DEFINE(wxUSE_STD_IOSTREAM)
  fi
  
    AC_DEFINE(wxUSE_STD_IOSTREAM)
  fi
  
+if test "$wxUSE_TEXTBUFFER" = "yes"; then
+    AC_DEFINE(wxUSE_TEXTBUFFER)
+fi
+
  if test "$wxUSE_TEXTFILE" = "yes"; then
  if test "$wxUSE_TEXTFILE" = "yes"; then
-  if test "$wxUSE_FILE" != "yes"; then
-    AC_MSG_WARN(wxTextFile requires wxFile and it won't be compiled without it)
+  if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
+    AC_MSG_WARN(wxTextFile requires wxFile and wxTextBuffer... disabled)
    else
      AC_DEFINE(wxUSE_TEXTFILE)
    fi
    else
      AC_DEFINE(wxUSE_TEXTFILE)
    fi
@@ -3391,7 +3697,7 @@ fi
  
  if test "$wxUSE_CONFIG" = "yes" ; then
    if test "$wxUSE_TEXTFILE" != "yes"; then
  
  if test "$wxUSE_CONFIG" = "yes" ; then
    if test "$wxUSE_TEXTFILE" != "yes"; then
-    AC_MSG_WARN(wxConfig requires wxTextFile and it won't be compiled without it)
+    AC_MSG_WARN(wxConfig requires wxTextFile... disabled)
    else
      AC_DEFINE(wxUSE_CONFIG)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
    else
      AC_DEFINE(wxUSE_CONFIG)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
@@ -3400,7 +3706,7 @@ fi
  
  if test "$wxUSE_INTL" = "yes" ; then
    if test "$wxUSE_FILE" != "yes"; then
  
  if test "$wxUSE_INTL" = "yes" ; then
    if test "$wxUSE_FILE" != "yes"; then
-    AC_MSG_WARN(I18n code requires wxFile and it won't be compiled without it)
+    AC_MSG_WARN(I18n code requires wxFile... disabled)
    else
      AC_DEFINE(wxUSE_INTL)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
    else
      AC_DEFINE(wxUSE_INTL)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
@@ -3410,6 +3716,18 @@ fi
  
  if test "$wxUSE_LOG" = "yes"; then
    AC_DEFINE(wxUSE_LOG)
  
  if test "$wxUSE_LOG" = "yes"; then
    AC_DEFINE(wxUSE_LOG)
+
+    if test "$wxUSE_LOGGUI" = "yes"; then
+      AC_DEFINE(wxUSE_LOGGUI)
+    fi
+
+    if test "$wxUSE_LOGWINDOW" = "yes"; then
+      AC_DEFINE(wxUSE_LOGWINDOW)
+    fi
+
+    if test "$wxUSE_LOGDIALOG" = "yes"; then
+      AC_DEFINE(wxUSE_LOG_DIALOG)
+    fi
  fi
  
  if test "$wxUSE_LONGLONG" = "yes"; then
  fi
  
  if test "$wxUSE_LONGLONG" = "yes"; then
@@ -3429,7 +3747,7 @@ if test "$wxUSE_STREAMS" = "yes" ; then
    AC_DEFINE(wxUSE_STREAMS)
  fi
  
    AC_DEFINE(wxUSE_STREAMS)
  fi
  
-dnl ------------------------------------------------------------------------
+dnl ---------------------------------------------------------------------------
  dnl time/date functions
  dnl ------------------------------------------------------------------------
  
  dnl time/date functions
  dnl ------------------------------------------------------------------------
  
@@ -3447,10 +3765,10 @@ if test "$wxUSE_DATETIME" = "yes"; then
                              ],
                              [
                                  int tz;
                              ],
                              [
                                  int tz;
-                                tz = __timezone;
+                                tz = timezone;
                              ],
                              [
                              ],
                              [
-                                wx_cv_var_timezone=__timezone
+                                wx_cv_var_timezone=timezone
                              ],
                              [
                                  AC_TRY_COMPILE(
                              ],
                              [
                                  AC_TRY_COMPILE(
@@ -3471,12 +3789,16 @@ if test "$wxUSE_DATETIME" = "yes"; then
                                              ],
                                              [
                                                  int tz;
                                              ],
                                              [
                                                  int tz;
-                                                tz = timezone;
+                                                tz = __timezone;
                                              ],
                                              [
                                              ],
                                              [
-                                                wx_cv_var_timezone=timezone
+                                                wx_cv_var_timezone=__timezone
                                              ],
                                              ],
-                                            AC_MSG_ERROR(no timezone variable)
+                                            [
+                                                if test "$USE_DOS" = 0 ; then
+                                                    AC_MSG_ERROR(no timezone variable)
+                                                fi
+                                            ]
                                          )
                                      ]
                                  )
                                          )
                                      ]
                                  )
@@ -3486,7 +3808,9 @@ if test "$wxUSE_DATETIME" = "yes"; then
      )
  
      dnl as we want $wx_cv_var_timezone to be expanded, use AC_DEFINE_UNQUOTED
      )
  
      dnl as we want $wx_cv_var_timezone to be expanded, use AC_DEFINE_UNQUOTED
-    AC_DEFINE_UNQUOTED(WX_TIMEZONE, $wx_cv_var_timezone)
+    if test "x$wx_cv_var_timezone" != x ; then
+        AC_DEFINE_UNQUOTED(WX_TIMEZONE, $wx_cv_var_timezone)
+    fi
  
      dnl check for localtime (it's POSIX, but the check can do no harm...)
      AC_CHECK_FUNCS(localtime)
  
      dnl check for localtime (it's POSIX, but the check can do no harm...)
      AC_CHECK_FUNCS(localtime)
@@ -3534,8 +3858,7 @@ if test "$wxUSE_DATETIME" = "yes"; then
                  ],
                  [
                      struct timeval tv;
                  ],
                  [
                      struct timeval tv;
-                    struct timezone tz;
-                    gettimeofday(&tv, &tz);
+                    gettimeofday(&tv, NULL);
                  ],
                  wx_cv_func_gettimeofday_has_2_args=yes,
                  AC_TRY_COMPILE(
                  ],
                  wx_cv_func_gettimeofday_has_2_args=yes,
                  AC_TRY_COMPILE(
@@ -3548,7 +3871,10 @@ if test "$wxUSE_DATETIME" = "yes"; then
                          gettimeofday(&tv);
                      ],
                      wx_cv_func_gettimeofday_has_2_args=no,
                          gettimeofday(&tv);
                      ],
                      wx_cv_func_gettimeofday_has_2_args=no,
-                    wx_cv_func_gettimeofday_has_2_args=unknown
+                    [
+                        AC_MSG_WARN([failed to determine number of gettimeofday() arguments])
+                        wx_cv_func_gettimeofday_has_2_args=unknown
+                    ]
                  )
              )
              AC_LANG_RESTORE
                  )
              )
              AC_LANG_RESTORE
@@ -3570,84 +3896,82 @@ dnl ------------------------------------------------------------------------
  dnl under MSW we always have sockets
  if test "$TOOLKIT" != "MSW"; then
  
  dnl under MSW we always have sockets
  if test "$TOOLKIT" != "MSW"; then
  
-if test "$wxUSE_SOCKETS" = "yes"; then
-    dnl under Solaris, socket functions live in -lsocket
-    AC_CHECK_FUNC(socket,,
-        AC_CHECK_LIB(socket, socket,
-            INET_LINK="$INET_LINK -lsocket",
-            [
-                AC_MSG_WARN([socket library not found - sockets will be disabled])
-                wxUSE_SOCKETS=no
-            ]
+    if test "$wxUSE_SOCKETS" = "yes"; then
+        dnl under Solaris, socket functions live in -lsocket
+        AC_CHECK_FUNC(socket,,
+            AC_CHECK_LIB(socket, socket,
+                INET_LINK="$INET_LINK -lsocket",
+                [
+                    AC_MSG_WARN([socket library not found - sockets will be disabled])
+                    wxUSE_SOCKETS=no
+                ]
+            )
          )
          )
-    )
-fi
+    fi
  
  
-dnl this test may be appropriate if building under cygwin
-dnl right now I'm assuming it also uses the winsock stuff
-dnl like mingw does..  -- RL
+    dnl this test may be appropriate if building under cygwin
+    dnl right now I'm assuming it also uses the winsock stuff
+    dnl like mingw does..  -- RL
  
  
-if test "$wxUSE_SOCKETS" = "yes" ; then
-    dnl determine the type of third argument for getsockname
-    AC_CACHE_CHECK([what is the type of the third argument of getsockname],
-                   wx_cv_type_getsockname3,
-        [
-            AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
+    if test "$wxUSE_SOCKETS" = "yes" ; then
+        dnl determine the type of third argument for getsockname
+        AC_CACHE_CHECK([what is the type of the third argument of getsockname],
+                       wx_cv_type_getsockname3,
+            [
+                AC_LANG_SAVE
+                AC_LANG_CPLUSPLUS
  
  
-            AC_TRY_COMPILE(
-                [
-                    #include <sys/types.h>
-                    #include <sys/socket.h>
-                ],
-                [
-                    socklen_t len;
-                    getsockname(0, 0, &len);
-                ],
-                wx_cv_type_getsockname3=socklen_t,
                  AC_TRY_COMPILE(
                      [
                          #include <sys/types.h>
                          #include <sys/socket.h>
                      ],
                      [
                  AC_TRY_COMPILE(
                      [
                          #include <sys/types.h>
                          #include <sys/socket.h>
                      ],
                      [
-                        size_t len;
+                        socklen_t len;
                          getsockname(0, 0, &len);
                      ],
                          getsockname(0, 0, &len);
                      ],
-                    wx_cv_type_getsockname3=size_t,
+                    wx_cv_type_getsockname3=socklen_t,
                      AC_TRY_COMPILE(
                          [
                              #include <sys/types.h>
                              #include <sys/socket.h>
                          ],
                          [
                      AC_TRY_COMPILE(
                          [
                              #include <sys/types.h>
                              #include <sys/socket.h>
                          ],
                          [
-                            int len;
+                            size_t len;
                              getsockname(0, 0, &len);
                          ],
                              getsockname(0, 0, &len);
                          ],
-                        wx_cv_type_getsockname3=int,
-                        wx_cv_type_getsockname3=unknown
+                        wx_cv_type_getsockname3=size_t,
+                        AC_TRY_COMPILE(
+                            [
+                                #include <sys/types.h>
+                                #include <sys/socket.h>
+                            ],
+                            [
+                                int len;
+                                getsockname(0, 0, &len);
+                            ],
+                            wx_cv_type_getsockname3=int,
+                            wx_cv_type_getsockname3=unknown
+                        )
                      )
                  )
                      )
                  )
-            )
  
  
-            AC_LANG_RESTORE
-        ])
+                AC_LANG_RESTORE
+            ])
  
  
-    if test "$wx_cv_type_getsockname3" = "unknown"; then
-        wxUSE_SOCKETS=no
-        AC_MSG_WARN([Couldn't find socklen_t synonym for this system])
-    else
-        AC_DEFINE_UNQUOTED(SOCKLEN_T, $wx_cv_type_getsockname3)
+        if test "$wx_cv_type_getsockname3" = "unknown"; then
+            wxUSE_SOCKETS=no
+            AC_MSG_WARN([Couldn't find socklen_t synonym for this system])
+        else
+            AC_DEFINE_UNQUOTED(SOCKLEN_T, $wx_cv_type_getsockname3)
+        fi
      fi
  fi
      fi
  fi
-
-fi
  dnl if !MSW
  
  if test "$wxUSE_SOCKETS" = "yes" ; then
      AC_DEFINE(wxUSE_SOCKETS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
  dnl if !MSW
  
  if test "$wxUSE_SOCKETS" = "yes" ; then
      AC_DEFINE(wxUSE_SOCKETS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -3656,28 +3980,32 @@ dnl ---------------------------------------------------------------------------
  
  if test "$wxUSE_GUI" = "yes"; then
  
  
  if test "$wxUSE_GUI" = "yes"; then
  
-dnl under MSW we always have joystick support
-if test "$TOOLKIT" != "MSW"; then
-
-if test "$wxUSE_JOYSTICK" = "yes"; then
-  dnl joystick support is only for Linux 2.1.x or greater
-  AC_CHECK_HEADERS(linux/joystick.h)
-  if test "$ac_cv_header_linux_joystick_h" != "yes"; then
-    wxUSE_JOYSTICK=no
-    AC_MSG_WARN(Joystick not supported by this system, disabled)
-  fi
-fi
-
-fi
-dnl if !MSW
+    if test "$TOOLKIT" = "MAC"; then
+        AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
+        wxUSE_JOYSTICK=no
+     fi
+    if test "$TOOLKIT" = "MOTIF"; then
+        AC_MSG_WARN([Joystick not yet supported under Motif... disabled])
+        wxUSE_JOYSTICK=no
+     fi
  
  
-if test "$wxUSE_JOYSTICK" = "yes"; then
-    AC_DEFINE(wxUSE_JOYSTICK)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
-fi
+    dnl under MSW we always have joystick support
+    if test "$TOOLKIT" != "MSW"; then
+        if test "$wxUSE_JOYSTICK" = "yes"; then
+            dnl joystick support is only for Linux 2.1.x or greater
+            AC_CHECK_HEADERS(linux/joystick.h)
+            if test "$ac_cv_header_linux_joystick_h" != "yes"; then
+                wxUSE_JOYSTICK=no
+                AC_MSG_WARN(Joystick not supported by this system... disabled)
+            fi
+        fi
+    fi
  
  
+    if test "$wxUSE_JOYSTICK" = "yes"; then
+        AC_DEFINE(wxUSE_JOYSTICK)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
+    fi
  fi
  fi
-dnl if wxUSE_GUI
  
  dnl ------------------------------------------------------------------------
  dnl DLL support
  
  dnl ------------------------------------------------------------------------
  dnl DLL support
@@ -3686,72 +4014,70 @@ dnl ------------------------------------------------------------------------
  dnl under MSW we always have LoadLibrary/GetProcAddress
  if test "$TOOLKIT" != "MSW"; then
  
  dnl under MSW we always have LoadLibrary/GetProcAddress
  if test "$TOOLKIT" != "MSW"; then
  
-HAVE_DL_FUNCS=0
-HAVE_SHL_FUNCS=0
-if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
-    if test "$USE_MAC" = 1; then
-        dnl Mac OS X needs dl_macosx.c to be compiled in to fake dlopen/dlerror
-        HAVE_DL_FUNCS=1
-    else
-        dnl the test is a bit complicated because we check for dlopen() both with
-        dnl and without -ldl and we also try to find shl_load() if there is no
-        dnl dlopen() on this system
-        AC_CHECK_FUNCS(dlopen,
-        [
-            AC_DEFINE(HAVE_DLOPEN)
+    HAVE_DL_FUNCS=0
+    HAVE_SHL_FUNCS=0
+    if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+        if test "$USE_DARWIN" = 1; then
+            dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
              HAVE_DL_FUNCS=1
              HAVE_DL_FUNCS=1
-        ],
-        [
-            AC_CHECK_LIB(dl, dlopen,
-                        [
-                            AC_DEFINE(HAVE_DLOPEN)
-                            HAVE_DL_FUNCS=1
-                            LIBS="$LIBS -ldl"
-                        ],
-                        [
-                            AC_CHECK_FUNCS(shl_load,
-                                          [
-                                            AC_DEFINE(HAVE_SHL_LOAD)
-                                            HAVE_SHL_FUNCS=1
-                                          ],
-                                          [
-                                            AC_CHECK_LIB(shl_load, dld,
-                                                         [
-                                                            HAVE_SHL_FUNCS=1
-                                                            LIBS="$LIBS -ldld"
-                                                         ])
-                                          ])
-                        ])
-        ])
+        else
+            dnl the test is a bit complicated because we check for dlopen() both with
+            dnl and without -ldl and we also try to find shl_load() if there is no
+            dnl dlopen() on this system
+            AC_CHECK_FUNCS(dlopen,
+            [
+                AC_DEFINE(HAVE_DLOPEN)
+                HAVE_DL_FUNCS=1
+            ],
+            [
+                AC_CHECK_LIB(dl, dlopen,
+                            [
+                                AC_DEFINE(HAVE_DLOPEN)
+                                HAVE_DL_FUNCS=1
+                                DL_LINK=" -ldl$DL_LINK"
+                            ],
+                            [
+                                AC_CHECK_FUNCS(shl_load,
+                                              [
+                                                AC_DEFINE(HAVE_SHL_LOAD)
+                                                HAVE_SHL_FUNCS=1
+                                              ],
+                                              [
+                                                AC_CHECK_LIB(shl_load, dld,
+                                                             [
+                                                                HAVE_SHL_FUNCS=1
+                                                                DL_LINK=" -ldld$DL_LINK"
+                                                             ])
+                                              ])
+                            ])
+            ])
  
  
-    dnl check also for dlerror()
-    if test "$HAVE_DL_FUNCS" = 1; then
-        AC_CHECK_FUNCS(dlerror,
-                       AC_DEFINE(HAVE_DLERROR),
-                       AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)))
-    fi
-    fi
+        dnl check also for dlerror()
+        if test "$HAVE_DL_FUNCS" = 1; then
+            AC_CHECK_FUNCS(dlerror,
+                           AC_DEFINE(HAVE_DLERROR),
+                           AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)))
+        fi
+        fi
  
  
-    if test "$HAVE_DL_FUNCS" = 0; then
-        if test "$HAVE_SHL_FUNCS" = 0; then
-          if test "$USE_UNIX" = 1; then
-              AC_MSG_WARN([Missing dynamic loading support, several features will be disabled])
-              wxUSE_DYNLIB_CLASS=no
-          else
-              AC_MSG_WARN([Assuming wxLibrary class works on this platform])
-          fi
+        if test "$HAVE_DL_FUNCS" = 0; then
+            if test "$HAVE_SHL_FUNCS" = 0; then
+              if test "$USE_UNIX" = 1; then
+                  AC_MSG_WARN([Missing dynamic loading support, several features will be disabled])
+                  wxUSE_DYNAMIC_LOADER=no
+                  wxUSE_DYNLIB_CLASS=no
+              else
+                  AC_MSG_WARN([Assuming wxLibrary class works on this platform])
+              fi
+            fi
          fi
      fi
  fi
  
          fi
      fi
  fi
  
-fi
-dnl if !MSW
-
-if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
+    AC_DEFINE(wxUSE_DYNAMIC_LOADER)
+elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
      AC_DEFINE(wxUSE_DYNLIB_CLASS)
      AC_DEFINE(wxUSE_DYNLIB_CLASS)
-else
-    wxUSE_ODBC=no
-    wxUSE_SERIAL=no
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -3766,21 +4092,10 @@ if test "$wxUSE_UNICODE" = "yes" ; then
    AC_DEFINE(wxUSE_UNICODE)
  fi
  
    AC_DEFINE(wxUSE_UNICODE)
  fi
  
-if test "$wxUSE_WCSRTOMBS" = "yes" ; then
-  AC_DEFINE(wxUSE_WCSRTOMBS)
-fi
-
  if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
    AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF)
  fi
  
  if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
    AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF)
  fi
  
-dnl ----------------------------------------------------------------
-dnl serialization support
-dnl ----------------------------------------------------------------
-
-if test "$wxUSE_SERIAL" = "yes" ; then
-    AC_DEFINE(wxUSE_SERIAL)
-fi
  
  dnl ----------------------------------------------------------------
  dnl iODBC support
  
  dnl ----------------------------------------------------------------
  dnl iODBC support
@@ -3815,8 +4130,15 @@ if test "$wxUSE_CONSTRAINTS" = "yes"; then
  fi
  
  if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
  fi
  
  if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-    AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        AC_MSG_WARN(MDI not yet supported for wxUNIVERSAL... disabled)
+        wxUSE_MDI_ARCHITECTURE=no
+    fi
+
+    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+        AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+    fi
  fi
  
  if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
  fi
  
  if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
@@ -3830,6 +4152,28 @@ fi
  if test "$wxUSE_HELP" = "yes"; then
      AC_DEFINE(wxUSE_HELP)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
  if test "$wxUSE_HELP" = "yes"; then
      AC_DEFINE(wxUSE_HELP)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
+
+    if test "$wxUSE_MSW" = 1; then
+      if test "$wxUSE_MS_HTML_HELP" = "yes"; then
+        AC_CHECK_HEADER(htmlhelp.h, 
+            [
+                AC_DEFINE(wxUSE_MS_HTML_HELP)
+            ],
+            [
+                AC_MSG_WARN([MS HTML Help cannot be used without htmlhelp.h... disabled])
+                wxUSE_MS_HTML_HELP=no
+            ])
+      fi
+    fi
+
+    if test "$wxUSE_WXHTML_HELP" = "yes"; then
+      if test "$wxUSE_HTML" = "yes"; then
+        AC_DEFINE(wxUSE_WXHTML_HELP)
+      else
+        AC_MSG_WARN(Cannot use wxHTML-based help without wxHTML so it won't be compiled)
+        wxUSE_WXHTML_HELP=no
+      fi
+    fi
  fi
  
  if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
  fi
  
  if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
@@ -3846,12 +4190,8 @@ if test "$wxUSE_PROLOGIO" = "yes" ; then
  fi
  
  if test "$wxUSE_RESOURCES" = "yes" ; then
  fi
  
  if test "$wxUSE_RESOURCES" = "yes" ; then
-    if test "$wxUSE_PROLOGIO" = "yes" ; then
-        AC_DEFINE(wxUSE_RESOURCES)
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
-    else
-        AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.])
-    fi
+    AC_DEFINE(wxUSE_RESOURCES)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
  fi
  
  if test "$wxUSE_X_RESOURCES" = "yes"; then
  fi
  
  if test "$wxUSE_X_RESOURCES" = "yes"; then
@@ -3862,9 +4202,43 @@ dnl ---------------------------------------------------------------------------
  dnl IPC: IPC, Drag'n'Drop, Clipboard, ...
  dnl ---------------------------------------------------------------------------
  
  dnl IPC: IPC, Drag'n'Drop, Clipboard, ...
  dnl ---------------------------------------------------------------------------
  
+dnl check for ole headers and disable a few features requiring it if not
+dnl present (earlier versions of mingw32 don't have ole2.h)
+if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
+                          -o "$wxUSE_CLIPBOARD"     = "yes" \
+                          -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
+    AC_CHECK_HEADERS(ole2.h)
+
+    if test "$ac_cv_header_ole2_h" = "yes" ; then
+        if test "$GCC" = yes ; then
+            ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
+            CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
+            LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
+            AC_DEFINE(wxUSE_OLE)
+
+        fi
+
+        dnl for OLE clipboard and dnd
+        AC_DEFINE(wxUSE_DATAOBJ)
+    else
+        AC_MSG_WARN([Some features disabled because OLE headers not found])
+
+        wxUSE_CLIPBOARD=no
+        wxUSE_DRAG_AND_DROP=no
+        wxUSE_DATAOBJ=no
+    fi
+
+    if test "$wxUSE_METAFILE" = "yes"; then
+        AC_DEFINE(wxUSE_METAFILE)
+
+        dnl this one should probably be made separately configurable
+        AC_DEFINE(wxUSE_ENH_METAFILE)
+    fi
+fi
+
  if test "$wxUSE_IPC" = "yes"; then
      if test "$wxUSE_SOCKETS" != "yes"; then
  if test "$wxUSE_IPC" = "yes"; then
      if test "$wxUSE_SOCKETS" != "yes"; then
-        AC_MSG_WARN(wxWindows IPC classes require sockets, disabled)
+        AC_MSG_WARN(wxWindows IPC classes require sockets... disabled)
      fi
  
      AC_DEFINE(wxUSE_IPC)
      fi
  
      AC_DEFINE(wxUSE_IPC)
@@ -3872,54 +4246,29 @@ fi
  
  if test "$wxUSE_CLIPBOARD" = "yes"; then
      AC_DEFINE(wxUSE_CLIPBOARD)
  
  if test "$wxUSE_CLIPBOARD" = "yes"; then
      AC_DEFINE(wxUSE_CLIPBOARD)
+
+    dnl required by clipboard code in configuration check
      AC_DEFINE(wxUSE_DATAOBJ)
  fi
  
  if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
      if test "$wxUSE_GTK" = 1; then
          if test "$WXGTK12" != 1; then
      AC_DEFINE(wxUSE_DATAOBJ)
  fi
  
  if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
      if test "$wxUSE_GTK" = 1; then
          if test "$WXGTK12" != 1; then
-            AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2])
+            AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2... disabled])
              wxUSE_DRAG_AND_DROP=no
          fi
      fi
  
      if test "$wxUSE_MOTIF" = 1; then
              wxUSE_DRAG_AND_DROP=no
          fi
      fi
  
      if test "$wxUSE_MOTIF" = 1; then
-        AC_MSG_WARN([Drag and drop is not yet supported under Motif])
+        AC_MSG_WARN([Drag and drop not yet supported under Motif... disabled])
          wxUSE_DRAG_AND_DROP=no
      fi
  
      if test "$wxUSE_MAC" = 1; then
          wxUSE_DRAG_AND_DROP=no
      fi
  
      if test "$wxUSE_MAC" = 1; then
-        AC_MSG_WARN([Drag and drop is not yet supported under Mac OS X])
+        AC_MSG_WARN([Drag and drop not yet supported under Mac OS X... disabled])
          wxUSE_DRAG_AND_DROP=no
      fi
  
          wxUSE_DRAG_AND_DROP=no
      fi
  
-    if test "$USE_WIN32" = 1; then
-        dnl check for ole headers and disable DnD if not present (earlier
-        dnl versions of mingw32 don't have them)
-
-        AC_CHECK_HEADERS(ole2.h)
-
-        if test "$ac_cv_header_ole2_h" = "yes" ; then
-            if test "$GCC" = yes ; then
-                ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
-                ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
-                CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
-                LIBS="$LIBS -lole32 -luuid"
-
-                dnl metafiles need the ole code, right??  if not this
-                dnl doesn't need to be in here.
-                if test "$wxUSE_METAFILE" = "yes"; then
-                    AC_DEFINE(wxUSE_METAFILE)
-                    dnl this one should probably be made separately configurable
-                    AC_DEFINE(wxUSE_ENH_METAFILE)
-                fi
-            fi
-        else
-            AC_MSG_WARN(Drag and drop disabled because OLE headers not found)
-            wxUSE_DRAG_AND_DROP=no
-        fi
-    fi
-
      if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
          AC_DEFINE(wxUSE_DRAG_AND_DROP)
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
      if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
          AC_DEFINE(wxUSE_DRAG_AND_DROP)
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
@@ -4031,6 +4380,12 @@ if test "$wxUSE_NOTEBOOK" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
  fi
  
+if test "$wxUSE_PROPSHEET" = "yes"; then
+    AC_DEFINE(wxUSE_PROPSHEET)
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
+fi
+
  if test "$wxUSE_RADIOBOX" = "yes"; then
      AC_DEFINE(wxUSE_RADIOBOX)
      USES_CONTROLS=1
  if test "$wxUSE_RADIOBOX" = "yes"; then
      AC_DEFINE(wxUSE_RADIOBOX)
      USES_CONTROLS=1
@@ -4116,7 +4471,11 @@ fi
  
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
      if test "$wxUSE_MAC" = 1; then
  
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
      if test "$wxUSE_MAC" = 1; then
-        AC_MSG_WARN([Toggle button is not yet supported under Mac OS X])
+        AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
+        wxUSE_TOGGLEBTN=no
+    fi
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        AC_MSG_WARN([Toggle button not yet supported under wxUNIVERSAL... disabled])
          wxUSE_TOGGLEBTN=no
      fi
  
          wxUSE_TOGGLEBTN=no
      fi
  
@@ -4151,12 +4510,16 @@ fi
  
  if test "$wxUSE_TOOLTIPS" = "yes"; then
      if test "$wxUSE_MOTIF" = 1; then
  
  if test "$wxUSE_TOOLTIPS" = "yes"; then
      if test "$wxUSE_MOTIF" = 1; then
-        AC_MSG_WARN(wxTooltip not supported yet under Motif)
+        AC_MSG_WARN([wxTooltip not supported yet under Motif... disabled])
      else
          if test "$wxUSE_WINE" = 1; then
      else
          if test "$wxUSE_WINE" = 1; then
-            AC_MSG_WARN(wxTooltip not supported under WINE)
+            AC_MSG_WARN([wxTooltip not supported under WINE... disabled])
          else
          else
-            AC_DEFINE(wxUSE_TOOLTIPS)
+            if test "$wxUSE_UNIVERSAL" = "yes"; then
+                AC_MSG_WARN([wxTooltip not supported yet in wxUNIVERSAL... disabled])
+            else
+                AC_DEFINE(wxUSE_TOOLTIPS)
+            fi
          fi
      fi
  fi
          fi
      fi
  fi
@@ -4171,6 +4534,24 @@ if test "$wxUSE_TREECTRL" = "yes"; then
      fi
  fi
  
      fi
  fi
  
+if test "$wxUSE_POPUPWIN" = "yes"; then
+    if test "$wxUSE_MAC" = 1; then
+        AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
+    else
+        if test "$wxUSE_MOTIF" = 1; then
+            AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled])
+        else
+            AC_DEFINE(wxUSE_POPUPWIN)
+
+            USES_CONTROLS=1
+        fi
+    fi
+fi
+
+if test "$wxUSE_TIPWINDOW" = "yes"; then
+    AC_DEFINE(wxUSE_TIPWINDOW)
+fi
+
  if test "$USES_CONTROLS" = 1; then
      AC_DEFINE(wxUSE_CONTROLS)
  fi
  if test "$USES_CONTROLS" = 1; then
      AC_DEFINE(wxUSE_CONTROLS)
  fi
@@ -4179,10 +4560,15 @@ dnl ---------------------------------------------------------------------------
  dnl misc options
  dnl ---------------------------------------------------------------------------
  
  dnl misc options
  dnl ---------------------------------------------------------------------------
  
-dnl TODO this is unused for now...
-dnl if test "$wxUSE_WXTREE" = "yes"; then
-dnl   AC_DEFINE(wxUSE_WXTREE)
-dnl fi
+if test "$wxUSE_TREELAYOUT" = "yes"; then
+    AC_DEFINE(wxUSE_TREELAYOUT)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
+fi
+
+if test "$wxUSE_DRAGIMAGE" = "yes"; then
+    AC_DEFINE(wxUSE_DRAGIMAGE)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
+fi
  
  if test "$wxUSE_MENUS" = "yes"; then
      AC_DEFINE(wxUSE_MENUS)
  
  if test "$wxUSE_MENUS" = "yes"; then
      AC_DEFINE(wxUSE_MENUS)
@@ -4197,6 +4583,10 @@ if test "$wxUSE_MIMETYPE" = "yes"; then
      AC_DEFINE(wxUSE_MIMETYPE)
  fi
  
      AC_DEFINE(wxUSE_MIMETYPE)
  fi
  
+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
+    AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
+fi
+
  if test "$wxUSE_MINIFRAME" = "yes"; then
      AC_DEFINE(wxUSE_MINIFRAME)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
  if test "$wxUSE_MINIFRAME" = "yes"; then
      AC_DEFINE(wxUSE_MINIFRAME)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
@@ -4205,7 +4595,6 @@ fi
  if test "$wxUSE_HTML" = "yes"; then
      AC_DEFINE(wxUSE_HTML)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html"
  if test "$wxUSE_HTML" = "yes"; then
      AC_DEFINE(wxUSE_HTML)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS html"
  fi
  
  if test "$wxUSE_VALIDATORS" = "yes"; then
  fi
  
  if test "$wxUSE_VALIDATORS" = "yes"; then
@@ -4213,6 +4602,10 @@ if test "$wxUSE_VALIDATORS" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
  fi
  
+if test "$wxUSE_PALETTE" = "yes" ; then
+  AC_DEFINE(wxUSE_PALETTE)
+fi
+
  if test "$wxUSE_IMAGE" = "yes" ; then
    AC_DEFINE(wxUSE_IMAGE)
  fi
  if test "$wxUSE_IMAGE" = "yes" ; then
    AC_DEFINE(wxUSE_IMAGE)
  fi
@@ -4249,6 +4642,10 @@ if test "$wxUSE_FILEDLG" = "yes"; then
      AC_DEFINE(wxUSE_FILEDLG)
  fi
  
      AC_DEFINE(wxUSE_FILEDLG)
  fi
  
+if test "$wxUSE_FINDREPLDLG" = "yes"; then
+    AC_DEFINE(wxUSE_FINDREPLDLG)
+fi
+
  if test "$wxUSE_FONTDLG" = "yes"; then
      AC_DEFINE(wxUSE_FONTDLG)
  fi
  if test "$wxUSE_FONTDLG" = "yes"; then
      AC_DEFINE(wxUSE_FONTDLG)
  fi
@@ -4281,6 +4678,10 @@ if test "$wxUSE_PROGRESSDLG" = "yes"; then
      fi
  fi
  
      fi
  fi
  
+if test "$wxUSE_SPLASH" = "yes"; then
+    AC_DEFINE(wxUSE_SPLASH)
+fi
+
  if test "$wxUSE_STARTUP_TIPS" = "yes"; then
      if test "$wxUSE_CONSTRAINTS" != "yes"; then
         AC_MSG_WARN(Startup tips requires constraints and won't be compiled without them)
  if test "$wxUSE_STARTUP_TIPS" = "yes"; then
      if test "$wxUSE_CONSTRAINTS" != "yes"; then
         AC_MSG_WARN(Startup tips requires constraints and won't be compiled without them)
@@ -4293,6 +4694,11 @@ if test "$wxUSE_TEXTDLG" = "yes"; then
      AC_DEFINE(wxUSE_TEXTDLG)
  fi
  
      AC_DEFINE(wxUSE_TEXTDLG)
  fi
  
+if test "$wxUSE_WIZARDDLG" = "yes"; then
+    AC_DEFINE(wxUSE_WIZARDDLG)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl get the string with OS info - used by wxGetOsDescription()
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl get the string with OS info - used by wxGetOsDescription()
  dnl ---------------------------------------------------------------------------
@@ -4309,34 +4715,64 @@ fi
  AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO)
  
  dnl ---------------------------------------------------------------------------
  AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO)
  
  dnl ---------------------------------------------------------------------------
-dnl Output the makefiles and such from the results found above
+dnl define the variable containing the installation prefix (used in dcpsg.cpp)
  dnl ---------------------------------------------------------------------------
  
  dnl ---------------------------------------------------------------------------
  
-GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
-OPENGL_LIBS="$OPENGL_LINK"
+if test "x$prefix" != "xNONE"; then
+    wxPREFIX=$prefix
+else
+    wxPREFIX=$ac_default_prefix
+fi
+
+AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
+
+dnl ---------------------------------------------------------------------------
+dnl Output the makefiles and such from the results found above
+dnl ---------------------------------------------------------------------------
  
  dnl all additional libraries (except wxWindows itself) we link with
  
  dnl all additional libraries (except wxWindows itself) we link with
-dnl
+
  dnl note that we always link with -lm except for Mac OS X
  dnl extended.c uses floor() and is always linked in
  dnl note that we always link with -lm except for Mac OS X
  dnl extended.c uses floor() and is always linked in
-EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
-if test "$USE_MAC" = 1 ; then
-    EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
+
+if test "$wxUSE_MAC" = 1 ; then
+    LDFLAGS="$LDFLAGS -framework Carbon -framework System"
  fi
  fi
+
+dnl FIXME: should this be covered by the conditional above
+dnl given the -lm comment there?  Or should that comment (and
+dnl this one) be removed..   [ 7 Nov 2001 ]
+
+LIBS="$ZLIB_LINK$POSIX4_LINK$INET_LINK$WCHAR_LINK$THREADS_LINK$DL_LINK -lm$LIBS"
+
  if test "$wxUSE_GUI" = "yes"; then
  if test "$wxUSE_GUI" = "yes"; then
-    EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
+
+    LIBS=" $GUI_TK_LIBRARY$PNG_LINK$JPEG_LINK$TIFF_LINK$FREETYPE_LINK$LIBS"
+
+    dnl TODO add checks that these samples will really compile (i.e. all the
+    dnl      library features they need are present)
+
+    dnl TODO some samples are never built so far:
+    dnl      ipc, mfc, nativdlg, oleauto, ownerdrw
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
+                     drawing dynamic erase event exec font image \
+                     minimal richedit rotate widgets"
+
+    dnl this is needed to be able to find AFM files
+    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
+else
+    SAMPLES_SUBDIRS="console"
  fi
  
  fi
  
-dnl all the libraries needed to link wxWindows programs when using the
-dnl makefile system without libtool
-LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
  
  dnl all -I options we must pass to the compiler
  
  dnl all -I options we must pass to the compiler
-INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
+INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \
+$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
+$FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
  
  dnl wxGTK does not need TOOLKIT includes in wx-config
  if test "$wxUSE_GTK" = 1; then
  
  dnl wxGTK does not need TOOLKIT includes in wx-config
  if test "$wxUSE_GTK" = 1; then
-    WXCONFIG_INCLUDE=""
+    WXCONFIG_INCLUDE=
  else
      WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
  fi
  else
      WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
  fi
@@ -4347,33 +4783,21 @@ if test "$GXX" = yes ; then
      CXXWARNINGS="-Wall"
      dnl should enable this one day...
      dnl CXXWARNINGS="-Wall -Werror"
      CXXWARNINGS="-Wall"
      dnl should enable this one day...
      dnl CXXWARNINGS="-Wall -Werror"
+
+    dnl Add this *after* all compile tests, we don't need or want generated
+    dnl depfiles until actually building the lib
+    if test "$wxUSE_NO_DEPS" = "no" ; then
+        CFLAGS="-MMD $CFLAGS"
+        CXXFLAGS="-MMD $CXXFLAGS"
+    fi
  fi
  fi
-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
+
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG$PROFILE $OPTIMISE $INCLUDES"
  
  CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
  CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
  
  
  CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
  CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
  
-LDFLAGS="$LDFLAGS $PROFILE"
-
-if test "$wxUSE_GUI" = "yes"; then
-    dnl TODO add checks that these samples will really compile (i.e. all the
-    dnl      library features they need are present)
-
-    dnl TODO some samples are never built so far:
-    dnl      ipc, mfc, nativdlg, oleauto, ownerdrw, proplist
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag \
-                     drawing dynamic event font fractal image \
-                     minimal richedit widgets"
-
-    if test "$wxUSE_UNIVERSAL" = "yes" ; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ"
-    fi
-
-    dnl this is needed to be able to find AFM files
-    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
-else
-    SAMPLES_SUBDIRS=""
-fi
+LDFLAGS="$LDFLAGS$PROFILE"
  
  dnl for convenience, sort the samples in alphabetical order
  dnl
  
  dnl for convenience, sort the samples in alphabetical order
  dnl
@@ -4393,25 +4817,20 @@ dnl global options
  AC_SUBST(WX_MAJOR_VERSION_NUMBER)
  AC_SUBST(WX_MINOR_VERSION_NUMBER)
  AC_SUBST(WX_RELEASE_NUMBER)
  AC_SUBST(WX_MAJOR_VERSION_NUMBER)
  AC_SUBST(WX_MINOR_VERSION_NUMBER)
  AC_SUBST(WX_RELEASE_NUMBER)
-AC_SUBST(WX_LIBRARY_NAME)
  AC_SUBST(WX_LIBRARY_NAME_STATIC)
  AC_SUBST(WX_LIBRARY_NAME_SHARED)
  AC_SUBST(WX_LIBRARY_NAME_STATIC)
  AC_SUBST(WX_LIBRARY_NAME_SHARED)
-AC_SUBST(WX_LIBRARY)
+AC_SUBST(WX_LIBRARY_IMPORTLIB)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
  AC_SUBST(WX_LIBRARY_LINK2)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
  AC_SUBST(WX_LIBRARY_LINK2)
-AC_SUBST(WX_LIBRARY_LINK3)
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
  AC_SUBST(PROGRAM_EXT)
  
  dnl global gl options
-AC_SUBST(WX_LIBRARY_NAME_GL)
  AC_SUBST(WX_LIBRARY_NAME_STATIC_GL)
  AC_SUBST(WX_LIBRARY_NAME_SHARED_GL)
  AC_SUBST(WX_LIBRARY_NAME_STATIC_GL)
  AC_SUBST(WX_LIBRARY_NAME_SHARED_GL)
-AC_SUBST(WX_LIBRARY_GL)
  AC_SUBST(WX_TARGET_LIBRARY_GL)
  AC_SUBST(WX_LIBRARY_LINK1_GL)
  AC_SUBST(WX_LIBRARY_LINK2_GL)
  AC_SUBST(WX_TARGET_LIBRARY_GL)
  AC_SUBST(WX_LIBRARY_LINK1_GL)
  AC_SUBST(WX_LIBRARY_LINK2_GL)
-AC_SUBST(WX_LIBRARY_LINK3_GL)
  
  dnl are we supposed to create the links?
  AC_SUBST(WX_ALL)
  
  dnl are we supposed to create the links?
  AC_SUBST(WX_ALL)
@@ -4419,11 +4838,11 @@ AC_SUBST(WX_ALL_INSTALLED)
  
  AC_SUBST(SHARED_LD)
  AC_SUBST(PIC_FLAG)
  
  AC_SUBST(SHARED_LD)
  AC_SUBST(PIC_FLAG)
-AC_SUBST(DEP_INFO_FLAGS)
  AC_SUBST(CODE_GEN_FLAGS)
  AC_SUBST(CODE_GEN_FLAGS_CXX)
  AC_SUBST(CODE_GEN_FLAGS)
  AC_SUBST(CODE_GEN_FLAGS_CXX)
-AC_SUBST(BURNT_LIBRARY_NAME)
-AC_SUBST(BURNT_LIBRARY_NAME_GL)
+
+AC_SUBST(SONAME_FLAGS)
+AC_SUBST(SONAME_FLAGS_GL)
  AC_SUBST(WX_TARGET_LIBRARY_SONAME)
  AC_SUBST(WX_TARGET_LIBRARY_TYPE)
  
  AC_SUBST(WX_TARGET_LIBRARY_SONAME)
  AC_SUBST(WX_TARGET_LIBRARY_TYPE)
  
@@ -4433,78 +4852,69 @@ AC_SUBST(WXDEBUG_DEFINE)
  dnl toolkit options
  AC_SUBST(USE_GUI)
  AC_SUBST(AFMINSTALL)
  dnl toolkit options
  AC_SUBST(USE_GUI)
  AC_SUBST(AFMINSTALL)
-AC_SUBST(SETUPH_DIR)
  AC_SUBST(TOOLKIT)
  AC_SUBST(TOOLKIT)
-AC_SUBST(TOOLKIT_DEF)
  AC_SUBST(TOOLKIT_DIR)
  AC_SUBST(TOOLKIT_DIR)
-AC_SUBST(TOOLKIT_NAME)
-AC_SUBST(TOOLKIT_INCLUDE)
  AC_SUBST(TOOLKIT_VPATH)
  AC_SUBST(TOOLKIT_VPATH)
+AC_SUBST(TOOLCHAIN_NAME)
+AC_SUBST(TOOLCHAIN_DEFS)
+AC_SUBST(TOOLCHAIN_DLL_DEFS)
+
+dnl wx-config options
+AC_SUBST(host_alias)
+AC_SUBST(cross_compiling)
+AC_SUBST(WXCONFIG_LIBS)
+AC_SUBST(WXCONFIG_LIBS_GL)
+AC_SUBST(WXCONFIG_LIBS_STATIC)
+AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
  AC_SUBST(WXCONFIG_INCLUDE)
  
  dnl what to compile
  AC_SUBST(ALL_OBJECTS)
  AC_SUBST(WXCONFIG_INCLUDE)
  
  dnl what to compile
  AC_SUBST(ALL_OBJECTS)
-AC_SUBST(ALL_DEPFILES)
  
  dnl distribution vars
  AC_SUBST(GUIDIST)
  AC_SUBST(PORT_FILES)
  AC_SUBST(DISTDIR)
  
  dnl distribution vars
  AC_SUBST(GUIDIST)
  AC_SUBST(PORT_FILES)
  AC_SUBST(DISTDIR)
-AC_SUBST(RPM_SPEC)
-AC_SUBST(RPM_FILES)
  
  dnl additional subdirectories where we will build
  
  dnl additional subdirectories where we will build
-AC_SUBST(SRC_SUBDIRS)
-AC_SUBST(INCLUDE_SUBDIRS)
-AC_SUBST(UTILS_SUBDIRS)
-AC_SUBST(DOCS_SUBDIRS)
  AC_SUBST(SAMPLES_SUBDIRS)
  AC_SUBST(SAMPLES_SUBDIRS)
-AC_SUBST(USER_SUBDIRS)
  
  dnl additional libraries and linker settings
  AC_SUBST(LDFLAGS)
  
  dnl additional libraries and linker settings
  AC_SUBST(LDFLAGS)
-AC_SUBST(EXTRA_LIBS)
+AC_SUBST(LDFLAGS_GL)
  AC_SUBST(OPENGL_LIBS)
  AC_SUBST(OPENGL_LIBS)
+AC_SUBST(DMALLOC_LIBS)
  AC_SUBST(EXTRADEFS)
  AC_SUBST(EXTRADEFS)
-AC_SUBST(LIBS)
-AC_SUBST(LD_LIBS)
  
  dnl additional resurces settings
  
  dnl additional resurces settings
-AC_SUBST(RCINPUTSWITCH)
-AC_SUBST(RCOUTPUTSWITCH)
-AC_SUBST(RESPROGRAM)
  AC_SUBST(RESCOMP)
  AC_SUBST(RESFLAGS)
  AC_SUBST(RESCOMP)
  AC_SUBST(RESFLAGS)
+AC_SUBST(RESPROGRAMOBJ)
+AC_SUBST(WX_RESOURCES_MACOSX)
+AC_SUBST(WX_RESOURCES_MACOSX_COMPILED)
+
  dnl additional for Mac OS X
  dnl additional for Mac OS X
-AC_SUBST(REZ)
-AC_SUBST(REZFLAGS)
  AC_SUBST(DEREZ)
  AC_SUBST(DEREZ)
-AC_SUBST(DEREZFLAGS)
  AC_SUBST(LIBWXMACRES)
  AC_SUBST(LIBWXMACRESCOMP)
  AC_SUBST(LIBWXMACRES)
  AC_SUBST(LIBWXMACRESCOMP)
+AC_SUBST(LIBWXMACRESWXCONFIG)
  
  
-dnl These seam to be missing
+dnl These seem to be missing
  AC_SUBST(DLLTOOL)
  AC_SUBST(AS)
  AC_SUBST(NM)
  AC_SUBST(LD)
  AC_SUBST(MAKEINFO)
  AC_SUBST(DLLTOOL)
  AC_SUBST(AS)
  AC_SUBST(NM)
  AC_SUBST(LD)
  AC_SUBST(MAKEINFO)
-
+AC_SUBST(INSTALL_LIBRARY)
  
  dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
  
  dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
-dnl itself (this is macro is required if SUBDIRS variable is used in Makefile.am
+dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
  dnl - and we do use it)
  AC_PROG_MAKE_SET
  
  dnl move setup.h back if available
  dnl - and we do use it)
  AC_PROG_MAKE_SET
  
  dnl move setup.h back if available
-if test -d include; then
-    if test -d include/wx; then
-        if test -d include/wx/${SETUPH_DIR}; then
-            if test -f include/wx/${SETUPH_DIR}/setup.h; then
-                mv -f include/wx/${SETUPH_DIR}/setup.h setup.h
-            fi
-        fi
-    fi
+if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then
+    mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h
  fi
  
  AC_CONFIG_HEADER(setup.h:setup.h.in)
  fi
  
  AC_CONFIG_HEADER(setup.h:setup.h.in)
@@ -4517,14 +4927,14 @@ if test "$wxUSE_GUI" = "yes"; then
      wx_cv_path_ifs=$PATH_IFS
      wx_cv_program_ext=$PROGRAM_EXT
      wx_cv_target_library=$WX_TARGET_LIBRARY
      wx_cv_path_ifs=$PATH_IFS
      wx_cv_program_ext=$PROGRAM_EXT
      wx_cv_target_library=$WX_TARGET_LIBRARY
+    wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
      wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
      dnl we need to export them because passing them through cache won't
      dnl work when cache=/dev/null (which is default for autoconf 2.50)
      export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
      wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
      dnl we need to export them because passing them through cache won't
      dnl work when cache=/dev/null (which is default for autoconf 2.50)
      export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
-           wx_cv_target_library wx_cv_target_libtype
+           wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
      AC_CONFIG_SUBDIRS(demos samples utils contrib)
  fi
      AC_CONFIG_SUBDIRS(demos samples utils contrib)
  fi
-dnl from wxUSE_GUI
  
  dnl create each of the files in the space separated list from the file.in
  dnl (the original file name may be overriden by appending another name after a
  
  dnl create each of the files in the space separated list from the file.in
  dnl (the original file name may be overriden by appending another name after a
@@ -4537,18 +4947,19 @@ AC_OUTPUT([
              Makefile
            ],
            [
              Makefile
            ],
            [
-            dnl don't move the file on itself - this happens when we run
-            dnl config.status which, as configure, executes these commands
-            dnl but, unlike it, doesn't create wx-config (which already
-            if test ! -f wx${TOOLKIT_NAME}-config; then
+            dnl This test is required to make the following idempotent.
+            dnl Otherwise running config.status or rerunning configure
+            dnl would stomp the wx-config link or try to move it onto
+            dnl itself.
+            dnl Use -h instead of -L to test for link (GD)
+            dnl   -h is documented as obsolete under Mac OS X but works
+            dnl   -L is obsolete under Solaris8
+            if test ! -h wx-config; then
                  chmod +x wx-config
                  chmod +x wx-config
-                mv wx-config wx${TOOLKIT_NAME}-config
-                ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+                mv wx-config wx${TOOLCHAIN_NAME}-config
+                ${LN_S} wx${TOOLCHAIN_NAME}-config wx-config
              fi
  
              fi
  
-            dnl the debian build process wants setup.h in the lib subdir so we
-            dnl can pretend wxWin is already installed, so we *copy* it there
-
              if test ! -d lib; then
                mkdir lib
              fi
              if test ! -d lib; then
                mkdir lib
              fi
@@ -4558,37 +4969,20 @@ AC_OUTPUT([
              if test ! -d lib/wx/include; then
                mkdir lib/wx/include
              fi
              if test ! -d lib/wx/include; then
                mkdir lib/wx/include
              fi
-            if test ! -d lib/wx/include/wx; then
-              mkdir lib/wx/include/wx
+            if test ! -d lib/wx/include/${TOOLCHAIN_NAME}; then
+              mkdir lib/wx/include/${TOOLCHAIN_NAME}
              fi
              fi
-            if test ! -d lib/wx/include/wx/${TOOLKIT_NAME}; then
-              mkdir lib/wx/include/wx/${TOOLKIT_NAME}
+            if test ! -d lib/wx/include/${TOOLCHAIN_NAME}/wx; then
+              mkdir lib/wx/include/${TOOLCHAIN_NAME}/wx
              fi
              if test -f setup.h; then
              fi
              if test -f setup.h; then
-                cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
+              mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h
              fi
              fi
-
-            dnl *move* setup.h to its final place
-
-            if test ! -d include; then
-              mkdir include
-            fi
-            if test ! -d include/wx; then
-              mkdir include/wx
-            fi
-            if test ! -d include/wx/${SETUPH_DIR}; then
-              mkdir include/wx/${SETUPH_DIR}
-            fi
-            if test -f setup.h; then
-                cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h
-            fi
-
            ],
            [
            ],
            [
-            SETUPH_DIR="${SETUPH_DIR}"
-            TOOLKIT_NAME="${TOOLKIT_NAME}"
+            TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
              LN_S="${LN_S}"
            ]
           )
  
              LN_S="${LN_S}"
            ]
           )
  
-dnl vi: set et ts=4 sw=4 list:
+dnl vi: set et sts=4 sw=4: