added wxApp::Yield

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

index 652c5c96aa3e1f1658ad611a17af7ff0cc639638..cc00d3f7aadd82c13725c6dd0253aa94ee01dd43 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
@@ -391,6 +391,7 @@ USE_SUN=
  USE_SOLARIS=
  USE_SUNOS=
  USE_ALPHA=
  USE_SOLARIS=
  USE_SUNOS=
  USE_ALPHA=
+USE_IA64=
  USE_OSF=
  USE_BSD=
  USE_DARWIN=
  USE_OSF=
  USE_BSD=
  USE_DARWIN=
@@ -435,6 +436,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"
@@ -445,6 +447,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* )
@@ -455,6 +458,10 @@ case "${host}" in
        USE_ALPHA=1
        AC_DEFINE(__ALPHA__)
      fi
        USE_ALPHA=1
        AC_DEFINE(__ALPHA__)
      fi
+    if test "x$TMP" = "xia64"; then
+      USE_IA64=1
+      AC_DEFINE(__IA64__)
+    fi
      DEFAULT_DEFAULT_wxUSE_GTK=1
    ;;
    *-*-irix5* | *-*-irix6* )
      DEFAULT_DEFAULT_wxUSE_GTK=1
    ;;
    *-*-irix5* | *-*-irix6* )
@@ -539,6 +546,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__)
@@ -546,6 +554,7 @@ 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
    ;;
  
@@ -555,12 +564,14 @@ case "${host}" in
      DEFAULT_DEFAULT_wxUSE_PM=1
    ;;
  
      DEFAULT_DEFAULT_wxUSE_PM=1
    ;;
  
-  *-*-darwin* )
+  powerpc-*-darwin* )
+    dnl PowerPC Darwin based distributions (including Mac OS X)
      USE_BSD=1
      USE_DARWIN=1
      USE_BSD=1
      USE_DARWIN=1
+    SO_SUFFIX=dylib
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
-    AC_DEFINE(__UNIX__)
+    AC_DEFINE(__POWERPC__)
      DEFAULT_DEFAULT_wxUSE_MAC=1
    ;;
  
      DEFAULT_DEFAULT_wxUSE_MAC=1
    ;;
  
@@ -577,19 +588,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
-
-if test "$USE_BEOS" = 1; then
-    SRC_SUBDIRS="$SRC_SUBDIRS be"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be"
  fi
  
  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 ---------------------------------------------------------------------------
@@ -613,7 +633,7 @@ 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
@@ -626,6 +646,7 @@ 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_APPLE_IEEE=no
  
    DEFAULT_wxUSE_LOG=yes
@@ -690,7 +711,7 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_HELP=no
    DEFAULT_wxUSE_MS_HTML_HELP=no
    DEFAULT_wxUSE_WXHTML_HELP=no
    DEFAULT_wxUSE_HELP=no
    DEFAULT_wxUSE_MS_HTML_HELP=no
    DEFAULT_wxUSE_WXHTML_HELP=no
-  DEFAULT_wxUSE_WXTREE=no
+  DEFAULT_wxUSE_TREELAYOUT=no
    DEFAULT_wxUSE_METAFILE=no
    DEFAULT_wxUSE_MIMETYPE=no
    DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
    DEFAULT_wxUSE_METAFILE=no
    DEFAULT_wxUSE_MIMETYPE=no
    DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
@@ -700,10 +721,12 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_COLOURDLG=no
    DEFAULT_wxUSE_DIRDLG=no
    DEFAULT_wxUSE_FILEDLG=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_WIZARDDLG=no
    DEFAULT_wxUSE_STARTUP_TIPS=no
    DEFAULT_wxUSE_PROGRESSDLG=no
    DEFAULT_wxUSE_WIZARDDLG=no
@@ -734,6 +757,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
@@ -759,6 +783,7 @@ if test $DEBUG_CONFIGURE = 1; then
    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
@@ -770,7 +795,7 @@ 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
@@ -783,6 +808,7 @@ 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
@@ -846,7 +872,7 @@ else
    DEFAULT_wxUSE_HELP=yes
    DEFAULT_wxUSE_MS_HTML_HELP=yes
    DEFAULT_wxUSE_WXHTML_HELP=yes
    DEFAULT_wxUSE_HELP=yes
    DEFAULT_wxUSE_MS_HTML_HELP=yes
    DEFAULT_wxUSE_WXHTML_HELP=yes
-  DEFAULT_wxUSE_WXTREE=yes
+  DEFAULT_wxUSE_TREELAYOUT=yes
    DEFAULT_wxUSE_METAFILE=yes
    DEFAULT_wxUSE_MIMETYPE=yes
    DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
    DEFAULT_wxUSE_METAFILE=yes
    DEFAULT_wxUSE_MIMETYPE=yes
    DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
@@ -856,10 +882,12 @@ else
    DEFAULT_wxUSE_COLOURDLG=yes
    DEFAULT_wxUSE_DIRDLG=yes
    DEFAULT_wxUSE_FILEDLG=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_WIZARDDLG=yes
    DEFAULT_wxUSE_STARTUP_TIPS=yes
    DEFAULT_wxUSE_PROGRESSDLG=yes
    DEFAULT_wxUSE_WIZARDDLG=yes
@@ -890,6 +918,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
@@ -915,6 +944,7 @@ else
    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
@@ -961,7 +991,7 @@ AC_ARG_WITH(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$w
  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(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=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(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)
  
@@ -979,19 +1009,18 @@ WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx
  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
@@ -1007,12 +1036,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
@@ -1044,7 +1073,6 @@ WX_ARG_ENABLE(ffile,         [  --enable-ffile          use wxFFile classes], wx
  WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile classes], 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(textfile,      [  --enable-textfile       use wxTextFile classes], 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(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)
@@ -1055,8 +1083,8 @@ 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(system_options,    [  --enable-sysoptions      use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
+WX_ARG_ENABLE(mimetype,      [  --enable-mimetypes      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 ---------------------------------------------------------------------------
  dnl "big" options (i.e. those which change a lot of things throughout the library)
@@ -1108,8 +1136,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)
@@ -1137,6 +1164,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
@@ -1174,6 +1202,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
@@ -1212,6 +1241,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)
@@ -1238,14 +1268,16 @@ dnl ---------------------------------------------------------------------------
  dnl common dialogs
  dnl ---------------------------------------------------------------------------
  
  dnl common dialogs
  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(filedlg,     [  --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)
@@ -1261,7 +1293,7 @@ WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUS
  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(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(dragimage,   [  --enable-dragimage      use wxDragImage], wxUSE_DRAGIMAGE)
  
  WX_ARG_ENABLE(metafile,    [  --enable-metafiles      use wxMetaFile (Windows only)], wxUSE_METAFILE)
  WX_ARG_ENABLE(dragimage,   [  --enable-dragimage      use wxDragImage], wxUSE_DRAGIMAGE)
  
@@ -1269,6 +1301,7 @@ dnl ---------------------------------------------------------------------------
  dnl support for image formats that do not rely on external library
  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(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)
@@ -1288,80 +1321,79 @@ 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 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
-
-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 )
+        # 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 ---------------------------------------------------------------------------
@@ -1374,15 +1406,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 ; 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
@@ -1394,10 +1430,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
@@ -1412,10 +1444,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
@@ -1437,7 +1465,7 @@ dnl   defines STRIP as strip or nothing if not found
  AC_CHECK_PROG(STRIP, strip, strip, true)
  
  dnl check if VPATH works
  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
@@ -1570,61 +1598,109 @@ 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 Check for regex libraries
+dnl ------------------------------------------------------------------------
+
+REGEX_INCLUDE=
+if test "$wxUSE_REGEX" != "no"; 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))
+
+    if test "x$ac_cv_func_regcomp" != "xyes"; then
+        dnl we were asked to use the system version of regex lib only but it
+        dnl is not available
+        if test "$wxUSE_REGEX" = "sys"; then
+            AC_MSG_ERROR([system regex library not found! Use --with-regex to use the built-in regex library.])
+        fi
+
+        dnl fallback to the built in code
+        REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
+    fi
+
+    AC_DEFINE(wxUSE_REGEX)
+fi
+
  dnl ----------------------------------------------------------------
  dnl search for toolkit (widget sets)
  dnl ----------------------------------------------------------------
  
  AFMINSTALL=
  
  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 _WIN_IE macro
+    AC_CACHE_CHECK([if w32api has good enough MSIE support], wx_cv_w32api_win_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_win_ie=yes
+                        CPPFLAGS="$CPPFLAGS -D_WIN_IE=0x400"
+                     ], [
+                        wx_cv_w32api_win_ie=no
+                     ])
+    ])
+
+    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"
+
+    dnl Cygwin doesn't link these by default
+    if test "$wxUSE_CYGWIN" = 1; then
+        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+    fi
+
+    dnl add extra odbc libs if we have compiled in odbc
+    if test "$wxUSE_ODBC" = "yes" ; then
+        LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
+    fi
+
+    dnl -mwindows is needed to avoid that spawning of a console window
+    dnl This probably doesn't belong here..  The user may actually *want*
+    dnl a console window.  People should add this to their own app makefiles
+    dnl instead.  Unless someone cries murder about it, expect this to
+    dnl disappear from here soon.
+    if test "$wxUSE_MINGW" = 1; then
+        LDFLAGS="$LDFLAGS -mwindows"
+    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
  
  if test "$wxUSE_GUI" = "yes"; then
      USE_GUI=1
  
-    TOOLKIT=
-    TOOLKIT_INCLUDE=
-
      GUI_TK_LIBRARY=
      GUI_TK_LIBRARY=
-    GUI_TK_LINK=
  
      WXGTK12=
      WXGTK127=
      WXGTK20=
  
  
      WXGTK12=
      WXGTK127=
      WXGTK20=
  
-    WXWINE=
-
      if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
      if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
-        AC_CHECK_HEADER(windows.h, [], 
-            [
-                AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
-            ])
-        
-        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 -ladvapi32 -lwsock32"
-
-        dnl add extra odbc libs if we have compiled in odbc
-        if test "$wxUSE_ODBC" = "yes" ; then
-            LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
-        fi
-
-        dnl -mwindows is needed to avoid that spawning of a console window
-        if test "$wxUSE_MINGW" = 1; then
-            LDFLAGS="$LDFLAGS -mwindows"
-        fi
-
          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)"
      fi
  
      if test "$wxUSE_GTK" = 1; then
      fi
  
      if test "$wxUSE_GTK" = 1; then
@@ -1708,24 +1784,24 @@ 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=""
+        mgl_os=linux/gcc/glibc
+        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 ; 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 ; 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
@@ -1733,22 +1809,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
@@ -1756,68 +1827,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)
@@ -1831,7 +1869,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                  ],
                  [
                      int version;
                  ],
                  [
                      int version;
-
                      version = xmUseVersion;
                  ],
                  [
                      version = xmUseVersion;
                  ],
                  [
@@ -1865,7 +1902,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                      ],
                      [
                          int version;
                      ],
                      [
                          int version;
-
                          version = xmUseVersion;
                      ],
                      [
                          version = xmUseVersion;
                      ],
                      [
@@ -1880,45 +1916,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)
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_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)
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-            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
@@ -1928,12 +1932,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
                  ],
@@ -1944,13 +1947,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
@@ -1962,50 +1974,21 @@ 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"
-    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 are we using the generic version with this low level toolkit?
-    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
      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__"
+        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"`
      fi
  
      fi
  
-    dnl the name of the (libtool) library
-    WX_LIBRARY="wx_${TOOLKIT_NAME}"
+    dnl misc other files depending on the port
+    PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
  
  
-    dnl collect together all the object files for this port
      if test "$wxUSE_UNIVERSAL" = "yes"; then
          ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
      if test "$wxUSE_UNIVERSAL" = "yes"; then
          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
      else
          ALL_OBJECTS="\$(GUIOBJS)"
      fi
@@ -2021,18 +2004,9 @@ 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
-    fi
-
-    dnl REGEX_INCLUDE is only set if we want regex support and if we use our
-    dnl own sources and not the system library
-    if test "x$REGEX_INCLUDE" != "x" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+    if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
      fi
      fi
-
      if test "$wxUSE_LIBJPEG" = "yes" ; then
          ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
      fi
      if test "$wxUSE_LIBJPEG" = "yes" ; then
          ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
      fi
@@ -2042,35 +2016,10 @@ equivalent variable and GTK+ is version 1.2.3 or above.
      if test "$wxUSE_LIBPNG" = "yes" ; then
          ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
      fi
      if test "$wxUSE_LIBPNG" = "yes" ; then
          ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
      fi
-    if test "$wxUSE_ZLIB" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
-    fi
      if test "$wxUSE_FREETYPE" = "yes" ; then
          ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
      fi
  
      if test "$wxUSE_FREETYPE" = "yes" ; then
          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="\${top_srcdir}/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"
  
      RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
      RPM_SPEC="wx\$(TOOLKIT).spec"
  
@@ -2080,38 +2029,23 @@ equivalent variable and GTK+ is version 1.2.3 or above.
  else
      USE_GUI=0
  
  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 well, we have to set it to something...
-    TOOLKIT_VPATH="."
-
-    dnl the base name of the library and wxXXX-config files
-    if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-        TOOLKIT_NAME="${TOOLKIT_DIR}d"
-    else
-        TOOLKIT_NAME="${TOOLKIT_DIR}"
-    fi
-
-    TOOLKIT_DEF="-D__WXBASE__"
-
      dnl the sources, their dependenices and the headers
      dnl the sources, their dependenices and the headers
-    ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)"
-    ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)"
+    if test "$USE_WIN32" = 1 ; then
+        ALL_OBJECTS="\${BASE_OBJS} \${BASE_MSW_OBJS}"
+        TOOLKIT_VPATH="\${top_srcdir}/src/msw"
  
  
-    dnl REGEX_INCLUDE is only set if we want regex support and if we use our
-    dnl own sources and not the system library
-    if test "x$REGEX_INCLUDE" != "x" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
-    fi
-
-    if test "$wxUSE_ZLIB" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+        dnl yes, the toolkit for wxBase on win32 is actually MSW
+        dnl wxBase on unix does not need a 'TOOLKIT' defined.
+        TOOLKIT="MSW"
+    else
+        ALL_OBJECTS="\${BASE_OBJS} \${BASE_UNIX_OBJS}"
+        TOOLKIT_VPATH="\${top_srcdir}/src/unix"
      fi
  
      fi
  
-    dnl building wxBase only
-    WX_LIBRARY="wx_${TOOLKIT_NAME}"
-
      PORT_FILES="\${top_srcdir}/src/files.lst"
      RPM_FILES="src/rpmfiles.lst"
      RPM_SPEC="wxBase.spec"
      PORT_FILES="\${top_srcdir}/src/files.lst"
      RPM_FILES="src/rpmfiles.lst"
      RPM_SPEC="wxBase.spec"
@@ -2121,216 +2055,225 @@ else
      DISTDIR="wxBase"
  fi
  
      DISTDIR="wxBase"
  fi
  
-dnl the name of the (libtool) library
-WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
-WX_LIBRARY_NAME_GL="lib${WX_LIBRARY}_gl.la"
+dnl REGEX_INCLUDE is only set if we want regex support and if we use our
+dnl own sources and not the system library
+if test "x$REGEX_INCLUDE" != "x" ; then
+    ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+fi
+if test "$wxUSE_ZLIB" = "yes" ; then
+    ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+fi
+
+if test "$wxUSE_OPENGL" = "yes"; then
+  if test "$wxUSE_MAC" = 1; then
+    AC_DEFINE(wxUSE_OPENGL)
+    AC_DEFINE(wxUSE_GLCANVAS)
+    OPENGL_LIBS="-framework OpenGL -framework AGL"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+  else
+    AC_CHECK_HEADER(GL/gl.h, [
+      AC_DEFINE(wxUSE_OPENGL)
+      AC_DEFINE(wxUSE_GLCANVAS)
+      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+      AC_CHECK_LIB(GL, glFlush, [
+        OPENGL_LIBS="-lGL -lGLU"
+      ],[
+          AC_CHECK_LIB(MesaGL, glFlush, [
+          OPENGL_LIBS="-lMesaGL -lMesaGLU"
+        ],)
+       ],)
+      ],wxUSE_OPENGL=0)
+  fi
+fi
+
+if test -z "$TOOLKIT_VPATH" ; then
+    TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
+fi
+
+dnl the symbol which allows conditional compilation for the given toolkit
+if test -n "$TOOLKIT" ; then
+    TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__"
+fi
+
+if test "$wxUSE_CYGWIN" = 1 ; then
+  TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
+fi
+
+lib_debug_suffix=
+if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+    lib_debug_suffix=d
+    TOOLCHAIN_NAME="${TOOLCHAIN_NAME}d"
+fi
+
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}-${WX_RELEASE}"
+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}_gl-${WX_RELEASE}"
+
+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 define which libs wx-config should link.
+WXCONFIG_LIBS="-l${WX_LIBRARY}"
+
+if test "$wxUSE_OPENGL" = "yes"; then
+    WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS"
+fi
  
  dnl the name of the static library
  WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
  
  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"
+WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
  
  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"
  
  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
              LDFLAGS="-L/usr/lib"
  
              SHARED_LD="${CXX} -b -o"
              PIC_FLAG="+Z"
          fi
              dnl no idea why it wants it, but it does
              LDFLAGS="-L/usr/lib"
  
              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* )
-       TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__DARWIN__ -D__POWERPC__"
-       CFLAGS="${CFLAGS} -fno-common"
-       CPPFLAGS="${CPPFLAGS} -fno-common"
+        CFLAGS="${CFLAGS} -fno-common"
+        CXXFLAGS="${CXXFLAGS} -fno-common"
          SHARED_LD="${CXX} -dynamiclib -o"
          PIC_FLAG="-dynamic -fPIC"
          SHARED_LD="${CXX} -dynamiclib -o"
          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 for wxMac
-       if test "$wxUSE_MAC" = 1 ; then
-               WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
-       fi
-        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* )
+        SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_NAME_STATIC} -o"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
+        WXMSW_DLL_DEFINES="-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
+        dnl -fPIC is not required for mingw build -- all code is already
+        dnl position independent
+        PIC_FLAG=
        ;;
        ;;
+
        *-pc-os2_emx )
          dnl only static for now
        *-pc-os2_emx )
          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
@@ -2338,35 +2281,56 @@ 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}"
+fi
+
+dnl do not 'else' this, it may be changed in the above conditional.
+if test "$wxUSE_SHARED" = "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
  
      if test "$wxUSE_OPENGL" = "yes"; then
  
      if test "$wxUSE_OPENGL" = "yes"; then
-        WX_ALL_INSTALLED="preinstall_gl"
-        WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+        WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}"
      else
      else
-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
      fi
  
      fi
  
-    dnl give static wxBase build a working install target
-    if test "$wxUSE_GUI" = "no"; then
-        dnl we're here because WX_ALL_INSTALLED is empty, but play safe anyway
-        WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
-    fi
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+    WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
  
      WX_TARGET_LIBRARY_TYPE="a"
  fi
  
  
      WX_TARGET_LIBRARY_TYPE="a"
  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 ------------------------------------------------------------------------
  
  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_UNISTD_H
  dnl defines HAVE_STDLIB_H
  AC_CHECK_HEADERS(stdlib.h)
  dnl defines HAVE_UNISTD_H
@@ -2389,10 +2353,6 @@ if test "$wxUSE_GUI" = "yes"; then
      fi
  fi
  
      fi
  fi
  
-if test "$USE_WIN32" = 1; then
-    AC_CHECK_HEADERS(w32api.h)
-fi
-
  dnl ---------------------------------------------------------------------------
  dnl Checks for typedefs
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl Checks for typedefs
  dnl ---------------------------------------------------------------------------
@@ -2418,14 +2378,7 @@ AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
              ws = L"Hello, world!";
          ],
          wx_cv_type_wchar_t=yes,
              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
      )
  ])
  
      )
  ])
  
@@ -2580,13 +2533,21 @@ AC_CHECK_LIB(c, wcslen, [
              AC_CHECK_LIB(w, wcslen, [
                  AC_DEFINE(HAVE_WCSLEN)
                  WCHAR_LINK="-lw"
              AC_CHECK_LIB(w, wcslen, [
                  AC_DEFINE(HAVE_WCSLEN)
                  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 library but the prototype is missing, so we can't use AC_CHECK_FUNCS here,
  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,
@@ -2755,6 +2716,67 @@ 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 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
@@ -2870,8 +2892,10 @@ 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
  
  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=""
+THREADS_LINK=
+THREADS_OBJ=
+CODE_GEN_FLAGS=
+CODE_GEN_FLAGS_CXX=
  
  if test "$wxUSE_THREADS" = "yes" ; then
      if test "$wxUSE_WINE" = 1 ; then
  
  if test "$wxUSE_THREADS" = "yes" ; then
      if test "$wxUSE_WINE" = 1 ; then
@@ -3004,6 +3028,14 @@ if test "$wxUSE_THREADS" = "yes" ; then
    dnl defined, we do it by directly assigned
    dnl PTHREAD_MUTEX_RECURSIVE_MUTEX_INITIALIZER_NP to attr
  
    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
+
    AC_CACHE_CHECK([for pthread_mutexattr_t], wx_cv_type_pthread_mutexattr_t,
    [
      AC_TRY_COMPILE([#include <pthread.h>],
    AC_CACHE_CHECK([for pthread_mutexattr_t], wx_cv_type_pthread_mutexattr_t,
    [
      AC_TRY_COMPILE([#include <pthread.h>],
@@ -3048,7 +3080,7 @@ if test "$wxUSE_THREADS" = "yes" ; then
    dnl building MT programs under Solaris with the native compiler requires -mt
    dnl switch
    if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
    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"
+      CPPFLAGS="${CFLAGS} -mt"
        CXXFLAGS="${CXXFLAGS} -mt"
        LDFLAGS="${LDFLAGS} -mt"
    fi
        CXXFLAGS="${CXXFLAGS} -mt"
        LDFLAGS="${LDFLAGS} -mt"
    fi
@@ -3061,9 +3093,8 @@ if test "$wxUSE_THREADS" = "yes"; then
    AC_DEFINE(wxUSE_THREADS)
  
    dnl must define _REENTRANT for multithreaded code except for Darwin/Mac OS X
    AC_DEFINE(wxUSE_THREADS)
  
    dnl must define _REENTRANT for multithreaded code except for Darwin/Mac OS X
-  if test "x$wxUSE_DARWIN" != "x1"; then
-    CFLAGS="${CFLAGS} -D_REENTRANT"
-    CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+  if test "$USE_DARWIN" != 1; then
+    TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
    fi
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
    fi
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
@@ -3073,8 +3104,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)
@@ -3095,28 +3125,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} -DTARGET_CARBON"
-  CFLAGS="${CFLAGS} -fpascal-strings"
-  CPPFLAGS="${CPPFLAGS} -cpp-precomp -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
@@ -3154,21 +3162,25 @@ if test "$wxUSE_PROFILE" = "yes" ; then
      PROFILE="-pg"
  fi
  
      PROFILE="-pg"
  fi
  
-DEP_INFO_FLAGS=
-CODE_GEN_FLAGS=
-CODE_GEN_FLAGS_CXX=
  if test "$GCC" = yes ; then
      if test "$wxUSE_NO_RTTI" = "yes" ; then
  if test "$GCC" = 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"
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions"
      fi
      if test "$wxUSE_PERMISSIVE" = "yes" ; then
      fi
      if test "$wxUSE_PERMISSIVE" = "yes" ; then
-       CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
      fi
      if test "$wxUSE_NO_DEPS" = "no" ; then
      fi
      if test "$wxUSE_NO_DEPS" = "no" ; then
-        DEP_INFO_FLAGS="-MMD"
+        CFLAGS="-MMD ${CFLAGS}"
+        CXXFLAGS="-MMD ${CXXFLAGS}"
+    fi
+    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
  
@@ -3204,26 +3216,6 @@ dnl ---------------------------------------------------------------------------
  dnl Optional libraries
  dnl ---------------------------------------------------------------------------
  
  dnl Optional libraries
  dnl ---------------------------------------------------------------------------
  
-REGEX_INCLUDE=
-if test "$wxUSE_REGEX" != "no"; 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))
-
-    if test "x$ac_cv_func_regcomp" != "xyes"; then
-        dnl we were asked to use the system version of regex lib only but it
-        dnl is not available
-        if test "$wxUSE_REGEX" = "sys"; then
-            AC_MSG_ERROR([system regex library not found! Use --with-regex to use the built-in regex library.])
-        fi
-
-        dnl fallback to the built in code
-        REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
-    fi
-
-    AC_DEFINE(wxUSE_REGEX)
-fi
-
  ZLIB_INCLUDE=
  if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
    AC_DEFINE(wxUSE_ZLIB)
  ZLIB_INCLUDE=
  if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
    AC_DEFINE(wxUSE_ZLIB)
@@ -3338,20 +3330,6 @@ if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then
    fi
  fi
  
    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)
-fi
-
  dnl ---------------------------------------------------------------------------
  dnl the library may be built without GUI classes at all
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl the library may be built without GUI classes at all
  dnl ---------------------------------------------------------------------------
@@ -3510,7 +3488,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 ------------------------------------------------------------------------
  
@@ -3615,8 +3593,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(
@@ -3629,7 +3606,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
@@ -3651,84 +3631,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 ---------------------------------------------------------------------------
@@ -3737,28 +3715,23 @@ 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 "$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
@@ -3767,67 +3740,65 @@ 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_DARWIN" = 1; then
-        dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
-        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_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
+                                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"
+                                                             ])
+                                              ])
+                            ])
+            ])
  
  
-    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_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
      AC_DEFINE(wxUSE_DYNLIB_CLASS)
  else
  if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
      AC_DEFINE(wxUSE_DYNLIB_CLASS)
  else
@@ -3847,10 +3818,6 @@ 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
@@ -3896,8 +3863,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 is not supported for wxUNIVERSAL yet... 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
@@ -3914,13 +3888,12 @@ if test "$wxUSE_HELP" = "yes"; then
  
      if test "$USE_WIN32" = 1; then
        if test "$wxUSE_MS_HTML_HELP" = "yes"; then
  
      if test "$USE_WIN32" = 1; then
        if test "$wxUSE_MS_HTML_HELP" = "yes"; then
-        AC_DEFINE(wxUSE_MS_HTML_HELP)
          AC_CHECK_HEADER(htmlhelp.h, 
              [
                  AC_DEFINE(wxUSE_MS_HTML_HELP)
              ],
              [
          AC_CHECK_HEADER(htmlhelp.h, 
              [
                  AC_DEFINE(wxUSE_MS_HTML_HELP)
              ],
              [
-                AC_MSG_WARN(MS HTML Help cannot be used without htmlhelp.h so it won't be compiled without it)
+                AC_MSG_WARN([MS HTML Help cannot be used without htmlhelp.h... disabled])
                  wxUSE_MS_HTML_HELP=no
              ])
        fi
                  wxUSE_MS_HTML_HELP=no
              ])
        fi
@@ -3962,6 +3935,41 @@ 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 "$USE_WIN32" = 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="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
+            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
+
+    dnl this is for MSW only, so we test for it inside "if USE_WIN32"
+    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
          AC_MSG_WARN(wxWindows IPC classes require sockets, disabled)
  if test "$wxUSE_IPC" = "yes"; then
      if test "$wxUSE_SOCKETS" != "yes"; then
          AC_MSG_WARN(wxWindows IPC classes require sockets, disabled)
@@ -3972,6 +3980,8 @@ 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
  
      AC_DEFINE(wxUSE_DATAOBJ)
  fi
  
@@ -3993,34 +4003,6 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
          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"
-                AC_DEFINE(wxUSE_OLE)
-
-                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"
@@ -4132,6 +4114,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
@@ -4216,8 +4204,8 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then
  fi
  
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
  fi
  
  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])
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then
+        AC_MSG_WARN([Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled])
          wxUSE_TOGGLEBTN=no
      fi
  
          wxUSE_TOGGLEBTN=no
      fi
  
@@ -4289,10 +4277,10 @@ 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)
  
  if test "$wxUSE_DRAGIMAGE" = "yes"; then
      AC_DEFINE(wxUSE_DRAGIMAGE)
@@ -4324,7 +4312,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
@@ -4332,6 +4319,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
@@ -4368,6 +4359,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
@@ -4400,6 +4395,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)
@@ -4432,23 +4431,50 @@ fi
  
  AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO)
  
  
  AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO)
  
+dnl ---------------------------------------------------------------------------
+dnl define the variable containing the installation prefix (used in dcpsg.cpp)
+dnl ---------------------------------------------------------------------------
+
+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 ---------------------------------------------------------------------------
  
  GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
  dnl ---------------------------------------------------------------------------
  dnl Output the makefiles and such from the results found above
  dnl ---------------------------------------------------------------------------
  
  GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
-OPENGL_LIBS="$OPENGL_LINK"
  
  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
  EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
  
  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
  EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
+
  if test "$wxUSE_MAC" = 1 ; then
      EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
  fi
  if test "$wxUSE_MAC" = 1 ; then
      EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
  fi
+
  if test "$wxUSE_GUI" = "yes"; then
      EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
  if test "$wxUSE_GUI" = "yes"; then
      EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_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
  
  dnl all the libraries needed to link wxWindows programs when using the
  fi
  
  dnl all the libraries needed to link wxWindows programs when using the
@@ -4456,7 +4482,7 @@ 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
  LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
  
  dnl all -I options we must pass to the compiler
-INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/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"
  
  $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
  $FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
  
@@ -4481,26 +4507,6 @@ CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
  
  LDFLAGS="$LDFLAGS $PROFILE"
  
  
  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 \
-                     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
-
  dnl for convenience, sort the samples in alphabetical order
  dnl
  dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
  dnl for convenience, sort the samples in alphabetical order
  dnl
  dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
@@ -4519,25 +4525,19 @@ 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_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)
@@ -4545,11 +4545,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)
  
@@ -4559,18 +4559,20 @@ 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)
+
+dnl wx-config options
+AC_SUBST(cross_compiling)
+AC_SUBST(WXCONFIG_LIBS)
+AC_SUBST(WXCONFIG_LIBS_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)
  
  dnl distribution vars
  AC_SUBST(GUIDIST)
@@ -4580,12 +4582,7 @@ AC_SUBST(RPM_SPEC)
  AC_SUBST(RPM_FILES)
  
  dnl additional subdirectories where we will build
  AC_SUBST(RPM_FILES)
  
  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)
@@ -4594,22 +4591,22 @@ AC_SUBST(OPENGL_LIBS)
  AC_SUBST(EXTRADEFS)
  AC_SUBST(LIBS)
  AC_SUBST(LD_LIBS)
  AC_SUBST(EXTRADEFS)
  AC_SUBST(LIBS)
  AC_SUBST(LD_LIBS)
+AC_SUBST(WXMSW_DLL_DEFINES)
  
  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(DLLTOOL)
  AC_SUBST(AS)
  AC_SUBST(NM)
@@ -4623,14 +4620,8 @@ dnl - and we do use it)
  AC_PROG_MAKE_SET
  
  dnl move setup.h back if available
  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)
@@ -4643,14 +4634,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
@@ -4663,18 +4654,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
@@ -4684,37 +4676,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: