Remove some wxT()'s in the docs

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

index d065c63aeed0730a4ec2f8301b2e2f04ef953b0f..e59926b81b0623f932e3b284987f2823d4fff124 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl
  dnl Top-level configure.in for wxWidgets by Robert Roebling, Phil Blecker,
  dnl Vadim Zeitlin and Ron Lee
  dnl
  dnl Top-level configure.in for wxWidgets by Robert Roebling, Phil Blecker,
  dnl Vadim Zeitlin and Ron Lee
  dnl
-dnl This script is under the wxWidgets licence.
+dnl This script is under the wxWindows licence.
  dnl
  dnl Version: $Id$
  dnl ---------------------------------------------------------------------------
  dnl
  dnl Version: $Id$
  dnl ---------------------------------------------------------------------------
@@ -17,24 +17,33 @@ dnl ---------------------------------------------------------------------------
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
-AC_INIT([wxWidgets], [2.7.0], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.9.5], [wx-dev@lists.wxwidgets.org])
  
  dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
  AC_CONFIG_SRCDIR([wx-config.in])
  
  
  dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
  AC_CONFIG_SRCDIR([wx-config.in])
  
-dnl sets build, host, target variables and the same with _alias
+dnl sets build, host variables and the same with _alias
  AC_CANONICAL_BUILD
  AC_CANONICAL_HOST
  AC_CANONICAL_BUILD
  AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
  
  
+dnl notice that if --host was given but --build was not, cross_compiling is
+dnl only set to "maybe" and not "yes" and will be either set to "yes" later or
+dnl configure will exit with error in AC_PROG_CC so don't test for = "yes" here
+if test "$cross_compiling" != "no"; then
+    HOST_PREFIX="${host_alias}-"
+    HOST_SUFFIX="-$host_alias"
+else
+    HOST_PREFIX=
+    HOST_SUFFIX=
+fi
  
  dnl When making releases do:
  dnl
  dnl wx_release_number += 1
  
  wx_major_version_number=2
  
  dnl When making releases do:
  dnl
  dnl wx_release_number += 1
  
  wx_major_version_number=2
-wx_minor_version_number=7
-wx_release_number=0
+wx_minor_version_number=9
+wx_release_number=5
  wx_subrelease_number=0
  
  WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
  wx_subrelease_number=0
  
  WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -44,6 +53,11 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number
  WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
  
  
  WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
  
  
+dnl Autoconf-2.60 changed the meaning of top_builddir variable, so we have
+dnl to use our own replacement that will work with both 2.5x and 2.60+:
+wx_top_builddir="`pwd`"
+AC_SUBST(wx_top_builddir)
+
  
  dnl ------------------------------------------------------------------------
  dnl Check platform (host system)
  
  dnl ------------------------------------------------------------------------
  dnl Check platform (host system)
@@ -89,37 +103,41 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0
  dnl the list of all available toolkits
  dnl
  dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
  dnl the list of all available toolkits
  dnl
  dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
-ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW PM X11 DFB"
  
  dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
  dnl     which are either yes or no
  
  dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
  dnl     which are either yes or no
-DEFAULT_wxUSE_COCOA=0
+DEFAULT_wxUSE_OLD_COCOA=0
  DEFAULT_wxUSE_GTK=0
  DEFAULT_wxUSE_GTK=0
-DEFAULT_wxUSE_MAC=0
-DEFAULT_wxUSE_MGL=0
+DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_wxUSE_OSX_COCOA=0
+DEFAULT_wxUSE_OSX_IPHONE=0
  DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_wxUSE_MOTIF=0
  DEFAULT_wxUSE_MSW=0
  DEFAULT_wxUSE_PM=0
  DEFAULT_wxUSE_X11=0
  DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_wxUSE_MOTIF=0
  DEFAULT_wxUSE_MSW=0
  DEFAULT_wxUSE_PM=0
  DEFAULT_wxUSE_X11=0
+DEFAULT_wxUSE_DFB=0
  
  
-dnl these are the values which are really default for the given platform -
-dnl they're not cached and are only used if no --with-toolkit was given *and*
-dnl nothing was found in the cache
-DEFAULT_DEFAULT_wxUSE_COCOA=0
+dnl these are the values which are really default for the given platform:
+dnl they're used if no --with-<toolkit> options were given to detect the
+dnl toolkit to use by default for the target platform
+DEFAULT_DEFAULT_wxUSE_OLD_COCOA=0
  DEFAULT_DEFAULT_wxUSE_GTK=0
  DEFAULT_DEFAULT_wxUSE_GTK=0
-DEFAULT_DEFAULT_wxUSE_MAC=0
-DEFAULT_DEFAULT_wxUSE_MGL=0
+DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
+DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
  DEFAULT_DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_DEFAULT_wxUSE_MOTIF=0
  DEFAULT_DEFAULT_wxUSE_MSW=0
  DEFAULT_DEFAULT_wxUSE_PM=0
  DEFAULT_DEFAULT_wxUSE_X11=0
  DEFAULT_DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_DEFAULT_wxUSE_MOTIF=0
  DEFAULT_DEFAULT_wxUSE_MSW=0
  DEFAULT_DEFAULT_wxUSE_PM=0
  DEFAULT_DEFAULT_wxUSE_X11=0
+DEFAULT_DEFAULT_wxUSE_DFB=0
  
  PROGRAM_EXT=
  
  PROGRAM_EXT=
-SO_SUFFIX=so
  SAMPLES_RPATH_FLAG=
  SAMPLES_RPATH_FLAG=
-SAMPLES_RPATH_POSTLINK=
+DYLIB_RPATH_INSTALL=
+DYLIB_RPATH_POSTLINK=
  
  DEFAULT_STD_FLAG=yes
  
  
  DEFAULT_STD_FLAG=yes
  
@@ -132,12 +150,11 @@ 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__)
  
      dnl many standard declarations in HP-UX headers are only included if either
      dnl _HPUX_SOURCE is defined, see stdsyms(5)
      AC_DEFINE(__HPUX__)
  
      dnl many standard declarations in HP-UX headers are only included if either
      dnl _HPUX_SOURCE is defined, see stdsyms(5)
-    CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
+    CPPFLAGS="-D_HPUX_SOURCE $CPPFLAGS"
    ;;
    *-*-linux* )
      USE_LINUX=1
    ;;
    *-*-linux* )
      USE_LINUX=1
@@ -165,6 +182,11 @@ case "${host}" in
      AC_DEFINE(__SVR4__)
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
    ;;
      AC_DEFINE(__SVR4__)
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
    ;;
+  *-*-qnx*)
+    USE_QNX=1
+    AC_DEFINE(__QNX__)
+    DEFAULT_DEFAULT_wxUSE_X11=1
+  ;;
    *-*-solaris2* )
      USE_SUN=1
      USE_SOLARIS=1
    *-*-solaris2* )
      USE_SUN=1
      USE_SOLARIS=1
@@ -191,7 +213,7 @@ case "${host}" in
      AC_DEFINE(__BSD__)
      DEFAULT_DEFAULT_wxUSE_GTK=1
    ;;
      AC_DEFINE(__BSD__)
      DEFAULT_DEFAULT_wxUSE_GTK=1
    ;;
-  *-*-openbsd*)
+  *-*-openbsd*|*-*-mirbsd*)
      USE_BSD=1
      USE_OPENBSD=1
      AC_DEFINE(__OPENBSD__)
      USE_BSD=1
      USE_OPENBSD=1
      AC_DEFINE(__OPENBSD__)
@@ -204,6 +226,11 @@ case "${host}" in
      AC_DEFINE(__NETBSD__)
      AC_DEFINE(__BSD__)
      DEFAULT_DEFAULT_wxUSE_GTK=1
      AC_DEFINE(__NETBSD__)
      AC_DEFINE(__BSD__)
      DEFAULT_DEFAULT_wxUSE_GTK=1
+    NEEDS_D_REENTRANT_FOR_R_FUNCS=1
+
+    dnl some standard declarations in NetBSD headers are only included if
+    dnl _NETBSD_SOURCE and _LIBC are defined, e.g. getservbyname_r in netdb.h
+    CPPFLAGS="-D_NETBSD_SOURCE -D_LIBC $CPPFLAGS"
    ;;
    *-*-osf* )
      USE_ALPHA=1
    ;;
    *-*-osf* )
      USE_ALPHA=1
@@ -231,12 +258,6 @@ case "${host}" in
      USE_AIX=1
      USE_SYSV=1
      USE_SVR4=1
      USE_AIX=1
      USE_SYSV=1
      USE_SVR4=1
-    dnl quoting from http://www-1.ibm.com/servers/esdd/articles/gnu.html:
-    dnl
-    dnl     Both archive libraries and shared libraries on AIX have an .a
-    dnl     extension. This will explain why you can't link with an .so and
-    dnl     why it works with the name changed to .a.
-    SO_SUFFIX=a
      AC_DEFINE(__AIX__)
      AC_DEFINE(__SYSV__)
      AC_DEFINE(__SVR4__)
      AC_DEFINE(__AIX__)
      AC_DEFINE(__SYSV__)
      AC_DEFINE(__SVR4__)
@@ -254,10 +275,8 @@ case "${host}" in
      dnl MBN: some of the defines have been moved after toolkit detection
      dnl      because for wxMotif/wxGTK/wxX11 to build on Cygwin
      dnl      USE_UNIX  must be set and not USE_WIN32
      dnl MBN: some of the defines have been moved after toolkit detection
      dnl      because for wxMotif/wxGTK/wxX11 to build on Cygwin
      dnl      USE_UNIX  must be set and not USE_WIN32
-    SO_SUFFIX=dll
      PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_MSW=1
      PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_MSW=1
-    DEFAULT_STD_FLAG=no
    ;;
  
    *-pc-msdosdjgpp )
    ;;
  
    *-pc-msdosdjgpp )
@@ -265,7 +284,6 @@ case "${host}" in
      USE_DOS=1
      AC_DEFINE(__DOS__)
      PROGRAM_EXT=".exe"
      USE_DOS=1
      AC_DEFINE(__DOS__)
      PROGRAM_EXT=".exe"
-    DEFAULT_DEFAULT_wxUSE_MGL=1
    ;;
  
    *-pc-os2_emx | *-pc-os2-emx )
    ;;
  
    *-pc-os2_emx | *-pc-os2-emx )
@@ -302,28 +320,23 @@ case "${host}" in
      DEFAULT_STD_FLAG=no
    ;;
  
      DEFAULT_STD_FLAG=no
    ;;
  
+  arm-apple-darwin*)
+    dnl iPhone
+    USE_BSD=1
+    USE_DARWIN=1
+    AC_DEFINE(__BSD__)
+    AC_DEFINE(__DARWIN__)
+    DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=1
+  ;;
+
    *-*-darwin* )
      dnl Darwin based distributions (including Mac OS X)
      USE_BSD=1
      USE_DARWIN=1
    *-*-darwin* )
      dnl Darwin based distributions (including Mac OS X)
      USE_BSD=1
      USE_DARWIN=1
-    SO_SUFFIX=dylib
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(TARGET_CARBON)
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(TARGET_CARBON)
-    DEFAULT_DEFAULT_wxUSE_MAC=1
-    DEFAULT_STD_FLAG=no
-  ;;
-  powerpc-apple-macos* )
-    dnl Classic Mac OS (< X)
-    USE_UNIX=0
-    dnl For some reason the test that should be cross-compiler capable fails
-    dnl However, there is no doubt that MacOS PowerPC is big endian.
-    ac_cv_c_bigendian=yes
-    SO_SUFFIX=shlib
-    dnl AC_DEFINE(TARGET_CARBON)
-    dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS
-    DEFAULT_DEFAULT_wxUSE_MAC=1
-    DEFAULT_STD_FLAG=no
+    DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
    ;;
  
    *-*-beos* )
    ;;
  
    *-*-beos* )
@@ -333,7 +346,11 @@ case "${host}" in
    ;;
  
    *)
    ;;
  
    *)
-    AC_MSG_ERROR(unknown system type ${host}.)
+    AC_MSG_WARN([*** System type ${host} is unknown, assuming generic Unix and continuing nevertheless.])
+    AC_MSG_WARN([*** Please report the build results to wx-dev@lists.wxwidgets.org.])
+
+    DEFAULT_DEFAULT_wxUSE_X11=1
+    DEFAULT_wxUSE_SHARED=no
  esac
  
  dnl ---------------------------------------------------------------------------
  esac
  
  dnl ---------------------------------------------------------------------------
@@ -346,870 +363,144 @@ dnl platform should be changed, it can be done here too)
  dnl
  dnl NB: see also DEFAULT_wxUSE<toolkit> variables defined above
  
  dnl
  dnl NB: see also DEFAULT_wxUSE<toolkit> variables defined above
  
-WX_ARG_CACHE_INIT
-
-dnl useful to test the compilation with minimum options, define as 0 for normal
-dnl usage
-DEBUG_CONFIGURE=0
-if test $DEBUG_CONFIGURE = 1; then
-  DEFAULT_wxUSE_UNIVERSAL=no
-  DEFAULT_wxUSE_STL=no
-
-  DEFAULT_wxUSE_NANOX=no
-
-  DEFAULT_wxUSE_THREADS=yes
-
-  DEFAULT_wxUSE_SHARED=yes
-  DEFAULT_wxUSE_OPTIMISE=no
-  DEFAULT_wxUSE_PROFILE=no
-  DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_NO_RTTI=no
-  DEFAULT_wxUSE_NO_EXCEPTIONS=no
-  DEFAULT_wxUSE_RPATH=yes
-  DEFAULT_wxUSE_PERMISSIVE=no
-  DEFAULT_wxUSE_DEBUG_FLAG=yes
-  DEFAULT_wxUSE_DEBUG_INFO=yes
-  DEFAULT_wxUSE_DEBUG_GDB=yes
-  DEFAULT_wxUSE_MEM_TRACING=no
-  DEFAULT_wxUSE_DEBUG_CONTEXT=no
-  DEFAULT_wxUSE_DMALLOC=no
-  DEFAULT_wxUSE_APPLE_IEEE=no
-
-  DEFAULT_wxUSE_EXCEPTIONS=no
-  DEFAULT_wxUSE_LOG=yes
-  DEFAULT_wxUSE_LOGWINDOW=no
-  DEFAULT_wxUSE_LOGGUI=no
-  DEFAULT_wxUSE_LOGDIALOG=no
-
-  DEFAULT_wxUSE_GUI=yes
-  DEFAULT_wxUSE_CONTROLS=no
-
-  DEFAULT_wxUSE_REGEX=no
-  DEFAULT_wxUSE_XML=no
-  DEFAULT_wxUSE_EXPAT=no
-  DEFAULT_wxUSE_ZLIB=no
-  DEFAULT_wxUSE_LIBPNG=no
-  DEFAULT_wxUSE_LIBJPEG=no
-  DEFAULT_wxUSE_LIBTIFF=no
-  DEFAULT_wxUSE_LIBXPM=no
-  DEFAULT_wxUSE_LIBMSPACK=no
-  DEFAULT_wxUSE_LIBSDL=no
-  DEFAULT_wxUSE_LIBGNOMEPRINT=no
-  DEFAULT_wxUSE_ODBC=no
-  DEFAULT_wxUSE_OPENGL=no
-
-  DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
-  DEFAULT_wxUSE_STACKWALKER=no
-  DEFAULT_wxUSE_DEBUGREPORT=no
-  DEFAULT_wxUSE_SNGLINST_CHECKER=no
-  DEFAULT_wxUSE_STD_IOSTREAM=no
-  DEFAULT_wxUSE_STD_STRING=no
-  DEFAULT_wxUSE_CMDLINE_PARSER=no
-  DEFAULT_wxUSE_DATETIME=no
-  DEFAULT_wxUSE_TIMER=no
-  DEFAULT_wxUSE_STOPWATCH=no
-  DEFAULT_wxUSE_FILE=no
-  DEFAULT_wxUSE_FFILE=no
-  DEFAULT_wxUSE_STDPATHS=no
-  DEFAULT_wxUSE_TEXTBUFFER=no
-  DEFAULT_wxUSE_TEXTFILE=no
-  DEFAULT_wxUSE_SOUND=no
-  DEFAULT_wxUSE_MEDIACTRL=no
-  DEFAULT_wxUSE_INTL=no
-  DEFAULT_wxUSE_CONFIG=no
-  DEFAULT_wxUSE_FONTMAP=no
-  DEFAULT_wxUSE_STREAMS=no
-  DEFAULT_wxUSE_SOCKETS=no
-  DEFAULT_wxUSE_OLE=no
-  DEFAULT_wxUSE_DATAOBJ=no
-  DEFAULT_wxUSE_DIALUP_MANAGER=no
-  DEFAULT_wxUSE_JOYSTICK=no
-  DEFAULT_wxUSE_DYNLIB_CLASS=no
-  DEFAULT_wxUSE_DYNAMIC_LOADER=no
-  DEFAULT_wxUSE_LONGLONG=no
-  DEFAULT_wxUSE_GEOMETRY=no
-
-  DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no
-  DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
-  DEFAULT_wxUSE_POSTSCRIPT=no
-
-  DEFAULT_wxUSE_CLIPBOARD=no
-  DEFAULT_wxUSE_TOOLTIPS=no
-  DEFAULT_wxUSE_DRAG_AND_DROP=no
-  DEFAULT_wxUSE_DRAGIMAGE=no
-  DEFAULT_wxUSE_SPLINES=no
-  DEFAULT_wxUSE_MOUSEWHEEL=no
-
-  DEFAULT_wxUSE_MDI=no
-  DEFAULT_wxUSE_MDI_ARCHITECTURE=no
-  DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
-  DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
-
-  DEFAULT_wxUSE_RESOURCES=no
-  DEFAULT_wxUSE_CONSTRAINTS=no
-  DEFAULT_wxUSE_IPC=no
-  DEFAULT_wxUSE_HELP=no
-  DEFAULT_wxUSE_MS_HTML_HELP=no
-  DEFAULT_wxUSE_WXHTML_HELP=no
-  DEFAULT_wxUSE_TREELAYOUT=no
-  DEFAULT_wxUSE_METAFILE=no
-  DEFAULT_wxUSE_MIMETYPE=no
-  DEFAULT_wxUSE_SYSTEM_OPTIONS=no
-  DEFAULT_wxUSE_PROTOCOL=no
-  DEFAULT_wxUSE_PROTOCOL_HTTP=no
-  DEFAULT_wxUSE_PROTOCOL_FTP=no
-  DEFAULT_wxUSE_PROTOCOL_FILE=no
-  DEFAULT_wxUSE_URL=no
-
-  DEFAULT_wxUSE_COMMONDLGS=no
-  DEFAULT_wxUSE_CHOICEDLG=no
-  DEFAULT_wxUSE_COLOURDLG=no
-  DEFAULT_wxUSE_DIRDLG=no
-  DEFAULT_wxUSE_FILEDLG=no
-  DEFAULT_wxUSE_FINDREPLDLG=no
-  DEFAULT_wxUSE_FONTDLG=no
-  DEFAULT_wxUSE_MSGDLG=no
-  DEFAULT_wxUSE_NUMBERDLG=no
-  DEFAULT_wxUSE_TEXTDLG=no
-  DEFAULT_wxUSE_SPLASH=no
-  DEFAULT_wxUSE_STARTUP_TIPS=no
-  DEFAULT_wxUSE_PROGRESSDLG=no
-  DEFAULT_wxUSE_WIZARDDLG=no
-
-  DEFAULT_wxUSE_MENUS=no
-  DEFAULT_wxUSE_MINIFRAME=no
-  DEFAULT_wxUSE_HTML=no
-  DEFAULT_wxUSE_RICHTEXT=no
-  DEFAULT_wxUSE_XRC=no
-  DEFAULT_wxUSE_WEBKIT=no
-  DEFAULT_wxUSE_FILESYSTEM=no
-  DEFAULT_wxUSE_FS_INET=no
-  DEFAULT_wxUSE_FS_ZIP=no
-  DEFAULT_wxUSE_BUSYINFO=no
-  DEFAULT_wxUSE_ARCHIVE_STREAMS=no
-  DEFAULT_wxUSE_ZIPSTREAM=no
-  DEFAULT_wxUSE_VALIDATORS=no
-
-  DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_BUTTON=no
-  DEFAULT_wxUSE_BMPBUTTON=no
-  DEFAULT_wxUSE_CALCTRL=no
-  DEFAULT_wxUSE_CARET=no
-  DEFAULT_wxUSE_CHECKBOX=no
-  DEFAULT_wxUSE_CHECKLST=no
-  DEFAULT_wxUSE_CHOICE=no
-  DEFAULT_wxUSE_CHOICEBOOK=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_DATEPICKCTRL=no
-  DEFAULT_wxUSE_DISPLAY=no
-  DEFAULT_wxUSE_GAUGE=no
-  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_IMAGLIST=no
-  DEFAULT_wxUSE_LISTBOOK=no
-  DEFAULT_wxUSE_LISTBOX=no
-  DEFAULT_wxUSE_LISTCTRL=no
-  DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_RADIOBOX=no
-  DEFAULT_wxUSE_RADIOBTN=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SLIDER=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPINCTRL=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STATBMP=no
-  DEFAULT_wxUSE_STATBOX=no
-  DEFAULT_wxUSE_STATLINE=no
-  DEFAULT_wxUSE_STATTEXT=no
-  DEFAULT_wxUSE_STATUSBAR=yes
-  DEFAULT_wxUSE_TABDIALOG=no
-  DEFAULT_wxUSE_TEXTCTRL=no
-  DEFAULT_wxUSE_TOGGLEBTN=no
-  DEFAULT_wxUSE_TOOLBAR=no
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
-  DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
-  DEFAULT_wxUSE_TREEBOOK=no
-  DEFAULT_wxUSE_TREECTRL=no
-  DEFAULT_wxUSE_POPUPWIN=no
-  DEFAULT_wxUSE_TIPWINDOW=no
-
-  DEFAULT_wxUSE_UNICODE=no
-  DEFAULT_wxUSE_UNICODE_MSLU=no
-  DEFAULT_wxUSE_WCSRTOMBS=no
-
-  DEFAULT_wxUSE_PALETTE=no
-  DEFAULT_wxUSE_IMAGE=no
-  DEFAULT_wxUSE_GIF=no
-  DEFAULT_wxUSE_PCX=no
-  DEFAULT_wxUSE_PNM=no
-  DEFAULT_wxUSE_IFF=no
-  DEFAULT_wxUSE_XPM=no
-  DEFAULT_wxUSE_ICO_CUR=no
-  DEFAULT_wxUSE_ACCESSIBILITY=no
-
-  DEFAULT_wxUSE_MONOLITHIC=no
-  DEFAULT_wxUSE_PLUGINS=no
-  DEFAULT_wxUSE_OFFICIAL_BUILD=no
-else
-  DEFAULT_wxUSE_UNIVERSAL=no
-  DEFAULT_wxUSE_STL=no
-
-  DEFAULT_wxUSE_NANOX=no
-
-  DEFAULT_wxUSE_THREADS=yes
-
-  DEFAULT_wxUSE_SHARED=yes
-  DEFAULT_wxUSE_OPTIMISE=yes
-  DEFAULT_wxUSE_PROFILE=no
-  DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_NO_RTTI=no
-  DEFAULT_wxUSE_NO_EXCEPTIONS=no
-  DEFAULT_wxUSE_RPATH=yes
-  DEFAULT_wxUSE_PERMISSIVE=no
-  DEFAULT_wxUSE_DEBUG_FLAG=no
-  DEFAULT_wxUSE_DEBUG_INFO=no
-  DEFAULT_wxUSE_DEBUG_GDB=no
-  DEFAULT_wxUSE_MEM_TRACING=no
-  DEFAULT_wxUSE_DEBUG_CONTEXT=no
-  DEFAULT_wxUSE_DMALLOC=no
-  DEFAULT_wxUSE_APPLE_IEEE=yes
-
-  DEFAULT_wxUSE_EXCEPTIONS=yes
-  DEFAULT_wxUSE_LOG=yes
-  DEFAULT_wxUSE_LOGWINDOW=yes
-  DEFAULT_wxUSE_LOGGUI=yes
-  DEFAULT_wxUSE_LOGDIALOG=yes
-
-  DEFAULT_wxUSE_GUI=yes
-
-  DEFAULT_wxUSE_REGEX=yes
-  DEFAULT_wxUSE_XML=yes
-  DEFAULT_wxUSE_EXPAT=yes
-  DEFAULT_wxUSE_ZLIB=yes
-  DEFAULT_wxUSE_LIBPNG=yes
-  DEFAULT_wxUSE_LIBJPEG=yes
-  DEFAULT_wxUSE_LIBTIFF=yes
-  DEFAULT_wxUSE_LIBXPM=yes
-  DEFAULT_wxUSE_LIBMSPACK=yes
-  DEFAULT_wxUSE_LIBSDL=no
-  DEFAULT_wxUSE_LIBGNOMEPRINT=no
-  DEFAULT_wxUSE_ODBC=no
-  DEFAULT_wxUSE_OPENGL=no
-
-  DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
-  DEFAULT_wxUSE_STACKWALKER=yes
-  DEFAULT_wxUSE_DEBUGREPORT=yes
-  DEFAULT_wxUSE_SNGLINST_CHECKER=yes
-  DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
-  DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
-  DEFAULT_wxUSE_CMDLINE_PARSER=yes
-  DEFAULT_wxUSE_DATETIME=yes
-  DEFAULT_wxUSE_TIMER=yes
-  DEFAULT_wxUSE_STOPWATCH=yes
-  DEFAULT_wxUSE_FILE=yes
-  DEFAULT_wxUSE_FFILE=yes
-  DEFAULT_wxUSE_STDPATHS=yes
-  DEFAULT_wxUSE_TEXTBUFFER=yes
-  DEFAULT_wxUSE_TEXTFILE=yes
-  DEFAULT_wxUSE_SOUND=yes
-  DEFAULT_wxUSE_MEDIACTRL=no
-  DEFAULT_wxUSE_INTL=yes
-  DEFAULT_wxUSE_CONFIG=yes
-  DEFAULT_wxUSE_FONTMAP=yes
-  DEFAULT_wxUSE_STREAMS=yes
-  DEFAULT_wxUSE_SOCKETS=yes
-  DEFAULT_wxUSE_OLE=yes
-  DEFAULT_wxUSE_DATAOBJ=yes
-  DEFAULT_wxUSE_DIALUP_MANAGER=yes
-  DEFAULT_wxUSE_JOYSTICK=yes
-  DEFAULT_wxUSE_DYNLIB_CLASS=yes
-  DEFAULT_wxUSE_DYNAMIC_LOADER=yes
-  DEFAULT_wxUSE_LONGLONG=yes
-  DEFAULT_wxUSE_GEOMETRY=yes
-
-  DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes
-  DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
-  DEFAULT_wxUSE_POSTSCRIPT=yes
-
-  DEFAULT_wxUSE_CLIPBOARD=yes
-  DEFAULT_wxUSE_TOOLTIPS=yes
-  DEFAULT_wxUSE_DRAG_AND_DROP=yes
-  DEFAULT_wxUSE_DRAGIMAGE=yes
-  DEFAULT_wxUSE_SPLINES=yes
-  DEFAULT_wxUSE_MOUSEWHEEL=yes
-
-  DEFAULT_wxUSE_MDI=yes
-  DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
-  DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
-  DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
-
-  DEFAULT_wxUSE_RESOURCES=no
-  DEFAULT_wxUSE_CONSTRAINTS=yes
-  DEFAULT_wxUSE_IPC=yes
-  DEFAULT_wxUSE_HELP=yes
-  DEFAULT_wxUSE_MS_HTML_HELP=yes
-  DEFAULT_wxUSE_WXHTML_HELP=yes
-  DEFAULT_wxUSE_TREELAYOUT=yes
-  DEFAULT_wxUSE_METAFILE=yes
-  DEFAULT_wxUSE_MIMETYPE=yes
-  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
-  DEFAULT_wxUSE_PROTOCOL=yes
-  DEFAULT_wxUSE_PROTOCOL_HTTP=yes
-  DEFAULT_wxUSE_PROTOCOL_FTP=yes
-  DEFAULT_wxUSE_PROTOCOL_FILE=yes
-  DEFAULT_wxUSE_URL=yes
-
-  DEFAULT_wxUSE_COMMONDLGS=yes
-  DEFAULT_wxUSE_CHOICEDLG=yes
-  DEFAULT_wxUSE_COLOURDLG=yes
-  DEFAULT_wxUSE_DIRDLG=yes
-  DEFAULT_wxUSE_FILEDLG=yes
-  DEFAULT_wxUSE_FINDREPLDLG=yes
-  DEFAULT_wxUSE_FONTDLG=yes
-  DEFAULT_wxUSE_MSGDLG=yes
-  DEFAULT_wxUSE_NUMBERDLG=yes
-  DEFAULT_wxUSE_TEXTDLG=yes
-  DEFAULT_wxUSE_SPLASH=yes
-  DEFAULT_wxUSE_STARTUP_TIPS=yes
-  DEFAULT_wxUSE_PROGRESSDLG=yes
-  DEFAULT_wxUSE_WIZARDDLG=yes
-
-  DEFAULT_wxUSE_MENUS=yes
-  DEFAULT_wxUSE_MINIFRAME=yes
-  DEFAULT_wxUSE_HTML=yes
-  DEFAULT_wxUSE_RICHTEXT=yes
-  DEFAULT_wxUSE_XRC=yes
-  DEFAULT_wxUSE_WEBKIT=yes
-  DEFAULT_wxUSE_FILESYSTEM=yes
-  DEFAULT_wxUSE_FS_INET=yes
-  DEFAULT_wxUSE_FS_ZIP=yes
-  DEFAULT_wxUSE_BUSYINFO=yes
-  DEFAULT_wxUSE_ARCHIVE_STREAMS=yes
-  DEFAULT_wxUSE_ZIPSTREAM=yes
-  DEFAULT_wxUSE_VALIDATORS=yes
-
-  DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_BUTTON=yes
-  DEFAULT_wxUSE_BMPBUTTON=yes
-  DEFAULT_wxUSE_CALCTRL=yes
-  DEFAULT_wxUSE_CARET=yes
-  DEFAULT_wxUSE_CHECKBOX=yes
-  DEFAULT_wxUSE_CHECKLST=yes
-  DEFAULT_wxUSE_CHOICE=yes
-  DEFAULT_wxUSE_CHOICEBOOK=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_DATEPICKCTRL=yes
-  DEFAULT_wxUSE_DISPLAY=yes
-  DEFAULT_wxUSE_GAUGE=yes
-  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_IMAGLIST=yes
-  DEFAULT_wxUSE_LISTBOOK=yes
-  DEFAULT_wxUSE_LISTBOX=yes
-  DEFAULT_wxUSE_LISTCTRL=yes
-  DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_RADIOBOX=yes
-  DEFAULT_wxUSE_RADIOBTN=yes
-  DEFAULT_wxUSE_SASH=yes
-  DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SLIDER=yes
-  DEFAULT_wxUSE_SPINBTN=yes
-  DEFAULT_wxUSE_SPINCTRL=yes
-  DEFAULT_wxUSE_SPLITTER=yes
-  DEFAULT_wxUSE_STATBMP=yes
-  DEFAULT_wxUSE_STATBOX=yes
-  DEFAULT_wxUSE_STATLINE=yes
-  DEFAULT_wxUSE_STATTEXT=yes
-  DEFAULT_wxUSE_STATUSBAR=yes
-  DEFAULT_wxUSE_TABDIALOG=no
-  DEFAULT_wxUSE_TEXTCTRL=yes
-  DEFAULT_wxUSE_TOGGLEBTN=yes
-  DEFAULT_wxUSE_TOOLBAR=yes
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
-  DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
-  DEFAULT_wxUSE_TREEBOOK=yes
-  DEFAULT_wxUSE_TREECTRL=yes
-  DEFAULT_wxUSE_POPUPWIN=yes
-  DEFAULT_wxUSE_TIPWINDOW=yes
-
-  DEFAULT_wxUSE_UNICODE=no
-  DEFAULT_wxUSE_UNICODE_MSLU=yes
-  DEFAULT_wxUSE_WCSRTOMBS=no
-
-  DEFAULT_wxUSE_PALETTE=yes
-  DEFAULT_wxUSE_IMAGE=yes
-  DEFAULT_wxUSE_GIF=yes
-  DEFAULT_wxUSE_PCX=yes
-  DEFAULT_wxUSE_IFF=no
-  DEFAULT_wxUSE_PNM=yes
-  DEFAULT_wxUSE_XPM=yes
-  DEFAULT_wxUSE_ICO_CUR=yes
-  DEFAULT_wxUSE_ACCESSIBILITY=no
-
-  DEFAULT_wxUSE_MONOLITHIC=no
-  DEFAULT_wxUSE_PLUGINS=no
-  DEFAULT_wxUSE_OFFICIAL_BUILD=no
-
-  dnl Appliable only when --with-gtk was used:
-  DEFAULT_wxUSE_GTK2=yes
-fi
-
-
-dnl WX_ARG_WITH should be used to select whether an external package will be
-dnl used or not, to configure compile-time features of this package itself,
-dnl use WX_ARG_ENABLE instead
-
-dnl ============================
-dnl external package dependecies
-dnl ============================
-
-dnl these options use AC_ARG_WITH and not WX_ARG_WITH on purpose - we cache
-dnl these values manually
-for toolkit in `echo $ALL_TOOLKITS`; do
-  LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
-  if test "x$LINE" != "x" ; then
-    has_toolkit_in_cache=1
-    eval "DEFAULT_$LINE"
-    eval "CACHE_$toolkit=1"
-
-    LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}`
-    if test "x$LINE" != "x" ; then
-        eval "DEFAULT_$LINE"
-    fi
-  fi
-done
+dnl it's only necessary to list the options which should be disabled by
+dnl default, all the rest have default value of "yes" (or, rather, of
+dnl wxUSE_ALL_FEATURES which is the only which has to be set to "yes" by
+dnl default)
+DEFAULT_wxUSE_ALL_FEATURES=yes
+
+DEFAULT_wxUSE_STD_CONTAINERS=no
+DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
+DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
+
+dnl libraries disabled by default
+DEFAULT_wxUSE_DMALLOC=no
+DEFAULT_wxUSE_LIBGNOMEVFS=no
+DEFAULT_wxUSE_LIBHILDON=no
+DEFAULT_wxUSE_LIBHILDON2=no
+DEFAULT_wxUSE_LIBMSPACK=no
+DEFAULT_wxUSE_LIBSDL=no
+
+dnl features disabled by default
+DEFAULT_wxUSE_ACCESSIBILITY=no
+DEFAULT_wxUSE_IPV6=no
+DEFAULT_wxUSE_GSTREAMER8=no
+DEFAULT_wxUSE_UNICODE_UTF8=no
+DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
+
+dnl automatic features
+DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto
+DEFAULT_wxUSE_OPENGL=auto
+DEFAULT_wxUSE_MEDIACTRL=auto
+DEFAULT_wxUSE_COMPILER_TLS=auto
+DEFAULT_wxUSE_HOTKEY=auto
+DEFAULT_wxUSE_METAFILE=auto
+
+dnl Mac/Cocoa users need to enable building universal binaries explicitly
+DEFAULT_wxUSE_UNIVERSAL_BINARY=no
+DEFAULT_wxUSE_MAC_ARCH=no
+
+DEFAULT_wxUSE_OFFICIAL_BUILD=no
+
+dnl Always default to no. Only special cases require this.
+DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
+
+dnl ===========================
+dnl deal with configure options
+dnl ===========================
+
+dnl we use several macros here:
+dnl     - AC_ARG_WITH/AC_ARG_ENABLE are the standard autoconf macros, see
+dnl       autoconf manual for details about them
+dnl     - WX_ARG_WITH/WX_ARG_ENABLE are their wx counterparts which perform
+dnl       the caching of the command line options and also use DEFAULT_foo
+dnl       variable as the default value for "foo" if neither --enable-foo nor
+dnl       --disable-foo is specified
+dnl     - WX_ARG_SYS_WITH is a special version of WX_ARG_WITH which allows
+dnl       to choose not only whether an external library is used but also if we
+dnl       use the copy of it included with wxWidgets or an already installed
+dnl       system version
+dnl     - WX_ARG_WITHOUT/WX_ARG_DISABLE mirror WX_ARG_WITH/WX_ARG_ENABLE but
+dnl       should be used for the options which are enabled by default
+dnl     - WX_ARG_FEATURE is a version of WX_ARG_ENABLE which should be used for
+dnl       optional features, i.e. options which should be disabled if
+dnl       --disable-all-features is specified (WX_ARG_WITH/WX_ARG_SYS_WITH are
+dnl       also affected by this)
  
  dnl ---------------------------------------------------------------------------
  
  dnl ---------------------------------------------------------------------------
-dnl --disable-gui will build only non-GUI part of wxWidgets: check for this
-dnl first to disable many other switches if it's given
-dnl
-dnl NB: this is still in testing stage, don't use if you don't know what you're
-dnl     doing
+dnl global build options
  dnl ---------------------------------------------------------------------------
  
  dnl ---------------------------------------------------------------------------
  
-WX_ARG_ENABLE(gui,         [  --enable-gui            use GUI classes], wxUSE_GUI)
+WX_ARG_DISABLE(gui,        [  --disable-gui           don't build GUI parts of the library], wxUSE_GUI)
  WX_ARG_ENABLE(monolithic,  [  --enable-monolithic     build wxWidgets as single library], wxUSE_MONOLITHIC)
  WX_ARG_ENABLE(plugins,     [  --enable-plugins        build parts of wxWidgets as loadable components], wxUSE_PLUGINS)
  WX_ARG_ENABLE(monolithic,  [  --enable-monolithic     build wxWidgets as single library], wxUSE_MONOLITHIC)
  WX_ARG_ENABLE(plugins,     [  --enable-plugins        build parts of wxWidgets as loadable components], wxUSE_PLUGINS)
-WX_ARG_WITH(subdirs,       [  --without-subdirs       don't generate makefiles for samples/demos/...], wxWITH_SUBDIRS, without)
-
-if test "$wxUSE_GUI" = "yes"; then
-
-WX_ARG_ENABLE(universal,   [  --enable-universal      use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL)
-AC_ARG_WITH(gtk,          [[  --with-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(cocoa,         [  --with-cocoa            use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(wine,          [  --with-wine             use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
-AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=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 SciTech MGL], [wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
-WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
-
-AC_ARG_ENABLE(gtk2,        [  --disable-gtk2          use GTK+ 1.2 instead of 2.0], [wxUSE_GTK2="$enableval"])
-WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)
-
-WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
-WX_ARG_SYS_WITH(libjpeg,   [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
-WX_ARG_SYS_WITH(libtiff,   [  --with-libtiff          use libtiff (TIFF file format)], wxUSE_LIBTIFF)
-WX_ARG_SYS_WITH(libxpm,    [  --with-libxpm           use libxpm (XPM file format)], wxUSE_LIBXPM)
-WX_ARG_WITH(libmspack,     [  --with-libmspack        use libmspack (CHM help files loading)], wxUSE_LIBMSPACK)
-WX_ARG_WITH(sdl,           [  --with-sdl              use SDL for audio on Unix], wxUSE_LIBSDL)
-WX_ARG_WITH(gnomeprint,    [  --with-gnomeprint       use GNOME print for printing under Unix], wxUSE_LIBGNOMEPRINT)
-WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
-
+WX_ARG_WITHOUT(subdirs,    [  --without-subdirs       don't generate makefiles for samples/demos/...], wxWITH_SUBDIRS)
+AC_ARG_WITH(flavour,       [  --with-flavour=NAME     specify a name to identify this build], [WX_FLAVOUR="$withval"])
+WX_ARG_ENABLE(official_build,  [  --enable-official_build official build of wxWidgets (win32 DLL only)], wxUSE_OFFICIAL_BUILD)
+AC_ARG_ENABLE(vendor,  [  --enable-vendor=VENDOR  vendor name (win32 DLL only)], [VENDOR="$enableval"])
+if test "x$VENDOR" = "x"; then
+    VENDOR="custom"
  fi
  fi
-dnl for GUI only
  
  
-WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC)
-WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
-WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
-WX_ARG_SYS_WITH(odbc,      [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
-WX_ARG_SYS_WITH(expat,     [  --with-expat            enable XML support using expat parser], wxUSE_EXPAT)
-
-dnl ---------------------------------------------------------------------------
-dnl compile options
-dnl ---------------------------------------------------------------------------
+WX_ARG_DISABLE(all-features,[  --disable-all-features  disable all optional features to build minimal library], wxUSE_ALL_FEATURES)
  
  
-WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code], wxUSE_SHARED)
-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(stl,         [  --enable-stl            use STL for containers], wxUSE_STL)
-if test "$USE_OS2" = "1"; then
-    DEFAULT_wxUSE_OMF=no
-    WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
-fi
-
-if test "$wxUSE_DEBUG" = "yes"; then
-  DEFAULT_wxUSE_DEBUG_FLAG=yes
-  DEFAULT_wxUSE_DEBUG_INFO=yes
-  BUILD=debug
-elif test "$wxUSE_DEBUG" = "no"; then
-  DEFAULT_wxUSE_DEBUG_FLAG=no
-  DEFAULT_wxUSE_DEBUG_INFO=no
-  BUILD=release
+if test "$wxUSE_ALL_FEATURES" = "no"; then
+    dnl this is a bit ugly but currently we have no choice but to manually
+    dnl reset all the options with default value of auto if all features are to
+    dnl be disabled because we can't have an option with default value of
+    dnl "auto-or-no-if-wxUSE_ALL_FEATURES-is-disabled"
+    DEFAULT_wxUSE_ARTPROVIDER_TANGO=no
+    DEFAULT_wxUSE_MEDIACTRL=no
  fi
  
  fi
  
-WX_ARG_ENABLE(debug_flag,    [  --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)], wxUSE_DEBUG_FLAG)
-WX_ARG_ENABLE(debug_info,    [  --enable-debug_info     create code with debugging information], wxUSE_DEBUG_INFO)
-WX_ARG_ENABLE(debug_gdb,     [  --enable-debug_gdb      create code with extra GDB debugging information], wxUSE_DEBUG_GDB)
-WX_ARG_ENABLE(debug_cntxt,   [  --enable-debug_cntxt    use wxDebugContext], wxUSE_DEBUG_CONTEXT)
-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 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(compat24,      [  --enable-compat24       enable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, enable)
-WX_ARG_ENABLE(compat26,      [  --disable-compat26      disable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6, disable)
-
-WX_ARG_ENABLE(rpath,         [  --disable-rpath         disable use of rpath for uninstalled builds], wxUSE_RPATH)
-
-
-dnl ---------------------------------------------------------------------------
-dnl (small) optional non GUI classes
-dnl ---------------------------------------------------------------------------
-
-WX_ARG_ENABLE(intl,          [  --enable-intl           use internationalization system], wxUSE_INTL)
-WX_ARG_ENABLE(config,        [  --enable-config         use wxConfig (and derived) classes], wxUSE_CONFIG)
-
-WX_ARG_ENABLE(protocols,     [  --enable-protocols      use wxProtocol and derived classes], wxUSE_PROTOCOL)
-WX_ARG_ENABLE(ftp,           [  --enable-ftp            use wxFTP (requires wxProtocol], wxUSE_PROTOCOL_FTP)
-WX_ARG_ENABLE(http,          [  --enable-http           use wxHTTP (requires wxProtocol], wxUSE_PROTOCOL_HTTP)
-WX_ARG_ENABLE(fileproto,     [  --enable-fileproto      use wxFileProto class (requires wxProtocol], wxUSE_PROTOCOL_FILE)
-WX_ARG_ENABLE(sockets,       [  --enable-sockets        use socket/network classes], wxUSE_SOCKETS)
-WX_ARG_ENABLE(ole,           [  --enable-ole            use OLE classes (Win32 only)], wxUSE_OLE)
-WX_ARG_ENABLE(dataobj,       [  --enable-dataobj        use data object classes], wxUSE_DATAOBJ)
-
-WX_ARG_ENABLE(ipc,           [  --enable-ipc            use interprocess communication (wxSocket etc.)], wxUSE_IPC)
-
-dnl please keep the settings below in alphabetical order
-WX_ARG_ENABLE(apple_ieee,    [  --enable-apple_ieee     use the Apple IEEE codec], wxUSE_APPLE_IEEE)
-WX_ARG_ENABLE(arcstream,     [  --enable-arcstream      use wxArchive streams], wxUSE_ARCHIVE_STREAMS)
-WX_ARG_ENABLE(backtrace,     [  --enable-backtrace      use wxStackWalker class for getting backtraces], wxUSE_STACKWALKER)
-WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION)
-WX_ARG_ENABLE(cmdline,       [  --enable-cmdline        use wxCmdLineParser class], wxUSE_CMDLINE_PARSER)
-WX_ARG_ENABLE(datetime,      [  --enable-datetime       use wxDateTime class], wxUSE_DATETIME)
-WX_ARG_ENABLE(debugreport,   [  --enable-debugreport    use wxDebugReport class], wxUSE_DEBUGREPORT)
-WX_ARG_ENABLE(dialupman,     [  --enable-dialupman      use dialup network classes], wxUSE_DIALUP_MANAGER)
-WX_ARG_ENABLE(dynlib,        [  --enable-dynlib         use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS)
-WX_ARG_ENABLE(dynamicloader, [  --enable-dynamicloader  use (new) wxDynamicLibrary class], wxUSE_DYNAMIC_LOADER)
-WX_ARG_ENABLE(exceptions,    [  --enable-exceptions     build exception-safe library], wxUSE_EXCEPTIONS)
-WX_ARG_ENABLE(ffile,         [  --enable-ffile          use wxFFile class], wxUSE_FFILE)
-WX_ARG_ENABLE(file,          [  --enable-file           use wxFile class], wxUSE_FILE)
-WX_ARG_ENABLE(filesystem,    [  --enable-filesystem     use virtual file systems classes], wxUSE_FILESYSTEM)
-WX_ARG_ENABLE(fontmap,       [  --enable-fontmap        use font encodings conversion classes], wxUSE_FONTMAP)
-WX_ARG_ENABLE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
-WX_ARG_ENABLE(fs_zip,        [  --enable-fs_zip         use virtual ZIP filesystems], wxUSE_FS_ZIP)
-WX_ARG_ENABLE(geometry,      [  --enable-geometry       use geometry class], wxUSE_GEOMETRY)
-WX_ARG_ENABLE(log,           [  --enable-log            use logging system], wxUSE_LOG)
-WX_ARG_ENABLE(longlong,      [  --enable-longlong       use wxLongLong class], wxUSE_LONGLONG)
-WX_ARG_ENABLE(mimetype,      [  --enable-mimetype       use wxMimeTypesManager], wxUSE_MIMETYPE)
-WX_ARG_ENABLE(mslu,          [  --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU)
-WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
-WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
-WX_ARG_ENABLE(std_string,    [  --enable-std_string     use standard C++ string classes], wxUSE_STD_STRING)
-WX_ARG_ENABLE(stdpaths,      [  --enable-stdpaths       use wxStandardPaths class], wxUSE_STDPATHS)
-WX_ARG_ENABLE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
-WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
-WX_ARG_ENABLE(system_options,[  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
-WX_ARG_ENABLE(textbuf,       [  --enable-textbuf        use wxTextBuffer class], wxUSE_TEXTBUFFER)
-WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
-WX_ARG_ENABLE(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
-WX_ARG_ENABLE(unicode,       [  --enable-unicode        compile wxString with Unicode support], wxUSE_UNICODE)
-WX_ARG_ENABLE(sound,         [  --enable-sound          use wxSound class], wxUSE_SOUND)
-WX_ARG_ENABLE(mediactrl,     [  --enable-mediactrl      use wxMediaCtrl class], wxUSE_MEDIACTRL)
-WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWidgets implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
-WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZip streams], wxUSE_ZIPSTREAM)
-
-WX_ARG_ENABLE(url,           [  --enable-url            use wxURL class], wxUSE_URL)
-WX_ARG_ENABLE(protocol,      [  --enable-protocol       use wxProtocol class], wxUSE_PROTOCOL)
-WX_ARG_ENABLE(protocol_http, [  --enable-protocol-http  HTTP support in wxProtocol], wxUSE_PROTOCOL_HTTP)
-WX_ARG_ENABLE(protocol_ftp,  [  --enable-protocol-ftp   FTP support in wxProtocol], wxUSE_PROTOCOL_FTP)
-WX_ARG_ENABLE(protocol_file, [  --enable-protocol-file  FILE support in wxProtocol], wxUSE_PROTOCOL_FILE)
-
-
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
-dnl "big" options (i.e. those which change a lot of things throughout the library)
+dnl port selection
  dnl ---------------------------------------------------------------------------
  
  dnl ---------------------------------------------------------------------------
  
-WX_ARG_ENABLE(threads,     [  --enable-threads        use threads], wxUSE_THREADS)
-
  if test "$wxUSE_GUI" = "yes"; then
  
  if test "$wxUSE_GUI" = "yes"; then
  
-dnl ---------------------------------------------------------------------------
-dnl "big" GUI options
-dnl ---------------------------------------------------------------------------
-
-WX_ARG_ENABLE(docview,     [  --enable-docview        use document view architecture], wxUSE_DOC_VIEW_ARCHITECTURE)
-WX_ARG_ENABLE(help,        [  --enable-help           use help subsystem], wxUSE_HELP)
-WX_ARG_ENABLE(mshtmlhelp,  [  --enable-mshtmlhelp     use MS HTML Help (win32)], wxUSE_MS_HTML_HELP)
-WX_ARG_ENABLE(html,        [  --enable-html           use wxHTML sub-library], wxUSE_HTML)
-WX_ARG_ENABLE(htmlhelp,    [  --enable-htmlhelp       use wxHTML-based help], wxUSE_WXHTML_HELP)
-WX_ARG_ENABLE(xrc,         [  --enable-xrc            use XRC resources sub-library], wxUSE_XRC)
-WX_ARG_ENABLE(constraints, [  --enable-constraints    use layout-constraints system], wxUSE_CONSTRAINTS)
-WX_ARG_ENABLE(printarch,   [  --enable-printarch      use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
-WX_ARG_ENABLE(mdi,         [  --enable-mdi            use multiple document interface architecture], wxUSE_MDI)
-WX_ARG_ENABLE(mdidoc,      [  --enable-mdidoc         use docview architecture with MDI], wxUSE_MDI_ARCHITECTURE)
-WX_ARG_ENABLE(loggui,      [  --enable-loggui         use standard GUI logger], wxUSE_LOGGUI)
-WX_ARG_ENABLE(logwin,      [  --enable-logwin         use wxLogWindow], wxUSE_LOGWINDOW)
-WX_ARG_ENABLE(logdialog,   [  --enable-logdialog      use wxLogDialog], wxUSE_LOGDIALOG)
-WX_ARG_ENABLE(webkit,      [  --enable-webkit         use wxWebKitCtrl (Mac)], wxUSE_WEBKIT)
-WX_ARG_ENABLE(html,        [  --enable-richtext       use wxRichTextCtrl], wxUSE_RICHTEXT)
-
-dnl ---------------------------------------------------------------------------
-dnl PostScript options
-dnl ---------------------------------------------------------------------------
-WX_ARG_ENABLE(postscript,  [  --enable-postscript     use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
-
-dnl VZ: these options seem to be always on, if someone wants to change it please do
-dnl WX_ARG_ENABLE(PS-normalized,    [  --enable-PS-normalized  use normalized PS fonts], dnl             wxUSE_NORMALIZED_PS_FONTS)
-dnl WX_ARG_ENABLE(afmfonts,        [  --enable-afmfonts       use Adobe Font Metric Font table], dnl             wxUSE_AFM_FOR_POSTSCRIPT)
-
-dnl ---------------------------------------------------------------------------
-dnl resources
-dnl ---------------------------------------------------------------------------
-
-WX_ARG_ENABLE(prologio,    [  --enable-prologio       not available; see contrib], wxUSE_PROLOGIO)
-WX_ARG_ENABLE(resources,   [  --enable-resources      not available; see contrib], wxUSE_RESOURCES)
-
-dnl ---------------------------------------------------------------------------
-dnl IPC &c
-dnl ---------------------------------------------------------------------------
-
-WX_ARG_ENABLE(clipboard,   [  --enable-clipboard      use wxClipboard class], wxUSE_CLIPBOARD)
-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 WX_ARG_ENABLE(treelayout,  [  --enable-treelayout     use wxTreeLayout class], wxUSE_TREELAYOUT)
-
-dnl ---------------------------------------------------------------------------
-dnl optional GUI controls (in alphabetical order except the first one)
-dnl ---------------------------------------------------------------------------
-
-WX_ARG_ENABLE(controls,    [  --enable-controls       use all usual controls], wxUSE_CONTROLS)
-
-dnl even with --enable-controls, some may be disabled by giving
-dnl --disable-<control> later on the command line - but by default all will be
-dnl used (and vice versa)
-if test "$wxUSE_CONTROLS" = "yes"; then
-  DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_BMPBUTTON=yes
-  DEFAULT_wxUSE_BUTTON=yes
-  DEFAULT_wxUSE_CALCTRL=yes
-  DEFAULT_wxUSE_CARET=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_CHECKBOX=yes
-  DEFAULT_wxUSE_CHECKLISTBOX=yes
-  DEFAULT_wxUSE_CHOICE=yes
-  DEFAULT_wxUSE_CHOICEBOOK=yes
-  DEFAULT_wxUSE_DATEPICKCTRL=yes
-  DEFAULT_wxUSE_GAUGE=yes
-  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_IMAGLIST=yes
-  DEFAULT_wxUSE_LISTBOOK=yes
-  DEFAULT_wxUSE_LISTBOX=yes
-  DEFAULT_wxUSE_LISTCTRL=yes
-  DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_RADIOBOX=yes
-  DEFAULT_wxUSE_RADIOBTN=yes
-  DEFAULT_wxUSE_SASH=yes
-  DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SLIDER=yes
-  DEFAULT_wxUSE_SPINBTN=yes
-  DEFAULT_wxUSE_SPINCTRL=yes
-  DEFAULT_wxUSE_SPLITTER=yes
-  DEFAULT_wxUSE_STATBMP=yes
-  DEFAULT_wxUSE_STATBOX=yes
-  DEFAULT_wxUSE_STATLINE=yes
-  DEFAULT_wxUSE_STATUSBAR=yes
-  DEFAULT_wxUSE_TAB_DIALOG=yes
-  DEFAULT_wxUSE_TOGGLEBTN=yes
-  DEFAULT_wxUSE_TOOLBAR=yes
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
-  DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
-  DEFAULT_wxUSE_TOOLTIPS=yes
-  DEFAULT_wxUSE_TREEBOOK=yes
-  DEFAULT_wxUSE_TREECTRL=yes
-  DEFAULT_wxUSE_POPUPWIN=yes
-  DEFAULT_wxUSE_TIPWINDOW=yes
-elif test "$wxUSE_CONTROLS" = "no"; then
-  DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_BMPBUTTON=no
-  DEFAULT_wxUSE_BUTTON=no
-  DEFAULT_wxUSE_CALCTRL=no
-  DEFAULT_wxUSE_CARET=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_CHECKBOX=no
-  DEFAULT_wxUSE_CHECKLISTBOX=no
-  DEFAULT_wxUSE_CHOICE=no
-  DEFAULT_wxUSE_CHOICEBOOK=no
-  DEFAULT_wxUSE_DATEPICKCTRL=no
-  DEFAULT_wxUSE_GAUGE=no
-  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_IMAGLIST=no
-  DEFAULT_wxUSE_LISTBOOK=no
-  DEFAULT_wxUSE_LISTBOX=no
-  DEFAULT_wxUSE_LISTCTRL=no
-  DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_RADIOBOX=no
-  DEFAULT_wxUSE_RADIOBTN=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SLIDER=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPINCTRL=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STATBMP=no
-  DEFAULT_wxUSE_STATBOX=no
-  DEFAULT_wxUSE_STATLINE=no
-  DEFAULT_wxUSE_STATUSBAR=no
-  DEFAULT_wxUSE_TAB_DIALOG=no
-  DEFAULT_wxUSE_TOGGLEBTN=no
-  DEFAULT_wxUSE_TOOLBAR=no
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
-  DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
-  DEFAULT_wxUSE_TOOLTIPS=no
-  DEFAULT_wxUSE_TREEBOOK=no
-  DEFAULT_wxUSE_TREECTRL=no
-  DEFAULT_wxUSE_POPUPWIN=no
-  DEFAULT_wxUSE_TIPWINDOW=no
-fi
-
-WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
-WX_ARG_ENABLE(button,      [  --enable-button         use wxButton class], wxUSE_BUTTON)
-WX_ARG_ENABLE(bmpbutton,   [  --enable-bmpbutton      use wxBitmapButton class], wxUSE_BMPBUTTON)
-WX_ARG_ENABLE(calendar,    [  --enable-calendar       use wxCalendarCtrl class], wxUSE_CALCTRL)
-WX_ARG_ENABLE(caret,       [  --enable-caret          use wxCaret class], wxUSE_CARET)
-WX_ARG_ENABLE(checkbox,    [  --enable-checkbox       use wxCheckBox class], wxUSE_CHECKBOX)
-WX_ARG_ENABLE(checklst,    [  --enable-checklst       use wxCheckListBox (listbox with checkboxes) class], wxUSE_CHECKLST)
-WX_ARG_ENABLE(choice,      [  --enable-choice         use wxChoice class], wxUSE_CHOICE)
-WX_ARG_ENABLE(choicebook,  [  --enable-choicebook     use wxChoicebook class], wxUSE_CHOICEBOOK)
-WX_ARG_ENABLE(combobox,    [  --enable-combobox       use wxComboBox class], wxUSE_COMBOBOX)
-WX_ARG_ENABLE(datepick,    [  --enable-datepick       use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL)
-WX_ARG_ENABLE(display,     [  --enable-display        use wxDisplay class], wxUSE_DISPLAY)
-WX_ARG_ENABLE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
-WX_ARG_ENABLE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
-WX_ARG_ENABLE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
-WX_ARG_ENABLE(listbook,    [  --enable-listbook       use wxListbook class], wxUSE_LISTBOOK)
-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(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(scrollbar,   [  --enable-scrollbar      use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR)
-WX_ARG_ENABLE(slider,      [  --enable-slider         use wxSlider class], wxUSE_SLIDER)
-WX_ARG_ENABLE(spinbtn,     [  --enable-spinbtn        use wxSpinButton class], wxUSE_SPINBTN)
-WX_ARG_ENABLE(spinctrl,    [  --enable-spinctrl       use wxSpinCtrl class], wxUSE_SPINCTRL)
-WX_ARG_ENABLE(splitter,    [  --enable-splitter       use wxSplitterWindow class], wxUSE_SPLITTER)
-WX_ARG_ENABLE(statbmp,     [  --enable-statbmp        use wxStaticBitmap class], wxUSE_STATBMP)
-WX_ARG_ENABLE(statbox,     [  --enable-statbox        use wxStaticBox class], wxUSE_STATBOX)
-WX_ARG_ENABLE(statline,    [  --enable-statline       use wxStaticLine class], wxUSE_STATLINE)
-WX_ARG_ENABLE(stattext,    [  --enable-stattext       use wxStaticText class], wxUSE_STATTEXT)
-WX_ARG_ENABLE(statusbar,   [  --enable-statusbar      use wxStatusBar class], wxUSE_STATUSBAR)
-WX_ARG_ENABLE(tabdialog,   [  --enable-tabdialog      use wxTabControl class], wxUSE_TABDIALOG)
-WX_ARG_ENABLE(textctrl,    [  --enable-textctrl       use wxTextCtrl class], wxUSE_TEXTCTRL)
-WX_ARG_ENABLE(togglebtn,   [  --enable-togglebtn      use wxToggleButton class], wxUSE_TOGGLEBTN)
-WX_ARG_ENABLE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUSE_TOOLBAR)
-WX_ARG_ENABLE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
-WX_ARG_ENABLE(tbarsmpl,    [  --enable-tbarsmpl       use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
-WX_ARG_ENABLE(treebook,    [  --enable-treebook       use wxTreebook class], wxUSE_TREEBOOK)
-WX_ARG_ENABLE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)
-WX_ARG_ENABLE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)
-WX_ARG_ENABLE(popupwin,    [  --enable-popupwin       use wxPopUpWindow class], wxUSE_POPUPWIN)
-
-dnl ---------------------------------------------------------------------------
-dnl common dialogs
-dnl ---------------------------------------------------------------------------
-
-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(finddlg,     [  --enable-finddlg        use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
-WX_ARG_ENABLE(fontdlg,     [  --enable-fontdlg        use wxFontDialog], wxUSE_FONTDLG)
-WX_ARG_ENABLE(dirdlg,      [  --enable-dirdlg         use wxDirDialog], wxUSE_DIRDLG)
-WX_ARG_ENABLE(msgdlg,      [  --enable-msgdlg         use wxMessageDialog], wxUSE_MSGDLG)
-WX_ARG_ENABLE(numberdlg,   [  --enable-numberdlg      use wxNumberEntryDialog], wxUSE_NUMBERDLG)
-WX_ARG_ENABLE(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(wizarddlg,   [  --enable-wizarddlg      use wxWizard], wxUSE_WIZARDDLG)
-
-dnl ---------------------------------------------------------------------------
-dnl misc GUI options
-dnl ---------------------------------------------------------------------------
-
-WX_ARG_ENABLE(menus,       [  --enable-menus          use wxMenu/wxMenuBar/wxMenuItem classes], wxUSE_MENUS)
-WX_ARG_ENABLE(miniframe,   [  --enable-miniframe      use wxMiniFrame class], wxUSE_MINIFRAME)
-WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUSE_TOOLTIPS)
-WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
-WX_ARG_ENABLE(mousewheel,  [  --enable-mousewheel     use mousewheel], wxUSE_MOUSEWHEEL)
-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       use wxJoystick], wxUSE_JOYSTICK)
-WX_ARG_ENABLE(metafile,    [  --enable-metafiles      use wxMetaFile (Win32 only)], wxUSE_METAFILE)
-WX_ARG_ENABLE(dragimage,   [  --enable-dragimage      use wxDragImage], wxUSE_DRAGIMAGE)
-WX_ARG_ENABLE(accessibility,[  --enable-accessibility  enable accessibility support], wxUSE_ACCESSIBILITY)
-
-if test "$wxUSE_MSW" = "1"; then
-    WX_ARG_ENABLE(dccache, [  --enable-dccache        cache temporary wxDC objects (Win32 only)], wxUSE_DC_CACHEING)
-fi
-
-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(iff,         [  --enable-iff            use iff images (IFF file format)], wxUSE_IFF)
-WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
-WX_ARG_ENABLE(xpm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
-WX_ARG_ENABLE(ico_cur,     [  --enable-icocur         use Windows ICO and CUR formats], wxUSE_ICO_CUR)
-
-fi
-
-dnl ---------------------------------------------------------------------------
-dnl flavour support
-dnl ---------------------------------------------------------------------------
-
-dnl Should this be --enable?  I flip-flopped a couple of times and this seems
-dnl in the spirit if not the letter, we have gtk-prefix and the like in this group.
-dnl It doesn't actually change anything but the output file names.
-AC_ARG_WITH(flavour,       [  --with-flavour=NAME     specify a name to identify this build], [WX_FLAVOUR="$withval"])
-
-dnl ---------------------------------------------------------------------------
-dnl some win32 settings
-dnl ---------------------------------------------------------------------------
-
-WX_ARG_ENABLE(official_build,  [  --enable-official_build official build of wxWidgets (win32 DLL only)], wxUSE_OFFICIAL_BUILD)
-AC_ARG_ENABLE(vendor,  [  --enable-vendor=VENDOR  vendor name (win32 DLL only)], [VENDOR="$enableval"])
-if test "x$VENDOR" = "x"; then
-    VENDOR="custom"
+WX_ARG_ENABLE(universal,   [  --enable-universal      use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL)
+if test "$wxUSE_UNIVERSAL" = "yes"; then
+    AC_ARG_WITH(themes,    [  --with-themes=all|list  use only the specified comma-separated list of wxUniversal themes], [wxUNIV_THEMES="$withval"])
  fi
  
  fi
  
-
-dnl for GUI only
-
-dnl cache the options values before (may be) aborting below
-WX_ARG_CACHE_FLUSH
+dnl we use AC_ARG_WITH and not WX_ARG_WITH for the toolkit options as they
+dnl shouldn't default to wxUSE_ALL_FEATURES
+AC_ARG_WITH(gtk,          [[  --with-gtk[=VERSION]    use GTK+, VERSION can be 3, 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(osx_carbon,    [  --with-osx_carbon       use Mac OS X (Carbon)], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(osx_cocoa,     [  --with-osx_cocoa        use Mac OS X (Cocoa)], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(osx_iphone,    [  --with-osx_iphone       use iPhone OS X port], [wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(osx,           [  --with-osx              use Mac OS X (default port, currently Carbon)], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(carbon,        [  --with-carbon           same as --with-osx_carbon], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(cocoa,         [  --with-cocoa            same as --with-osx_cocoa], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(iphone,        [  --with-iphone           same as --with-osx_iphone], [wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(mac,           [  --with-mac              same as --with-osx], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(old_cocoa,     [  --with-old_cocoa        use old, deprecated, Cocoa port], [wxUSE_OLD_COCOA="$withval" CACHE_OLD_COCOA=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(wine,          [  --with-wine             use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
+AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=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(directfb,      [  --with-directfb         use DirectFB], [wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
+WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
+WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)
  
  dnl check that no more than one toolkit is given and that if none are given that
  dnl we have a default one
  
  AC_MSG_CHECKING(for toolkit)
  
  
  dnl check that no more than one toolkit is given and that if none are given that
  dnl we have a default one
  
  AC_MSG_CHECKING(for toolkit)
  
+
+
  # In Wine, we need to default to MSW, not GTK or MOTIF
  if test "$wxUSE_WINE" = "yes"; then
      DEFAULT_DEFAULT_wxUSE_GTK=0
      DEFAULT_DEFAULT_wxUSE_MOTIF=0
      DEFAULT_DEFAULT_wxUSE_MSW=1
      wxUSE_SHARED=no
  # In Wine, we need to default to MSW, not GTK or MOTIF
  if test "$wxUSE_WINE" = "yes"; then
      DEFAULT_DEFAULT_wxUSE_GTK=0
      DEFAULT_DEFAULT_wxUSE_MOTIF=0
      DEFAULT_DEFAULT_wxUSE_MSW=1
      wxUSE_SHARED=no
+    CC=${CC:-winegcc}
+    CXX=${CXX:-wineg++}
  fi
  
  
  fi
  
  
@@ -1221,7 +512,7 @@ if test "$wxUSE_GUI" = "yes"; then
  
      if test "$TOOLKIT_GIVEN" = 1; then
        dnl convert "yes", "any" or a number to 1 and "no" to 0
  
      if test "$TOOLKIT_GIVEN" = 1; then
        dnl convert "yes", "any" or a number to 1 and "no" to 0
-      for toolkit in `echo $ALL_TOOLKITS`; do
+      for toolkit in $ALL_TOOLKITS; do
          var=wxUSE_$toolkit
          eval "value=\$${var}"
          if test "x$value" = "xno"; then
          var=wxUSE_$toolkit
          eval "value=\$${var}"
          if test "x$value" = "xno"; then
@@ -1235,27 +526,18 @@ if test "$wxUSE_GUI" = "yes"; then
          fi
        done
      else
          fi
        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
-        else
-          var=DEFAULT_wxUSE_$toolkit
-
-          eval "version=\$DEFAULT_wx${toolkit}_VERSION"
-          if test "x$version" != "x"; then
-            eval "wx${toolkit}_VERSION=$version"
-          fi
-        fi
+      dnl try to guess the most appropriate toolkit for this platform
+      for toolkit in $ALL_TOOLKITS; do
+        var=DEFAULT_DEFAULT_wxUSE_$toolkit
          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)
          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_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
-                  + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} \
-                  + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
+    NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
+                  + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
  
      dnl Allow wxUSE_PM only for OS/2 with EMX.
      case "${host}" in
  
      dnl Allow wxUSE_PM only for OS/2 with EMX.
      case "${host}" in
@@ -1270,35 +552,16 @@ if test "$wxUSE_GUI" = "yes"; then
          AC_MSG_ERROR(Please specify a toolkit -- cannot determine the default for ${host})
        ;;
        *)
          AC_MSG_ERROR(Please specify a toolkit -- cannot determine the default for ${host})
        ;;
        *)
-        AC_MSG_ERROR(Please specify at most one toolkit (maybe some are cached in configarg.cache?))
+        AC_MSG_ERROR(Please specify at most one toolkit)
      esac
  
      esac
  
-    # to be removed when --disable-gtk2 isn't needed
-    if test "x$wxUSE_GTK2" = "xyes"; then
-        wxGTK_VERSION=2
-    elif test "x$wxUSE_GTK2" = "xno"; then
-        wxGTK_VERSION=1
-    fi
-
-    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}
-          eval "version=\$wx${toolkit}_VERSION"
-          if test "x$version" != "x"; then
-            echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file}
-          fi
-        fi
+    for toolkit in $ALL_TOOLKITS; do
+        var=wxUSE_$toolkit
+        eval "value=\$${var}"
          if test "$value" = 1; then
          if test "$value" = 1; then
-          toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"`
+          toolkit_echo=`echo $toolkit | tr '[[A-Z]]' '[[a-z]]'`
            AC_MSG_RESULT($toolkit_echo)
          fi
            AC_MSG_RESULT($toolkit_echo)
          fi
-      fi
      done
  else
      if test "x$host_alias" != "x"; then
      done
  else
      if test "x$host_alias" != "x"; then
@@ -1308,60 +571,508 @@ else
      fi
  fi
  
      fi
  fi
  
+wxUSE_MAC=0
+if test "$wxUSE_OSX_CARBON" = 1 \
+       -o "$wxUSE_OSX_COCOA" = 1 \
+       -o "$wxUSE_OSX_IPHONE" = 1; then
+    wxUSE_MAC=1
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
-dnl When we are using Cygwin with Motif/GTK+, we want it to appear like
-dnl 'just' a POSIX platform, so the Win32 API must not be available
+dnl external libraries
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
-dnl (Windows-only piece)
-wants_win32=0
-doesnt_want_win32=0
-case "${host}" in
-  *-*-cygwin*)
-      if test "$wxUSE_MSW" = 1 ; then
-        wants_win32=1
-        BAKEFILE_FORCE_PLATFORM=win32
-      else
-        doesnt_want_win32=1
-      fi
-  ;;
-  *-*-mingw*)
-      wants_win32=1
-  ;;
+
+WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
+WX_ARG_SYS_WITH(libjpeg,   [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
+WX_ARG_SYS_WITH(libtiff,   [  --with-libtiff          use libtiff (TIFF file format)], wxUSE_LIBTIFF)
+WX_ARG_SYS_WITH(libxpm,    [  --with-libxpm           use libxpm (XPM file format)], wxUSE_LIBXPM)
+WX_ARG_WITH(libiconv,      [  --with-libiconv         use libiconv (character conversion)], wxUSE_LIBICONV)
+WX_ARG_WITH(libmspack,     [  --with-libmspack        use libmspack (CHM help files loading)], wxUSE_LIBMSPACK)
+WX_ARG_WITHOUT(gtkprint,   [  --without-gtkprint      don't use GTK printing support], wxUSE_GTKPRINT)
+WX_ARG_WITHOUT(gnomeprint, [  --without-gnomeprint    don't use GNOME printing libraries], wxUSE_LIBGNOMEPRINT)
+WX_ARG_WITH(gnomevfs,      [  --with-gnomevfs         use GNOME VFS for associating MIME types], wxUSE_LIBGNOMEVFS)
+WX_ARG_WITH(libnotify,     [  --with-libnotify        use libnotify for notifications], wxUSE_LIBNOTIFY)
+WX_ARG_WITH(hildon,        [  --with-hildon           use Hildon framework for Nokia 770/800/810], wxUSE_LIBHILDON)
+WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
+
+fi
+dnl for GUI only
+
+WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC)
+WX_ARG_WITH(sdl,           [  --with-sdl              use SDL for audio on Unix], wxUSE_LIBSDL)
+WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
+WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
+WX_ARG_SYS_WITH(expat,     [  --with-expat            enable XML support using expat parser], wxUSE_EXPAT)
+
+AC_MSG_CHECKING([for --with-macosx-sdk])
+AC_ARG_WITH(macosx-sdk,    [  --with-macosx-sdk=PATH  use an OS X SDK at PATH], [
+        wxUSE_MACOSX_SDK=$withval
+        wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval"
+    ])
+AC_MSG_RESULT([$wxUSE_MACOSX_SDK])
+
+AC_MSG_CHECKING([for --with-macosx-version-min])
+AC_ARG_WITH(macosx-version-min,    [  --with-macosx-version-min=VER   build binaries which require at least this OS X version], [
+        wxUSE_MACOSX_VERSION_MIN=$withval
+        wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval"
+    ])
+AC_MSG_RESULT([$wxUSE_MACOSX_VERSION_MIN])
+
+dnl ---------------------------------------------------------------------------
+dnl debugging options
+dnl ---------------------------------------------------------------------------
+
+dnl don't use WX_ARG_ENABLE as it just gets in the way instead of helping with
+dnl this rather unusual option
+AC_MSG_CHECKING([for --enable-debug])
+AC_ARG_ENABLE(debug,       [  --enable-debug          build library for debugging],
+    [
+        if test "$enableval" = yes; then
+            wxUSE_DEBUG=yes
+        elif test "$enableval" = no; then
+            wxUSE_DEBUG=no
+        elif test "$enableval" = max; then
+            wxUSE_DEBUG=yes
+            WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=2"
+        else
+            AC_MSG_ERROR([Invalid --enable-debug value, must be yes, no or max])
+        fi
+    ],
+    wxUSE_DEBUG=default
+)
+AC_MSG_RESULT([${enable_debug-default}])
+
+case "$wxUSE_DEBUG" in
+    yes)
+        dnl build the library for debugging: enable debugging code and generate
+        dnl the debug information for the library itself
+        DEFAULT_wxUSE_DEBUG_FLAG=yes
+        DEFAULT_wxUSE_DEBUG_INFO=yes
+
+        dnl also disable optimizations by default if --enable-debug was used
+        dnl (this can still be overridden by an explicit --enable-optimise)
+        DEFAULT_wxUSE_OPTIMISE=no
+        ;;
+
+    no)
+        dnl --disable-debug is equivalent to both --disable-debug_flag and
+        dnl --disable-debug_info
+        DEFAULT_wxUSE_DEBUG_FLAG=no
+        DEFAULT_wxUSE_DEBUG_INFO=no
+        ;;
+
+    default)
+        dnl the library is built with debugging support by default but without
+        dnl debug information as this requires much, much more disk space
+        DEFAULT_wxUSE_DEBUG_FLAG=yes
+        DEFAULT_wxUSE_DEBUG_INFO=no
+        ;;
  esac
  
  esac
  
+WX_ARG_DISABLE(debug_flag,   [  --disable-debug_flag    disable all debugging support], wxUSE_DEBUG_FLAG)
+WX_ARG_ENABLE(debug_info,    [  --enable-debug_info     generate debug information], wxUSE_DEBUG_INFO)
+
+dnl enabled if just --enable-debug_{flag,info} was
+dnl
+dnl in any case, only set the default value and allow overriding it with an
+
+WX_ARG_ENABLE(debug_gdb,     [  --enable-debug_gdb      create code with extra GDB debugging information], wxUSE_DEBUG_GDB)
+WX_ARG_ENABLE(debug_cntxt,   [  --enable-debug_cntxt    obsolete, don't use: use wxDebugContext], wxUSE_DEBUG_CONTEXT)
+WX_ARG_ENABLE(mem_tracing,   [  --enable-mem_tracing    obsolete, don't use: create code with memory tracing], wxUSE_MEM_TRACING)
+
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
-dnl Wine is a virtual platform, we need to patch things up a bit
+dnl global compile options
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
-if test "$wxUSE_WINE" = "yes"; then
-    wants_win32=1
-    dnl FIXME: we should do a better job of testing for these
-    CC=winegcc
-    CXX=wineg++
-    LDFLAGS_GUI="-mwindows"
+
+WX_ARG_DISABLE(shared,     [  --disable-shared        create static library instead of shared], wxUSE_SHARED)
+WX_ARG_ENABLE(stl,         [  --enable-stl            use standard C++ classes for everything], wxUSE_STL)
+if test "$wxUSE_STL" = "yes"; then
+    DEFAULT_wxUSE_STD_CONTAINERS=yes
+    DEFAULT_wxUSE_STD_IOSTREAM=yes
+    DEFAULT_wxUSE_STD_STRING=yes
+fi
+WX_ARG_ENABLE(std_containers,[  --enable-std_containers use standard C++ container classes], wxUSE_STD_CONTAINERS)
+WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
+WX_ARG_ENABLE(std_string,    [  --enable-std_string     use standard C++ string classes], wxUSE_STD_STRING)
+WX_ARG_ENABLE(std_string_conv_in_wxstring, [ --enable-std_string_conv_in_wxstring     provide implicit conversion to std::string in wxString], wxUSE_STD_STRING_CONV_IN_WXSTRING)
+WX_ARG_DISABLE(unicode,      [  --disable-unicode       compile without Unicode support], wxUSE_UNICODE)
+WX_ARG_ENABLE(mslu,          [  --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU)
+WX_ARG_ENABLE_PARAM(utf8,    [  --enable-utf8           use UTF-8 representation for strings (Unix only)], wxUSE_UNICODE_UTF8)
+WX_ARG_ENABLE(utf8only,      [  --enable-utf8only       only support UTF-8 locales in UTF-8 build (Unix only)], wxUSE_UNICODE_UTF8_LOCALE)
+WX_ARG_ENABLE(extended_rtti, [  --enable-extended_rtti  use extended RTTI (XTI)], wxUSE_EXTENDED_RTTI)
+if test "$USE_OS2" = 1; then
+    DEFAULT_wxUSE_OMF=no
+    WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
  fi
  
  fi
  
-dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only
-dnl     take effect on Cygwin/Mingw and not other platforms.
-if test "$wants_win32" = 1 ; then
-    USE_UNIX=0
-    USE_WIN32=1
-    AC_DEFINE(__WIN32__)
-    AC_DEFINE(__WIN95__)
-    AC_DEFINE(__WINDOWS__)
-    AC_DEFINE(__GNUWIN32__)
-    AC_DEFINE(STRICT)
-    AC_DEFINE(WINVER, 0x0400)
+WX_ARG_DISABLE(optimise,   [  --disable-optimise      compile without optimisations], wxUSE_OPTIMISE)
+
+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 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_DISABLE(vararg_macros,[  --disable-vararg_macros don't use vararg macros, even if they are supported], wxUSE_VARARG_MACROS)
+
+WX_ARG_ENABLE_PARAM(universal_binary, [[  --enable-universal_binary=archs create universal binary for the specified (or all supported) architectures]], wxUSE_UNIVERSAL_BINARY)
+WX_ARG_ENABLE_PARAM(macosx_arch,      [[  --enable-macosx_arch=ARCH  build for just the specified architecture]], wxUSE_MAC_ARCH)
+
+WX_ARG_ENABLE(compat26,      [  --enable-compat26       enable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6)
+WX_ARG_DISABLE(compat28,     [  --disable-compat28      disable wxWidgets 2.8 compatibility], WXWIN_COMPATIBILITY_2_8)
+
+WX_ARG_DISABLE(rpath,        [  --disable-rpath         disable use of rpath for uninstalled builds], wxUSE_RPATH)
+
+WX_ARG_ENABLE(objc_uniquifying,[  --enable-objc_uniquifying enable Objective-C class name uniquifying], wxUSE_OBJC_UNIQUIFYING)
+
+WX_ARG_DISABLE(visibility,   [  --disable-visibility    disable use of ELF symbols visibility even if supported], wxUSE_VISIBILITY)
+WX_ARG_DISABLE(tls,          [  --disable-tls           disable use of compiler TLS support], wxUSE_COMPILER_TLS)
+
+dnl ---------------------------------------------------------------------------
+dnl optional non GUI features
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_FEATURE(intl,          [  --enable-intl           use internationalization system], wxUSE_INTL)
+WX_ARG_FEATURE(xlocale,       [  --enable-xlocale        use x-locale support (requires wxLocale)], wxUSE_XLOCALE)
+WX_ARG_FEATURE(config,        [  --enable-config         use wxConfig (and derived) classes], wxUSE_CONFIG)
+
+WX_ARG_FEATURE(protocols,     [  --enable-protocols      use wxProtocol and derived classes], wxUSE_PROTOCOL)
+WX_ARG_FEATURE(ftp,           [  --enable-ftp            use wxFTP (requires wxProtocol], wxUSE_PROTOCOL_FTP)
+WX_ARG_FEATURE(http,          [  --enable-http           use wxHTTP (requires wxProtocol], wxUSE_PROTOCOL_HTTP)
+WX_ARG_FEATURE(fileproto,     [  --enable-fileproto      use wxFileProto class (requires wxProtocol], wxUSE_PROTOCOL_FILE)
+WX_ARG_FEATURE(sockets,       [  --enable-sockets        use socket/network classes], wxUSE_SOCKETS)
+WX_ARG_FEATURE(ipv6,          [  --enable-ipv6           enable IPv6 support in wxSocket], wxUSE_IPV6)
+WX_ARG_FEATURE(ole,           [  --enable-ole            use OLE classes (Win32 only)], wxUSE_OLE)
+WX_ARG_FEATURE(dataobj,       [  --enable-dataobj        use data object classes], wxUSE_DATAOBJ)
+
+WX_ARG_FEATURE(ipc,           [  --enable-ipc            use interprocess communication (wxSocket etc.)], wxUSE_IPC)
+
+WX_ARG_FEATURE(baseevtloop,   [  --enable-baseevtloop    use event loop in console programs too], wxUSE_CONSOLE_EVENTLOOP)
+WX_ARG_FEATURE(epollloop,     [  --enable-epollloop      use wxEpollDispatcher class (Linux only)], wxUSE_EPOLL_DISPATCHER)
+WX_ARG_FEATURE(selectloop,    [  --enable-selectloop     use wxSelectDispatcher class], wxUSE_SELECT_DISPATCHER)
+
+dnl please keep the settings below in alphabetical order
+WX_ARG_FEATURE(any,           [  --enable-any            use wxAny class], wxUSE_ANY)
+WX_ARG_FEATURE(apple_ieee,    [  --enable-apple_ieee     use the Apple IEEE codec], wxUSE_APPLE_IEEE)
+WX_ARG_FEATURE(arcstream,     [  --enable-arcstream      use wxArchive streams], wxUSE_ARCHIVE_STREAMS)
+WX_ARG_FEATURE(base64,        [  --enable-base64         use base64 encoding/decoding functions], wxUSE_BASE64)
+WX_ARG_FEATURE(backtrace,     [  --enable-backtrace      use wxStackWalker class for getting backtraces], wxUSE_STACKWALKER)
+WX_ARG_FEATURE(catch_segvs,   [  --enable-catch_segvs    catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION)
+WX_ARG_FEATURE(cmdline,       [  --enable-cmdline        use wxCmdLineParser class], wxUSE_CMDLINE_PARSER)
+WX_ARG_FEATURE(datetime,      [  --enable-datetime       use wxDateTime class], wxUSE_DATETIME)
+WX_ARG_FEATURE(debugreport,   [  --enable-debugreport    use wxDebugReport class], wxUSE_DEBUGREPORT)
+WX_ARG_FEATURE(dialupman,     [  --enable-dialupman      use dialup network classes], wxUSE_DIALUP_MANAGER)
+WX_ARG_FEATURE(dynlib,        [  --enable-dynlib         use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS)
+WX_ARG_FEATURE(dynamicloader, [  --enable-dynamicloader  use (new) wxDynamicLibrary class], wxUSE_DYNAMIC_LOADER)
+WX_ARG_FEATURE(exceptions,    [  --enable-exceptions     build exception-safe library], wxUSE_EXCEPTIONS)
+WX_ARG_FEATURE(ffile,         [  --enable-ffile          use wxFFile class], wxUSE_FFILE)
+WX_ARG_FEATURE(file,          [  --enable-file           use wxFile class], wxUSE_FILE)
+WX_ARG_FEATURE(filehistory,   [  --enable-filehistory    use wxFileHistory class], wxUSE_FILE_HISTORY)
+WX_ARG_FEATURE(filesystem,    [  --enable-filesystem     use virtual file systems classes], wxUSE_FILESYSTEM)
+WX_ARG_FEATURE(fontenum,      [  --enable-fontenum       use wxFontEnumerator class], wxUSE_FONTENUM)
+WX_ARG_FEATURE(fontmap,       [  --enable-fontmap        use font encodings conversion classes], wxUSE_FONTMAP)
+WX_ARG_FEATURE(fs_archive,    [  --enable-fs_archive     use virtual archive filesystems], wxUSE_FS_ARCHIVE)
+WX_ARG_FEATURE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
+WX_ARG_FEATURE(fs_zip,        [  --enable-fs_zip         now replaced by fs_archive], wxUSE_FS_ZIP)
+WX_ARG_FEATURE(fsvolume,      [  --enable-fsvolume       use wxFSVolume class], wxUSE_FSVOLUME)
+WX_ARG_FEATURE(fswatcher,     [  --enable-fswatcher      use wxFileSystemWatcher class], wxUSE_FSWATCHER)
+WX_ARG_FEATURE(geometry,      [  --enable-geometry       use geometry class], wxUSE_GEOMETRY)
+WX_ARG_FEATURE(log,           [  --enable-log            use logging system], wxUSE_LOG)
+WX_ARG_FEATURE(longlong,      [  --enable-longlong       use wxLongLong class], wxUSE_LONGLONG)
+WX_ARG_FEATURE(mimetype,      [  --enable-mimetype       use wxMimeTypesManager], wxUSE_MIMETYPE)
+WX_ARG_FEATURE(printfposparam,[  --enable-printfposparam use wxVsnprintf() which supports positional parameters], wxUSE_PRINTF_POS_PARAMS)
+WX_ARG_FEATURE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
+WX_ARG_FEATURE(sound,         [  --enable-sound          use wxSound class], wxUSE_SOUND)
+WX_ARG_FEATURE(stdpaths,      [  --enable-stdpaths       use wxStandardPaths class], wxUSE_STDPATHS)
+WX_ARG_FEATURE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
+WX_ARG_FEATURE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
+WX_ARG_FEATURE(sysoptions,    [  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
+WX_ARG_FEATURE(tarstream,     [  --enable-tarstream      use wxTar streams], wxUSE_TARSTREAM)
+WX_ARG_FEATURE(textbuf,       [  --enable-textbuf        use wxTextBuffer class], wxUSE_TEXTBUFFER)
+WX_ARG_FEATURE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
+WX_ARG_FEATURE(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
+WX_ARG_FEATURE(variant,       [  --enable-variant        use wxVariant class], wxUSE_VARIANT)
+WX_ARG_FEATURE(zipstream,     [  --enable-zipstream      use wxZip streams], wxUSE_ZIPSTREAM)
+
+dnl URL-related classes
+WX_ARG_FEATURE(url,           [  --enable-url            use wxURL class], wxUSE_URL)
+WX_ARG_FEATURE(protocol,      [  --enable-protocol       use wxProtocol class], wxUSE_PROTOCOL)
+WX_ARG_FEATURE(protocol_http, [  --enable-protocol-http  HTTP support in wxProtocol], wxUSE_PROTOCOL_HTTP)
+WX_ARG_FEATURE(protocol_ftp,  [  --enable-protocol-ftp   FTP support in wxProtocol], wxUSE_PROTOCOL_FTP)
+WX_ARG_FEATURE(protocol_file, [  --enable-protocol-file  FILE support in wxProtocol], wxUSE_PROTOCOL_FILE)
+
+WX_ARG_FEATURE(threads,     [  --enable-threads        use threads], wxUSE_THREADS)
+
+WX_ARG_ENABLE(iniconf,      [  --enable-iniconf        use wxIniConfig (Win32 only)], wxUSE_INICONF)
+WX_ARG_FEATURE(regkey,      [  --enable-regkey         use wxRegKey class (Win32 only)], wxUSE_REGKEY)
+
+if test "$wxUSE_GUI" = "yes"; then
+
+dnl ---------------------------------------------------------------------------
+dnl optional "big" GUI features
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_FEATURE(docview,     [  --enable-docview        use document view architecture], wxUSE_DOC_VIEW_ARCHITECTURE)
+WX_ARG_FEATURE(help,        [  --enable-help           use help subsystem], wxUSE_HELP)
+WX_ARG_FEATURE(mshtmlhelp,  [  --enable-mshtmlhelp     use MS HTML Help (win32)], wxUSE_MS_HTML_HELP)
+WX_ARG_FEATURE(html,        [  --enable-html           use wxHTML sub-library], wxUSE_HTML)
+WX_ARG_FEATURE(htmlhelp,    [  --enable-htmlhelp       use wxHTML-based help], wxUSE_WXHTML_HELP)
+WX_ARG_FEATURE(xrc,         [  --enable-xrc            use XRC resources sub-library], wxUSE_XRC)
+WX_ARG_FEATURE(aui,         [  --enable-aui            use AUI docking library], wxUSE_AUI)
+WX_ARG_FEATURE(propgrid,    [  --enable-propgrid       use wxPropertyGrid library], wxUSE_PROPGRID)
+WX_ARG_FEATURE(ribbon,      [  --enable-ribbon         use wxRibbon library], wxUSE_RIBBON)
+WX_ARG_FEATURE(stc,         [  --enable-stc            use wxStyledTextCtrl library], wxUSE_STC)
+WX_ARG_FEATURE(constraints, [  --enable-constraints    use layout-constraints system], wxUSE_CONSTRAINTS)
+WX_ARG_FEATURE(loggui,      [  --enable-loggui         use standard GUI logger], wxUSE_LOGGUI)
+WX_ARG_FEATURE(logwin,      [  --enable-logwin         use wxLogWindow], wxUSE_LOGWINDOW)
+WX_ARG_FEATURE(logdialog,   [  --enable-logdialog      use wxLogDialog], wxUSE_LOGDIALOG)
+WX_ARG_FEATURE(mdi,         [  --enable-mdi            use multiple document interface architecture], wxUSE_MDI)
+WX_ARG_FEATURE(mdidoc,      [  --enable-mdidoc         use docview architecture with MDI], wxUSE_MDI_ARCHITECTURE)
+WX_ARG_FEATURE(mediactrl,   [  --enable-mediactrl      use wxMediaCtrl class], wxUSE_MEDIACTRL)
+WX_ARG_FEATURE(gstreamer8,  [  --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix], wxUSE_GSTREAMER8)
+WX_ARG_FEATURE(richtext,    [  --enable-richtext       use wxRichTextCtrl], wxUSE_RICHTEXT)
+WX_ARG_FEATURE(postscript,  [  --enable-postscript     use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
+WX_ARG_FEATURE(printarch,   [  --enable-printarch      use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
+WX_ARG_FEATURE(svg,         [  --enable-svg            use wxSVGFileDC device context], wxUSE_SVG)
+WX_ARG_FEATURE(webkit,      [  --enable-webkit         use wxWebKitCtrl (Mac-only, use wxWebView instead)], wxUSE_WEBKIT)
+WX_ARG_FEATURE(webview,     [  --enable-webview        use wxWebView library], wxUSE_WEBVIEW)
+
+dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter
+dnl can't be disabled, don't even provide an option to do it
+if test "$wxUSE_MAC" != 1; then
+WX_ARG_FEATURE(graphics_ctx,[  --enable-graphics_ctx   use graphics context 2D drawing API], wxUSE_GRAPHICS_CONTEXT)
  fi
  fi
-if test "$doesnt_want_win32" = 1 ; then
-    USE_UNIX=1
-    USE_WIN32=0
+
+dnl ---------------------------------------------------------------------------
+dnl IPC &c
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_FEATURE(clipboard,   [  --enable-clipboard      use wxClipboard class], wxUSE_CLIPBOARD)
+WX_ARG_FEATURE(dnd,         [  --enable-dnd            use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
+
+dnl ---------------------------------------------------------------------------
+dnl optional GUI controls (in alphabetical order except the first one)
+dnl ---------------------------------------------------------------------------
+
+dnl don't set DEFAULT_wxUSE_XXX below if the option is not specified
+DEFAULT_wxUSE_CONTROLS=none
+WX_ARG_DISABLE(controls,    [  --disable-controls      disable compilation of all standard controls], wxUSE_CONTROLS)
+
+dnl even with --disable-controls, some may be enabled by an explicit
+dnl --enable-<control> later on the command line -- but by default all will be
+dnl disabled
+if test "$wxUSE_CONTROLS" = "no"; then
+    DEFAULT_wxUSE_ACCEL=no
+    DEFAULT_wxUSE_ANIMATIONCTRL=no
+    DEFAULT_wxUSE_BANNERWINDOW=no
+    DEFAULT_wxUSE_BMPBUTTON=no
+    DEFAULT_wxUSE_BUTTON=no
+    DEFAULT_wxUSE_CALCTRL=no
+    DEFAULT_wxUSE_CARET=no
+    DEFAULT_wxUSE_CHECKBOX=no
+    DEFAULT_wxUSE_CHECKLISTBOX=no
+    DEFAULT_wxUSE_CHOICE=no
+    DEFAULT_wxUSE_CHOICEBOOK=no
+    DEFAULT_wxUSE_COLLPANE=no
+    DEFAULT_wxUSE_COLOURPICKERCTRL=no
+    DEFAULT_wxUSE_COMBOBOX=no
+    DEFAULT_wxUSE_COMBOBOX=no
+    DEFAULT_wxUSE_COMMANDLINKBUTTON=no
+    DEFAULT_wxUSE_DATAVIEWCTRL=no
+    DEFAULT_wxUSE_DATEPICKCTRL=no
+    DEFAULT_wxUSE_DETECT_SM=no
+    DEFAULT_wxUSE_DIRPICKERCTRL=no
+    DEFAULT_wxUSE_DISPLAY=no
+    DEFAULT_wxUSE_FILECTRL=no
+    DEFAULT_wxUSE_FILEPICKERCTRL=no
+    DEFAULT_wxUSE_FONTPICKERCTRL=no
+    DEFAULT_wxUSE_GAUGE=no
+    DEFAULT_wxUSE_GRID=no
+    DEFAULT_wxUSE_HEADERCTRL=no
+    DEFAULT_wxUSE_HYPERLINKCTRL=no
+    DEFAULT_wxUSE_IMAGLIST=no
+    DEFAULT_wxUSE_LISTBOOK=no
+    DEFAULT_wxUSE_LISTBOX=no
+    DEFAULT_wxUSE_LISTCTRL=no
+    DEFAULT_wxUSE_MARKUP=no
+    DEFAULT_wxUSE_NOTEBOOK=no
+    DEFAULT_wxUSE_POPUPWIN=no
+    DEFAULT_wxUSE_RADIOBOX=no
+    DEFAULT_wxUSE_RADIOBTN=no
+    DEFAULT_wxUSE_RICHMSGDLG=no
+    DEFAULT_wxUSE_RICHTOOLTIP=no
+    DEFAULT_wxUSE_REARRANGECTRL=no
+    DEFAULT_wxUSE_SASH=no
+    DEFAULT_wxUSE_SCROLLBAR=no
+    DEFAULT_wxUSE_SEARCHCTRL=no
+    DEFAULT_wxUSE_SLIDER=no
+    DEFAULT_wxUSE_SPINBTN=no
+    DEFAULT_wxUSE_SPINCTRL=no
+    DEFAULT_wxUSE_SPLITTER=no
+    DEFAULT_wxUSE_STATBMP=no
+    DEFAULT_wxUSE_STATBOX=no
+    DEFAULT_wxUSE_STATLINE=no
+    DEFAULT_wxUSE_STATUSBAR=no
+    DEFAULT_wxUSE_TIMEPICKCTRL=no
+    DEFAULT_wxUSE_TIPWINDOW=no
+    DEFAULT_wxUSE_TOGGLEBTN=no
+    DEFAULT_wxUSE_TOOLBAR=no
+    DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+    DEFAULT_wxUSE_TOOLBOOK=no
+    DEFAULT_wxUSE_TOOLTIPS=no
+    DEFAULT_wxUSE_TREEBOOK=no
+    DEFAULT_wxUSE_TREECTRL=no
+    DEFAULT_wxUSE_TREELISTCTRL=no
+fi
+
+dnl features affecting multiple controls
+WX_ARG_FEATURE(markup,      [  --enable-markup         support wxControl::SetLabelMarkup], wxUSE_MARKUP)
+
+dnl please keep the settings below in alphabetical order
+WX_ARG_FEATURE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
+WX_ARG_FEATURE(animatectrl, [  --enable-animatectrl    use wxAnimationCtrl class], wxUSE_ANIMATIONCTRL)
+WX_ARG_FEATURE(bannerwindow,[  --enable-bannerwindow   use wxBannerWindow class], wxUSE_BANNERWINDOW)
+WX_ARG_FEATURE(artstd,      [  --enable-artstd         use standard XPM icons in wxArtProvider], wxUSE_ARTPROVIDER_STD)
+WX_ARG_FEATURE(arttango,    [  --enable-arttango       use Tango icons in wxArtProvider], wxUSE_ARTPROVIDER_TANGO)
+WX_ARG_FEATURE(bmpbutton,   [  --enable-bmpbutton      use wxBitmapButton class], wxUSE_BMPBUTTON)
+WX_ARG_FEATURE(bmpcombobox, [  --enable-bmpcombobox    use wxBitmapComboBox class], wxUSE_BITMAPCOMBOBOX)
+WX_ARG_FEATURE(button,      [  --enable-button         use wxButton class], wxUSE_BUTTON)
+WX_ARG_FEATURE(calendar,    [  --enable-calendar       use wxCalendarCtrl class], wxUSE_CALCTRL)
+WX_ARG_FEATURE(caret,       [  --enable-caret          use wxCaret class], wxUSE_CARET)
+WX_ARG_FEATURE(checkbox,    [  --enable-checkbox       use wxCheckBox class], wxUSE_CHECKBOX)
+WX_ARG_FEATURE(checklst,    [  --enable-checklst       use wxCheckListBox (listbox with checkboxes) class], wxUSE_CHECKLST)
+WX_ARG_FEATURE(choice,      [  --enable-choice         use wxChoice class], wxUSE_CHOICE)
+WX_ARG_FEATURE(choicebook,  [  --enable-choicebook     use wxChoicebook class], wxUSE_CHOICEBOOK)
+WX_ARG_FEATURE(collpane,    [  --enable-collpane       use wxCollapsiblePane class], wxUSE_COLLPANE)
+WX_ARG_FEATURE(colourpicker,[  --enable-colourpicker   use wxColourPickerCtrl class], wxUSE_COLOURPICKERCTRL)
+WX_ARG_FEATURE(combobox,    [  --enable-combobox       use wxComboBox class], wxUSE_COMBOBOX)
+WX_ARG_FEATURE(comboctrl,   [  --enable-comboctrl      use wxComboCtrl class], wxUSE_COMBOCTRL)
+WX_ARG_FEATURE(commandlinkbutton, [  --enable-commandlinkbutton      use wxCommmandLinkButton class], wxUSE_COMMANDLINKBUTTON)
+WX_ARG_FEATURE(dataviewctrl,[  --enable-dataviewctrl   use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL)
+WX_ARG_FEATURE(datepick,    [  --enable-datepick       use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL)
+WX_ARG_FEATURE(detect_sm,   [  --enable-detect_sm      use code to detect X11 session manager], wxUSE_DETECT_SM)
+WX_ARG_FEATURE(dirpicker,   [  --enable-dirpicker      use wxDirPickerCtrl class], wxUSE_DIRPICKERCTRL)
+WX_ARG_FEATURE(display,     [  --enable-display        use wxDisplay class], wxUSE_DISPLAY)
+WX_ARG_FEATURE(editablebox, [  --enable-editablebox    use wxEditableListBox class], wxUSE_EDITABLELISTBOX)
+WX_ARG_FEATURE(filectrl,    [  --enable-filectrl       use wxFileCtrl class], wxUSE_FILECTRL)
+WX_ARG_FEATURE(filepicker,  [  --enable-filepicker     use wxFilePickerCtrl class], wxUSE_FILEPICKERCTRL)
+WX_ARG_FEATURE(fontpicker,  [  --enable-fontpicker     use wxFontPickerCtrl class], wxUSE_FONTPICKERCTRL)
+WX_ARG_FEATURE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
+WX_ARG_FEATURE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
+WX_ARG_FEATURE(headerctrl,  [  --enable-headerctrl     use wxHeaderCtrl class], wxUSE_HEADERCTRL)
+WX_ARG_FEATURE(hyperlink,   [  --enable-hyperlink      use wxHyperlinkCtrl class], wxUSE_HYPERLINKCTRL)
+WX_ARG_FEATURE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
+WX_ARG_FEATURE(infobar,     [  --enable-infobar        use wxInfoBar class], wxUSE_INFOBAR)
+WX_ARG_FEATURE(listbook,    [  --enable-listbook       use wxListbook class], wxUSE_LISTBOOK)
+WX_ARG_FEATURE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
+WX_ARG_FEATURE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
+WX_ARG_FEATURE(notebook,    [  --enable-notebook       use wxNotebook class], wxUSE_NOTEBOOK)
+WX_ARG_FEATURE(notifmsg,    [  --enable-notifmsg       use wxNotificationMessage class], wxUSE_NOTIFICATION_MESSAGE)
+WX_ARG_FEATURE(odcombobox,  [  --enable-odcombobox     use wxOwnerDrawnComboBox class], wxUSE_ODCOMBOBOX)
+WX_ARG_FEATURE(popupwin,    [  --enable-popupwin       use wxPopUpWindow class], wxUSE_POPUPWIN)
+WX_ARG_FEATURE(radiobox,    [  --enable-radiobox       use wxRadioBox class], wxUSE_RADIOBOX)
+WX_ARG_FEATURE(radiobtn,    [  --enable-radiobtn       use wxRadioButton class], wxUSE_RADIOBTN)
+WX_ARG_FEATURE(richmsgdlg,  [  --enable-richmsgdlg     use wxRichMessageDialog class], wxUSE_RICHMSGDLG)
+WX_ARG_FEATURE(richtooltip, [  --enable-richtooltip    use wxRichToolTip class], wxUSE_RICHTOOLTIP)
+WX_ARG_FEATURE(rearrangectrl,[  --enable-rearrangectrl  use wxRearrangeList/Ctrl/Dialog], wxUSE_REARRANGECTRL)
+WX_ARG_FEATURE(sash,        [  --enable-sash           use wxSashWindow class], wxUSE_SASH)
+WX_ARG_FEATURE(scrollbar,   [  --enable-scrollbar      use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR)
+WX_ARG_FEATURE(searchctrl,  [  --enable-searchctrl     use wxSearchCtrl class], wxUSE_SEARCHCTRL)
+WX_ARG_FEATURE(slider,      [  --enable-slider         use wxSlider class], wxUSE_SLIDER)
+WX_ARG_FEATURE(spinbtn,     [  --enable-spinbtn        use wxSpinButton class], wxUSE_SPINBTN)
+WX_ARG_FEATURE(spinctrl,    [  --enable-spinctrl       use wxSpinCtrl class], wxUSE_SPINCTRL)
+WX_ARG_FEATURE(splitter,    [  --enable-splitter       use wxSplitterWindow class], wxUSE_SPLITTER)
+WX_ARG_FEATURE(statbmp,     [  --enable-statbmp        use wxStaticBitmap class], wxUSE_STATBMP)
+WX_ARG_FEATURE(statbox,     [  --enable-statbox        use wxStaticBox class], wxUSE_STATBOX)
+WX_ARG_FEATURE(statline,    [  --enable-statline       use wxStaticLine class], wxUSE_STATLINE)
+WX_ARG_FEATURE(stattext,    [  --enable-stattext       use wxStaticText class], wxUSE_STATTEXT)
+WX_ARG_FEATURE(statusbar,   [  --enable-statusbar      use wxStatusBar class], wxUSE_STATUSBAR)
+WX_ARG_FEATURE(taskbaricon, [  --enable-taskbaricon    use wxTaskBarIcon class], wxUSE_TASKBARICON)
+WX_ARG_FEATURE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
+WX_ARG_FEATURE(textctrl,    [  --enable-textctrl       use wxTextCtrl class], wxUSE_TEXTCTRL)
+WX_ARG_FEATURE(datepick,    [  --enable-timepick       use wxTimePickerCtrl class], wxUSE_TIMEPICKCTRL)
+WX_ARG_FEATURE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)
+WX_ARG_FEATURE(togglebtn,   [  --enable-togglebtn      use wxToggleButton class], wxUSE_TOGGLEBTN)
+WX_ARG_FEATURE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUSE_TOOLBAR)
+WX_ARG_FEATURE(toolbook,    [  --enable-toolbook       use wxToolbook class], wxUSE_TOOLBOOK)
+WX_ARG_FEATURE(treebook,    [  --enable-treebook       use wxTreebook class], wxUSE_TREEBOOK)
+WX_ARG_FEATURE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)
+WX_ARG_FEATURE(treelist,    [  --enable-treelist       use wxTreeListCtrl class], wxUSE_TREELISTCTRL)
+
+dnl ---------------------------------------------------------------------------
+dnl common dialogs
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_FEATURE(commondlg,   [  --enable-commondlg      use all common dialogs], wxUSE_COMMONDLGS)
+WX_ARG_FEATURE(aboutdlg,    [  --enable-aboutdlg       use wxAboutBox], wxUSE_ABOUTDLG)
+WX_ARG_FEATURE(choicedlg,   [  --enable-choicedlg      use wxChoiceDialog], wxUSE_CHOICEDLG)
+WX_ARG_FEATURE(coldlg,      [  --enable-coldlg         use wxColourDialog], wxUSE_COLOURDLG)
+WX_ARG_FEATURE(filedlg,     [  --enable-filedlg        use wxFileDialog], wxUSE_FILEDLG)
+WX_ARG_FEATURE(finddlg,     [  --enable-finddlg        use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
+WX_ARG_FEATURE(fontdlg,     [  --enable-fontdlg        use wxFontDialog], wxUSE_FONTDLG)
+WX_ARG_FEATURE(dirdlg,      [  --enable-dirdlg         use wxDirDialog], wxUSE_DIRDLG)
+WX_ARG_FEATURE(msgdlg,      [  --enable-msgdlg         use wxMessageDialog], wxUSE_MSGDLG)
+WX_ARG_FEATURE(numberdlg,   [  --enable-numberdlg      use wxNumberEntryDialog], wxUSE_NUMBERDLG)
+WX_ARG_FEATURE(splash,      [  --enable-splash         use wxSplashScreen], wxUSE_SPLASH)
+WX_ARG_FEATURE(textdlg,     [  --enable-textdlg        use wxTextDialog], wxUSE_TEXTDLG)
+WX_ARG_FEATURE(tipdlg,      [  --enable-tipdlg         use startup tips], wxUSE_STARTUP_TIPS)
+WX_ARG_FEATURE(progressdlg, [  --enable-progressdlg    use wxProgressDialog], wxUSE_PROGRESSDLG)
+WX_ARG_FEATURE(wizarddlg,   [  --enable-wizarddlg      use wxWizard], wxUSE_WIZARDDLG)
+
+dnl ---------------------------------------------------------------------------
+dnl misc GUI options
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_FEATURE(menus,       [  --enable-menus          use wxMenu/wxMenuBar/wxMenuItem classes], wxUSE_MENUS)
+WX_ARG_FEATURE(miniframe,   [  --enable-miniframe      use wxMiniFrame class], wxUSE_MINIFRAME)
+WX_ARG_FEATURE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUSE_TOOLTIPS)
+WX_ARG_FEATURE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
+WX_ARG_FEATURE(mousewheel,  [  --enable-mousewheel     use mousewheel], wxUSE_MOUSEWHEEL)
+WX_ARG_FEATURE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
+WX_ARG_FEATURE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
+WX_ARG_FEATURE(hotkey,      [  --enable-hotkey         use wxWindow::RegisterHotKey()], wxUSE_HOTKEY)
+WX_ARG_FEATURE(joystick,    [  --enable-joystick       use wxJoystick], wxUSE_JOYSTICK)
+WX_ARG_FEATURE(metafile,    [  --enable-metafiles      use wxMetaFile], wxUSE_METAFILE)
+WX_ARG_FEATURE(dragimage,   [  --enable-dragimage      use wxDragImage], wxUSE_DRAGIMAGE)
+WX_ARG_FEATURE(accessibility,[  --enable-accessibility  enable accessibility support], wxUSE_ACCESSIBILITY)
+WX_ARG_FEATURE(uiactionsim,  [  --enable-uiactionsim    use wxUIActionSimulator (experimental)], wxUSE_UIACTIONSIMULATOR)
+WX_ARG_FEATURE(dctransform,  [  --enable-dctransform    use wxDC::SetTransformMatrix and related], wxUSE_DC_TRANSFORM_MATRIX)
+WX_ARG_FEATURE(webviewwebkit,[  --enable-webviewwebkit  use wxWebView WebKit backend], wxUSE_WEBVIEW_WEBKIT)
+
+dnl ---------------------------------------------------------------------------
+dnl support for image formats that do not rely on external library
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_FEATURE(palette,     [  --enable-palette        use wxPalette class], wxUSE_PALETTE)
+WX_ARG_FEATURE(image,       [  --enable-image          use wxImage class], wxUSE_IMAGE)
+WX_ARG_FEATURE(gif,         [  --enable-gif            use gif images (GIF file format)], wxUSE_GIF)
+WX_ARG_FEATURE(pcx,         [  --enable-pcx            use pcx images (PCX file format)], wxUSE_PCX)
+WX_ARG_FEATURE(tga,         [  --enable-tga            use tga images (TGA file format)], wxUSE_TGA)
+WX_ARG_FEATURE(iff,         [  --enable-iff            use iff images (IFF file format)], wxUSE_IFF)
+WX_ARG_FEATURE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
+WX_ARG_FEATURE(xpm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
+WX_ARG_FEATURE(ico_cur,     [  --enable-ico_cur        use Windows ICO and CUR formats], wxUSE_ICO_CUR)
+
+dnl ---------------------------------------------------------------------------
+dnl wxMSW-only options
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_FEATURE(dccache,     [  --enable-dccache        cache temporary wxDC objects (Win32 only)], wxUSE_DC_CACHEING)
+WX_ARG_FEATURE(ps-in-msw,   [  --enable-ps-in-msw      use PS printing in wxMSW (Win32 only)], wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+WX_ARG_FEATURE(ownerdrawn,  [  --enable-ownerdrawn     use owner drawn controls (Win32 and OS/2 only)], wxUSE_OWNER_DRAWN)
+WX_ARG_FEATURE(uxtheme,     [  --enable-uxtheme        enable support for Windows XP themed look (Win32 only)], wxUSE_UXTHEME)
+WX_ARG_FEATURE(wxdib,       [  --enable-wxdib          use wxDIB class (Win32 only)], wxUSE_DIB)
+WX_ARG_FEATURE(webviewie,   [  --enable-webviewie      use wxWebView IE backend (Win32 only)], wxUSE_WEBVIEW_IE)
+
+dnl this one is not really MSW-specific but it exists mainly to be turned off
+dnl under MSW, it should be off by default on the other platforms
+if test "$wxUSE_MSW" != 1; then
+    DEFAULT_wxUSE_AUTOID_MANAGEMENT=no
  fi
  fi
-dnl (end of Windows-only piece)
  
  
-if test "$USE_UNIX" = 1 ; then
-    wxUSE_UNIX=yes
-    AC_DEFINE(__UNIX__)
+WX_ARG_FEATURE(autoidman,   [  --enable-autoidman      use automatic ids management], wxUSE_AUTOID_MANAGEMENT)
+
  fi
  fi
+dnl for GUI only
  
  dnl ---------------------------------------------------------------------------
  dnl Checks for programs
  
  dnl ---------------------------------------------------------------------------
  dnl Checks for programs
@@ -1378,7 +1089,7 @@ dnl   defines CFLAGS
  dnl
  dnl this magic incantation is needed to prevent AC_PROG_CC from setting the
  dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add
  dnl
  dnl this magic incantation is needed to prevent AC_PROG_CC from setting the
  dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add
-dnl -g and -O flags ourselves below
+dnl (if not already present in C*FLAGS) the -g and -O flags ourselves below
  CFLAGS=${CFLAGS:=}
  AC_BAKEFILE_PROG_CC
  
  CFLAGS=${CFLAGS:=}
  AC_BAKEFILE_PROG_CC
  
@@ -1386,9 +1097,6 @@ dnl is -traditional needed for correct compilations
  dnl   adds -traditional for gcc if needed
  AC_PROG_GCC_TRADITIONAL
  
  dnl   adds -traditional for gcc if needed
  AC_PROG_GCC_TRADITIONAL
  
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
  dnl C++-compiler checks
  dnl   defines CXX with the compiler to use
  dnl   defines GXX with yes if using gxx
  dnl C++-compiler checks
  dnl   defines CXX with the compiler to use
  dnl   defines GXX with yes if using gxx
@@ -1399,139 +1107,239 @@ dnl see CFLAGS line above
  CXXFLAGS=${CXXFLAGS:=}
  AC_BAKEFILE_PROG_CXX
  
  CXXFLAGS=${CXXFLAGS:=}
  AC_BAKEFILE_PROG_CXX
  
-AC_LANG_RESTORE
-
-dnl ranlib command
-dnl   defines RANLIB with the appropriate command
-AC_PROG_RANLIB
+dnl configure always sets CXX to something as it falls back to g++ even if no
+dnl C++ compiler was found, but we prefer to abort now with a clear error
+dnl message rather than give errors about all tests failures below
+if test "$CXX" = "g++" -a "$GXX" != "yes"; then
+    AC_MSG_ERROR([C++ compiler is needed to build wxWidgets])
+fi
  
  dnl ar command
  dnl   defines AR with the appropriate command
  
  dnl ar command
  dnl   defines AR with the appropriate command
-AC_CHECK_TOOL(AR, ar)
-if test "x$AR" = "x" ; then
-    AC_MSG_ERROR([ar is needed to build wxWidgets])
+dnl
+dnl For Sun CC AC_BAKEFILE below sets AR to the compiler itself.
+if test "x$SUNCXX" != xyes; then
+    AC_CHECK_TOOL(AR, ar)
+    if test "x$AR" = "x" ; then
+        AC_MSG_ERROR([ar is needed to build wxWidgets])
+    fi
  fi
  
  fi
  
-dnl install checks
-dnl   defines INSTALL with the appropriate command
-AC_PROG_INSTALL
+dnl ---------------------------------------------------------------------------
+dnl Mac-specific SDK/architectures checks
+dnl ---------------------------------------------------------------------------
  
  
-dnl   make install path absolute (if not already);
-dnl   will fail with (some) MSDOS paths
-case ${INSTALL} in
-  /* ) # Absolute
-     ;;
-  ?:* ) # Drive letter, considered as absolute.
-     ;;
-  *)
-     INSTALL=`pwd`/${INSTALL} ;;
-esac
+if test "$wxUSE_MAC" = 1; then
  
  
+retest_macosx_linking=no
  
  
-case "${host}" in
+OSX_ARCH_OPTS=""
  
  
-    dnl The other BSD's should probably go in here too, since this is
-    dnl to workaround a strange static lib BSDism.
-    dnl Mac OS X install seems to ignore -p option...
-    *-*-darwin* )
-        INSTALL_PROGRAM="cp -fp"
-        INSTALL_DATA="cp -fp"
-        ;;
-    *)
-        ;;
-esac
+dnl Deal with architecture selection. By default, we compile for the current
+dnl architecture, whatever it is. With --enable-universal_binary the list of
+dnl architectures can be explicitly specified. If it isn't, we compile for all
+dnl supported ones.
+if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
+    if test "x$wxUSE_MAC_ARCH" != xno; then
+        AC_MSG_WARN([--enable-macosx_arch is ignored when --enable-universal_binary is used.])
+    fi
  
  
-dnl strip command
-dnl   defines STRIP as strip or nothing (true) if not found
-AC_CHECK_TOOL(STRIP, strip, true)
+    if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
+        OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY
+    else dnl Use all architectures supported
+        OSX_ARCH_OPTS="ppc,i386"
+        if test "$wxUSE_OSX_COCOA" = 1; then
+            OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
+        fi
+    fi
  
  
-dnl Win32 tools
-if test "$wxUSE_WINE" = "yes"; then
-    AC_CHECK_TOOL(RESCOMP, wrc)
+    AC_MSG_CHECKING([for architectures to use in universal binary])
+    AC_MSG_RESULT([$OSX_ARCH_OPTS])
+
+    dnl NOTE: Only the compiler driver needs arch flags.  The link editor
+    dnl is incapable of using them but the compiler driver (which we use
+    dnl as LD when building dynamic libraries) uses them to invoke the
+    dnl real ld multiple times.  If we moved to libtool -dynamic we would
+    dnl need no arch flags because libtool automatically invokes ld for
+    dnl every architecture found in the fat input files.
+    dnl
+    dnl For static library builds, AR/RANLIB automatically create proper
+    dnl fat archives although AR is unable to update them once RANLIB has
+    dnl made them into proper fat archives.  Fortunately, our link process
+    dnl simply removes the .a file before using ar to create a new one.
+    dnl If we did move to libtool -static we still wouldn't need arch flags
+    dnl because libtool automatically figures it out based on input.
+    retest_macosx_linking=yes
  else
  else
-    case "${host}" in
-    *-*-cygwin* | *-*-mingw32* )
-        AC_CHECK_TOOL(RESCOMP, windres)
-        AC_CHECK_TOOL(DLLTOOL, dlltool)
-        ;;
-    esac
+    if test "x$wxUSE_MAC_ARCH" != xno; then
+        OSX_ARCH_OPTS=$wxUSE_MAC_ARCH
+    fi
  fi
  
  fi
  
-dnl does make support "-include" (only GNU make does AFAIK)?
-AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
-[
-    if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
-            egrep -s GNU > /dev/null); then
-        wx_cv_prog_makeisgnu="yes"
-    else
-        wx_cv_prog_makeisgnu="no"
+if test "x$OSX_ARCH_OPTS" != "x"; then
+    dnl Check if there is more than one architecture
+    if echo $OSX_ARCH_OPTS | grep -q ","; then
+        AC_MSG_WARN([Disabling dependency tracking due to universal binary build.])
+        disable_macosx_deps=yes
+
+        dnl HACK: PCH could be made to work by precompiling for each architecture into separate directories
+        dnl and including all architecture directories with each compiler invocation.
+        dnl That would require a major rework of Bakefile and at the same time it would be nice to have
+        dnl Objective-C++ precompiled headers.
+        AC_MSG_WARN([Disabling precompiled headers due to universal binary build.])
+        bk_use_pch=no
      fi
      fi
-])
  
  
-if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
-    IF_GNU_MAKE=""
-else
-    IF_GNU_MAKE="#"
+    OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'`
+
+    CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
+    CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
+    OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
+    OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS"
+    LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
  fi
  
  fi
  
-AC_SUBST(IF_GNU_MAKE)
+dnl Set up the Mac OS X SDK.  We do this early so configure tests will occur
+dnl with the SDK in place.
+dnl NOTE: We clobber wxUSE_MACOSX_SDK with the SDK path
+if test "x$wxUSE_MACOSX_SDK" = "xno"; then
+    wxUSE_MACOSX_SDK=
+elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
+    # TODO: Search for most recent SDK and use it.
+    wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
+fi
  
  
-dnl we don't need to check for VPATH support in GNU make - it does have it
-if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
-dnl check if VPATH works
-AC_CACHE_CHECK([if make supports VPATH], wx_cv_prog_makevpath, [
-dnl create Makefile
-cat - << EOF > confMake
-check : file
-       cp \$? \$@
-       cp \$? final_file
-EOF
  
  
-if test ! -d sub ; then
-  mkdir sub
+if test "x$wxUSE_MACOSX_SDK" != "x"; then
+    AC_MSG_CHECKING([for SDK directory $wxUSE_MACOSX_SDK])
+    if ! test -d "$wxUSE_MACOSX_SDK"; then
+        AC_MSG_FAILURE([not found])
+    else
+        AC_MSG_RESULT([exists])
+    fi
+    dnl CC and CXX will have these flags added below, after the compiler has been chosen
+    MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK"
+    retest_macosx_linking=yes
+    dnl NOTE: When libtool is used in lieu of AR/RANLIB (i.e. in static mode)
+    dnl the syslibroot makes no difference.  We aren't using libtool now but
+    dnl if we ever did, be aware that you don't need to worry about it.
+fi
+
+dnl Set up the deployment target
+dnl No   : Don't specify a min version even if using an SDK
+dnl Yes  : Use the version from the SDK if used, otherwise same as no
+dnl Param: Use the specified version
+if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then
+    wxUSE_MACOSX_VERSION_MIN=
+elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then
+    if test "x$wxUSE_MACOSX_SDK" != "x"; then
+        AC_MSG_CHECKING([SDK deployment version])
+dnl We need to quote the next line where we don't need macros and do need [] in the regex
+[
+        MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
+]
+        # If that failed, try again with the new key
+        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
+[
+            MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
+]
+        fi
+
+        if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then
+            wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN
+            AC_MSG_RESULT([$wxUSE_MACOSX_VERSION_MIN])
+        else
+            AC_MSG_WARN([Could not determine deployment target from SDKSettings.plist])
+            wxUSE_MACOSX_VERSION_MIN=
+        fi
+    else
+        wxUSE_MACOSX_VERSION_MIN=
+    fi
+elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
+    wxUSE_MACOSX_VERSION_MIN=10.5
+fi
+
+if test "x$MACOSX_SDK_OPTS" != "x"; then 
+    eval "CC=\"$CC $MACOSX_SDK_OPTS\""
+    eval "CXX=\"$CXX $MACOSX_SDK_OPTS\""
+    eval "LD=\"$LD $MACOSX_SDK_OPTS\""
+    retest_macosx_linking=yes
  fi
  fi
-echo dummy > sub/file
-${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null
-RESULT=$?
-rm -f sub/file check final_file confMake
-rmdir sub
-if test "$RESULT" = 0; then
-  wx_cv_prog_makevpath="yes"
-else
-  wx_cv_prog_makevpath="no"
+
+if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
+    if test "$wxUSE_OSX_IPHONE" = 1; then
+        MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN"
+    else
+        MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
+    fi
+    eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\""
+    eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\""
+    eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\""
+    retest_macosx_linking=yes
  fi
  fi
-])
  
  
-if test "x$wx_cv_prog_makevpath" != "xyes"; then
-AC_MSG_ERROR([
-You need a make-utility that is able to use the variable
-VPATH correctly.
-If your version of make does not support VPATH correctly,
-please install GNU-make (possibly as gmake), and start
-configure with the following command:
-export MAKE=gmake; ./configure  for sh-type shells
-setenv MAKE gmake; ./configure  for csh-type shells
-Also please do remember to use gmake in this case every time
-you are trying to compile.
-])
-fi dnl make without VPATH
-fi dnl not GNU make
+dnl If either an SDK or a version option was added, make sure that we can
+dnl still compile and link both C and C++.  If we didn't do this, then most
+dnl of the remaining tests would fail.
+if test "x$retest_macosx_linking" = "xyes"; then
+    AC_LANG_PUSH(C)
+    AC_MSG_CHECKING([if C compiler ($CC) works with SDK/version options])
+    AC_TRY_LINK([],[],[AC_MSG_RESULT([yes])],[AC_MSG_FAILURE([no.  Try a different SDK]); exit 1])
+    AC_LANG_POP()
  
  
-dnl needed for making link to setup.h
-AC_PROG_LN_S
+    AC_LANG_PUSH(C++)
+    AC_MSG_CHECKING([if C++ compiler ($CXX) works with SDK/version options])
+    AC_TRY_LINK([],[],[AC_MSG_RESULT([yes])],[AC_MSG_FAILURE([no.  Try a different SDK]); exit 1])
+    AC_LANG_POP()
+fi
  
  
-dnl lndir can be used by "make dist" to save copying files
-AC_CHECK_PROGS(LNDIR, lndir, [cp -pR])
+fi dnl wxUSE_MAC
  
  
+case "${host}" in
+
+    dnl The other BSD's should probably go in here too, since this is
+    dnl to workaround a strange static lib BSDism.
+    dnl Mac OS X install seems to ignore -p option...
+    *-*-darwin* )
+        INSTALL_PROGRAM="cp -fp"
+        INSTALL_DATA="cp -fp"
+        ;;
+    *)
+        ;;
+esac
  
  dnl ------------------------------------------------------------------------
  dnl Platform specific tests
  dnl ------------------------------------------------------------------------
  
  
  dnl ------------------------------------------------------------------------
  dnl Platform specific tests
  dnl ------------------------------------------------------------------------
  
-dnl xlC needs -qunique under AIX so that one source file can be
-dnl compiled to multiple object files and safely linked together.
-if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
-    CXXFLAGS="$CXXFLAGS -qunique"
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
+    dnl While g++ predefines _GNU_SOURCE by default, gcc does not, so do it
+    dnl explicitly to ensure that the tests done below using C compiler
+    dnl succeed, otherwise things like pthread_mutexattr_settype() (and many
+    dnl others) wouldn't be detected.
+    AC_DEFINE(_GNU_SOURCE)
+
+    dnl For non-g++ compilers (including gcc, as mentioned above) we need to
+    dnl add this flag explicitly when building our own code later too.
+    GNU_SOURCE_FLAG="-D_GNU_SOURCE"
+    CFLAGS="$GNU_SOURCE_FLAG $CFLAGS"
+fi
+
+if test "x$USE_AIX" = "x1"; then
+    dnl xlC needs -qunique under AIX so that one source file can be
+    dnl compiled to multiple object files and safely linked together.
+    if test "x$XLCXX" = "xyes"; then
+        CXXFLAGS="-qunique $CXXFLAGS"
+    fi
+
+    dnl AIX sys/timer.h header #defines func_data as t_union.data breaking the
+    dnl compilation of GTK+ headers that use func_data as parameter name in
+    dnl several places. We could work around this by inserting "#undef
+    dnl func_data" in the code but IBM provides a possibility to disable this
+    dnl #define by pre-defining the symbol below and this seems to be simpler.
+    dnl And if we have any problems because of it we can always remove it and
+    dnl use the #undef approach.
+    CPPFLAGS="-D_LINUX_SOURCE_COMPAT $CPPFLAGS"
  fi
  
  dnl This case is for PowerPC OS X vs. everything else
  fi
  
  dnl This case is for PowerPC OS X vs. everything else
@@ -1564,7 +1372,7 @@ case "${host}" in
          [AC_MSG_RESULT([yes])
          dnl We must use -D so source files that don't include wx/setup.h
          dnl but do include CFBase will work.
          [AC_MSG_RESULT([yes])
          dnl We must use -D so source files that don't include wx/setup.h
          dnl but do include CFBase will work.
-        CPPFLAGS="$CPPFLAGS -D__CF_USE_FRAMEWORK_INCLUDES__"],
+        CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS"],
          [AC_MSG_FAILURE([no.  CoreFoundation not available.])]
          )
          ]
          [AC_MSG_FAILURE([no.  CoreFoundation not available.])]
          )
          ]
@@ -1572,6 +1380,74 @@ case "${host}" in
    ;;
  esac
  
    ;;
  esac
  
+dnl Determine whether we want to use Cygwin as Windows or POSIX platform: the
+dnl latter makes more sense for wxGTK/Motif/X11 ports
+wants_win32=0
+doesnt_want_win32=0
+case "${host}" in
+  *-*-cygwin*)
+      if test "$wxUSE_MSW" = 1 ; then
+        wants_win32=1
+      else
+        dnl when we use cygwin compiler with -mno-cygwin option it uses mingw32
+        dnl headers and libraries, so it's Windows-like in this case
+        AC_CACHE_CHECK([if -mno-cygwin is in effect], wx_cv_nocygwin,
+            [
+                AC_TRY_COMPILE(
+                    [],
+                    [
+                        #ifdef __MINGW32__
+                            choke me
+                        #endif
+                    ],
+                    wx_cv_nocygwin=no,
+                    wx_cv_nocygwin=yes
+                )
+            ]
+        )
+
+        if test "$wx_cv_nocygwin" = "yes"; then
+            wants_win32=1
+        else
+            doesnt_want_win32=1
+        fi
+      fi
+      if test "$wants_win32" = 1 ; then
+        BAKEFILE_FORCE_PLATFORM=win32
+      fi
+  ;;
+  *-*-mingw*)
+      wants_win32=1
+  ;;
+esac
+
+if test "$wxUSE_WINE" = "yes"; then
+    wants_win32=1
+    LDFLAGS_GUI="-mwindows"
+fi
+
+dnl NB: The two tests below are *NOT* mutually exclusive! They should only
+dnl     take effect on Cygwin/Mingw and not other platforms.
+if test "$wants_win32" = 1 ; then
+    USE_UNIX=0
+    USE_WIN32=1
+    AC_DEFINE(__WIN32__)
+    AC_DEFINE(__WIN95__)
+    AC_DEFINE(__WINDOWS__)
+    AC_DEFINE(__GNUWIN32__)
+    AC_DEFINE(STRICT)
+fi
+if test "$doesnt_want_win32" = 1 ; then
+    USE_UNIX=1
+    USE_WIN32=0
+fi
+dnl (end of Windows-only piece)
+
+if test "$USE_UNIX" = 1 ; then
+    wxUSE_UNIX=yes
+    AC_DEFINE(__UNIX__)
+fi
+
  dnl This case is for OS/2 vs. everything else
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
  dnl This case is for OS/2 vs. everything else
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
@@ -1616,11 +1492,11 @@ case "${host}" in
                    #else
                                "Innotek6"
                    #endif
                    #else
                                "Innotek6"
                    #endif
-                     );
+                      );
                        exit(0);
                    }
                ],
                        exit(0);
                    }
                ],
-             wx_cv_gccversion=`cat conftestval`,
+              wx_cv_gccversion=`cat conftestval`,
                wx_cv_gccversion="EMX2",
                dnl Compilation error: Assuming standard EMX environment
                wx_cv_gccversion="EMX2"
                wx_cv_gccversion="EMX2",
                dnl Compilation error: Assuming standard EMX environment
                wx_cv_gccversion="EMX2"
@@ -1640,7 +1516,7 @@ case "${host}" in
        if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then
          AC_MSG_WARN([Building DLLs requires OMF mode, enabled])
          wxUSE_OMF=yes
        if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then
          AC_MSG_WARN([Building DLLs requires OMF mode, enabled])
          wxUSE_OMF=yes
-       enable_omf=yes
+        enable_omf=yes
        fi
        dnl (end of OS/2-only piece)
    ;;
        fi
        dnl (end of OS/2-only piece)
    ;;
@@ -1652,9 +1528,6 @@ case "${host}" in
        dnl ---------------------------------------------------------------------
        dnl (non-OS/2-only piece)
  
        dnl ---------------------------------------------------------------------
        dnl (non-OS/2-only piece)
  
-      AC_LANG_SAVE
-      AC_LANG_CPLUSPLUS
-
        AC_CACHE_CHECK([for strcasecmp() in string.h], ac_cv_string_strcasecmp, [
            AC_TRY_LINK([
                #include <string.h>
        AC_CACHE_CHECK([for strcasecmp() in string.h], ac_cv_string_strcasecmp, [
            AC_TRY_LINK([
                #include <string.h>
@@ -1689,7 +1562,6 @@ case "${host}" in
            fi
        fi
  
            fi
        fi
  
-      AC_LANG_RESTORE
        dnl (end of non-OS/2-only piece)
    ;;
  esac
        dnl (end of non-OS/2-only piece)
    ;;
  esac
@@ -1698,27 +1570,15 @@ dnl ------------------------------------------------------------------------
  dnl Check for headers
  dnl ------------------------------------------------------------------------
  
  dnl Check for headers
  dnl ------------------------------------------------------------------------
  
-dnl defines HAVE_STDLIB_H
-AC_CHECK_HEADERS(stdlib.h)
-dnl defines HAVE_MALLOC_H
-AC_CHECK_HEADERS(malloc.h)
-dnl defines HAVE_UNISTD_H
-AC_CHECK_HEADERS(unistd.h)
-dnl defines HAVE_WCHAR_H
-AC_CHECK_HEADERS(wchar.h)
+dnl Note: non-empty last parameter makes check compile-only,
+dnl   skipping worthless preprocessing check
+AC_CHECK_HEADERS(langinfo.h wchar.h,,, [AC_INCLUDES_DEFAULT])
  
  dnl maybe wchar_t is in wcstr.h if we don't have wchar.h?
  if test "$ac_cv_header_wchar_h" != "yes"; then
  
  dnl maybe wchar_t is in wcstr.h if we don't have wchar.h?
  if test "$ac_cv_header_wchar_h" != "yes"; then
-    dnl defines HAVE_WCSTR_H
-    AC_CHECK_HEADERS(wcstr.h)
+    AC_CHECK_HEADERS([wcstr.h],,, [AC_INCLUDES_DEFAULT()])
  fi
  
  fi
  
-dnl defines HAVE_FNMATCH_H
-AC_CHECK_HEADERS(fnmatch.h)
-
-dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
-AC_CHECK_HEADERS(langinfo.h)
-
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
        dnl Explicitly link -lintl if langinfo.h is available
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
        dnl Explicitly link -lintl if langinfo.h is available
@@ -1732,6 +1592,17 @@ case "${host}" in
    ;;
  esac
  
    ;;
  esac
  
+if test "$USE_UNIX" = 1 ; then
+    dnl POSIX needs this for select(), but old systems don't have it
+    AC_CHECK_HEADERS([sys/select.h],,, [AC_INCLUDES_DEFAULT()])
+
+    dnl Header defining C++ ABI is currently only available with g++ but test
+    dnl for it unconditionally in case it becomes supported by other compilers.
+    AC_LANG_PUSH(C++)
+    AC_CHECK_HEADERS([cxxabi.h],,, [AC_INCLUDES_DEFAULT()])
+    AC_LANG_POP()
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl Checks for compiler characteristics
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl Checks for compiler characteristics
  dnl ---------------------------------------------------------------------------
@@ -1744,7 +1615,6 @@ AC_C_INLINE
  dnl check the sizes of integral types (give some reasonable default values for
  dnl cross-compiling)
  dnl   defines the size of certain types of variables in SIZEOF_<TYPE>
  dnl check the sizes of integral types (give some reasonable default values for
  dnl cross-compiling)
  dnl   defines the size of certain types of variables in SIZEOF_<TYPE>
-AC_CHECK_SIZEOF(char, 1)
  AC_CHECK_SIZEOF(short, 2)
  AC_CHECK_SIZEOF(void *, 4)
  AC_CHECK_SIZEOF(int, 4)
  AC_CHECK_SIZEOF(short, 2)
  AC_CHECK_SIZEOF(void *, 4)
  AC_CHECK_SIZEOF(int, 4)
@@ -1757,9 +1627,9 @@ case "${host}" in
      ;;
      *-hp-hpux* )
          AC_CHECK_SIZEOF(long long, 0)
      ;;
      *-hp-hpux* )
          AC_CHECK_SIZEOF(long long, 0)
-        if test "$ac_cv_sizeof_long_long" != "0"; then
+        if test "$ac_cv_sizeof_long_long" != 0; then
              dnl HPUX 10.20 headers need this define in order to use long long definitions
              dnl HPUX 10.20 headers need this define in order to use long long definitions
-            CPPFLAGS="$CPPFLAGS -D_INCLUDE_LONGLONG"
+            CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS"
          fi
      ;;
      * )
          fi
      ;;
      * )
@@ -1786,34 +1656,37 @@ AC_CHECK_SIZEOF(wchar_t, 0,
          #include <stdio.h>
      ]
  )
          #include <stdio.h>
      ]
  )
-if test "$ac_cv_sizeof_wchar_t" != "0"; then
-    wxUSE_WCHAR_T=yes
-else
-    wxUSE_WCHAR_T=no
+if test "$ac_cv_sizeof_wchar_t" = 0; then
+    AC_MSG_ERROR([wxWidgets requires wchar_t support.])
  fi
  fi
+AC_DEFINE(wxUSE_WCHAR_T)
  
  dnl checks needed to define wxVaCopy
  AC_CACHE_CHECK([for va_copy],
      wx_cv_func_va_copy,
      [
  
  dnl checks needed to define wxVaCopy
  AC_CACHE_CHECK([for va_copy],
      wx_cv_func_va_copy,
      [
+        AC_LANG_PUSH(C++)
          AC_LINK_IFELSE([
          AC_LINK_IFELSE([
-            #include <stdarg.h>
-            void foo(char *f, ...)
-            {
-                va_list ap1, ap2;
-                va_start(ap1, f);
-                va_copy(ap2, ap1);
-                va_end(ap2);
-                va_end(ap1);
-            }
-            int main()
-            {
-                foo("hi", 17);
-                return 0;
-            }],
+            AC_LANG_SOURCE([
+                #include <stdarg.h>
+                void foo(char *f, ...)
+                {
+                    va_list ap1, ap2;
+                    va_start(ap1, f);
+                    va_copy(ap2, ap1);
+                    va_end(ap2);
+                    va_end(ap1);
+                }
+                int main()
+                {
+                    foo("hi", 17);
+                    return 0;
+                }])
+            ],
              wx_cv_func_va_copy=yes,
              wx_cv_func_va_copy=no
          )
              wx_cv_func_va_copy=yes,
              wx_cv_func_va_copy=no
          )
+        AC_LANG_POP()
      ]
  )
  
      ]
  )
  
@@ -1825,22 +1698,24 @@ else
          wx_cv_type_va_list_lvalue,
          [
              AC_RUN_IFELSE([
          wx_cv_type_va_list_lvalue,
          [
              AC_RUN_IFELSE([
-                #include <stdarg.h>
-                int foo(char *f, ...)
-                {
-                    va_list ap1, ap2;
-                    va_start(ap1, f);
-                    ap2 = ap1;
-                    if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 )
-                        return 1;
-                    va_end(ap2);
-                    va_end(ap1);
-                    return 0;
-                }
-                int main()
-                {
-                    return foo("hi", 17);
-                }],
+                AC_LANG_SOURCE([
+                    #include <stdarg.h>
+                    int foo(char *f, ...)
+                    {
+                        va_list ap1, ap2;
+                        va_start(ap1, f);
+                        ap2 = ap1;
+                        if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 )
+                            return 1;
+                        va_end(ap2);
+                        va_end(ap1);
+                        return 0;
+                    }
+                    int main()
+                    {
+                        return foo("hi", 17);
+                    }])
+                ],
                  wx_cv_type_va_list_lvalue=yes,
                  wx_cv_type_va_list_lvalue=no,
                  dnl assume most common case for cross-compiling...
                  wx_cv_type_va_list_lvalue=yes,
                  wx_cv_type_va_list_lvalue=no,
                  dnl assume most common case for cross-compiling...
@@ -1856,81 +1731,119 @@ else
      fi
  fi
  
      fi
  fi
  
+dnl don't check for vararg macros if they're explicitly disabled: this is
+dnl useful if the user code using the library wants to limit itself to standard
+dnl C++ only (e.g. is compiled with g++ -std=c++98)
+if test "$wxUSE_VARARG_MACROS" = "yes"; then
+
+dnl Check if variadic macros (C99 feature) are supported:
+AC_CACHE_CHECK(
+    [whether the compiler supports variadic macros],
+    [wx_cv_have_variadic_macros],
+    [
+        dnl C compiler might support variadic macros when C++ one doesn't
+        dnl (happens with gcc/g++ 2.95.4), so must use C++ one explicitly
+        AC_LANG_PUSH(C++)
+        AC_COMPILE_IFELSE([
+            AC_LANG_PROGRAM(
+                [
+                    #include <stdio.h>
+                    #define test(fmt, ...) printf(fmt, __VA_ARGS__)
+                ],
+                [
+                    test("%s %d %p", "test", 1, 0);
+                ]
+            )],
+            [wx_cv_have_variadic_macros=yes],
+            [wx_cv_have_variadic_macros=no]
+            )
+        AC_LANG_POP()
+    ]
+)
+
+if test $wx_cv_have_variadic_macros = "yes"; then
+    AC_DEFINE(HAVE_VARIADIC_MACROS)
+fi
+
+fi dnl wxUSE_VARARG_MACROS == yes
+
+
  dnl check for large file support
  dnl check for large file support
+LARGEFILE_CPPFLAGS=
  AC_SYS_LARGEFILE
  AC_SYS_LARGEFILE
+if test "$ac_cv_sys_file_offset_bits" = "64"; then
+    LARGEFILE_CPPFLAGS="-D_FILE_OFFSET_BITS=64"
+elif test "$ac_cv_sys_large_files" = 1; then
+    LARGEFILE_CPPFLAGS="-D_LARGE_FILES"
+fi
  
  dnl we need to define _FILE_OFFSET_BITS or _LARGE_FILES on the compiler command
  dnl line because otherwise the system headers risk being included before
  dnl wx/defs.h which defines these constants leading to inconsistent
  dnl sizeof(off_t) in different source files of the same program and linking
  dnl problems
  
  dnl we need to define _FILE_OFFSET_BITS or _LARGE_FILES on the compiler command
  dnl line because otherwise the system headers risk being included before
  dnl wx/defs.h which defines these constants leading to inconsistent
  dnl sizeof(off_t) in different source files of the same program and linking
  dnl problems
-if test "x$wx_largefile" = "xyes"; then
-    if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
-
-        dnl We get "Large Files (ILP32) not supported in strict ANSI mode."
-        dnl #error from HP standard headers unless __STDC_EXT__ is defined.
-        dnl The compiler should define it automatically, but some old g++
-        dnl versions don't define it, so test and add it if necessary. AFAIK
-        dnl the problem only affects the C++ compiler so it is added to
-        dnl CXXFLAGS only.
-        if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
-            AC_CACHE_CHECK(
-                [if -D__STDC_EXT__ is required],
-                wx_cv_STDC_EXT_required,
-                [
-                    AC_LANG_SAVE
-                    AC_LANG_CPLUSPLUS
-                    AC_TRY_COMPILE(
-                        [],
-                        [
-                            #ifndef __STDC_EXT__
-                                choke me
-                            #endif
-                        ],
-                        wx_cv_STDC_EXT_required=no,
-                        wx_cv_STDC_EXT_required=yes
-                    )
-                    AC_LANG_RESTORE
-                ]
-            )
-            if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
-                WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
-            fi
+if test -n "$LARGEFILE_CPPFLAGS"; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $LARGEFILE_CPPFLAGS"
+
+    dnl We get "Large Files (ILP32) not supported in strict ANSI mode."
+    dnl #error from HP standard headers unless __STDC_EXT__ is defined.
+    dnl The compiler should define it automatically, but some old g++
+    dnl versions don't define it, so test and add it if necessary. AFAIK
+    dnl the problem only affects the C++ compiler so it is added to
+    dnl CXXFLAGS only.
+    if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
+        AC_CACHE_CHECK(
+            [if -D__STDC_EXT__ is required],
+            wx_cv_STDC_EXT_required,
+            [
+                AC_LANG_PUSH(C++)
+                AC_TRY_COMPILE(
+                    [],
+                    [
+                        #ifndef __STDC_EXT__
+                            choke me
+                        #endif
+                    ],
+                    wx_cv_STDC_EXT_required=no,
+                    wx_cv_STDC_EXT_required=yes
+                )
+                AC_LANG_POP()
+            ]
+        )
+        if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
+            WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
          fi
          fi
-    else
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGE_FILES"
-    fi
-    dnl AC_FUNC_FSEEKO sets HAVE_FSEEKO and $ac_cv_sys_largefile_source
-    AC_FUNC_FSEEKO
-    if test "$ac_cv_sys_largefile_source" != no; then
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
      fi
  fi
  
      fi
  fi
  
+dnl AC_FUNC_FSEEKO sets HAVE_FSEEKO and $ac_cv_sys_largefile_source
+dnl
+dnl it may be affected by large file flags (this happens under HP-UX 11 for
+dnl example) so set them before using it and also use C++ to ensure that we get
+dnl errors, not warnings, about the missing functions
+AC_LANG_PUSH(C++)
+old_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LARGEFILE_CPPFLAGS"
+AC_FUNC_FSEEKO
+CPPFLAGS="$old_CPPFLAGS"
+AC_LANG_POP()
+if test "$ac_cv_sys_largefile_source" != no; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
+fi
+
  dnl check for bytesex stuff (don't use AC_C_BIGENDIAN to allow cross-compiling)
  WX_C_BIGENDIAN
  
  dnl check for iostream (as opposed to iostream.h) standard header
  WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH))
  
  dnl check for bytesex stuff (don't use AC_C_BIGENDIAN to allow cross-compiling)
  WX_C_BIGENDIAN
  
  dnl check for iostream (as opposed to iostream.h) standard header
  WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH))
  
-dnl check whether C++ compiler supports bool built-in type
-WX_CPP_BOOL
-
  dnl check whether C++ compiler supports explicit keyword
  WX_CPP_EXPLICIT
  
  dnl check whether C++ compiler supports explicit keyword
  WX_CPP_EXPLICIT
  
-dnl check whether C++ compiler supports C++ casts
-AC_CXX_CONST_CAST
-AC_CXX_REINTERPRET_CAST
-AC_CXX_STATIC_CAST
-dnl we don't use HAVE_DYNAMIC_CAST anywhere right now...
-dnl AC_CXX_DYNAMIC_CAST
-
  dnl With Sun CC, temporaries have block scope by default. This flag is needed
  dnl to get the expression scope behaviour that conforms to the standard.
  if test "x$SUNCXX" = xyes; then
  dnl With Sun CC, temporaries have block scope by default. This flag is needed
  dnl to get the expression scope behaviour that conforms to the standard.
  if test "x$SUNCXX" = xyes; then
-    CXXFLAGS="$CXXFLAGS -features=tmplife"
+    CXXFLAGS="-features=tmplife $GNU_SOURCE_FLAG $CXXFLAGS"
  fi
  
  dnl Sun X11 headers are (still, in 2005!) non-ANSI and the best they could do
  fi
  
  dnl Sun X11 headers are (still, in 2005!) non-ANSI and the best they could do
@@ -1938,21 +1851,60 @@ dnl was to hack their C++ compiler to accept them silently -- but C compiler
  dnl still spits out dozens of warnings for each X include file, so suppress
  dnl them
  if test "x$SUNCC" = xyes; then
  dnl still spits out dozens of warnings for each X include file, so suppress
  dnl them
  if test "x$SUNCC" = xyes; then
-    CFLAGS="$CFLAGS -erroff=E_NO_EXPLICIT_TYPE_GIVEN"
+    CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS"
  fi
  
  fi
  
-dnl SGI mipsPro compiler gives this warning for "conversion from pointer to
-dnl same-sized integral type" even when there is an explicit cast and as there
-dnl is no way to turn it off and there are hundreds of these warnings in wx
-dnl sources, just turn it off for now
+dnl SGI mipsPro compiler version 7.4.4 and later (and maybe some earlier
+dnl versions too but it's known that 7.4.2 doesn't give this warning but does
+dnl instead warn about "unknown warning number 3970" which explains that we
+dnl don't want to do this for it) gives this warning for "conversion from
+dnl pointer to same-sized integral type" even when there is an explicit cast
+dnl and as there is no way to turn it off and there are hundreds of these
+dnl warnings in wx sources, just turn it off for now
  dnl
  dnl a better long term solution would be to use #pragma set/reset woff in
  dnl wxPtrToUInt() and use it instead of casts elsewhere
  if test "x$SGICC" = "xyes"; then
  dnl
  dnl a better long term solution would be to use #pragma set/reset woff in
  dnl wxPtrToUInt() and use it instead of casts elsewhere
  if test "x$SGICC" = "xyes"; then
-    CFLAGS="$CFLAGS -woff 3970"
+    AC_CACHE_CHECK([if cc version is 7.4.4 or greater],
+        wx_cv_prog_sgicc744,
+        [
+            AC_TRY_COMPILE([],
+                [
+                    #if _SGI_COMPILER_VERSION >= 744
+                    chock me: mipsPro is 7.4.4 or later
+                    #endif
+                ],
+                wx_cv_prog_sgicc744=no,
+                wx_cv_prog_sgicc744=yes
+            )
+        ]
+    )
+
+    if test "x$wx_cv_prog_sgicc744" = "xyes"; then
+        CFLAGS="-woff 3970 $CFLAGS"
+    fi
  fi
  if test "x$SGICXX" = "xyes"; then
  fi
  if test "x$SGICXX" = "xyes"; then
-    CXXFLAGS="$CXXFLAGS -woff 3970"
+    AC_CACHE_CHECK([if CC version is 7.4.4 or greater],
+        wx_cv_prog_sgicxx744,
+        [
+            AC_LANG_PUSH(C++)
+            AC_TRY_COMPILE([],
+                [
+                    #if _SGI_COMPILER_VERSION >= 744
+                    chock me: mipsPro is 7.4.4 or later
+                    #endif
+                ],
+                wx_cv_prog_sgicxx744=no,
+                wx_cv_prog_sgicxx744=yes
+            )
+            AC_LANG_POP()
+        ]
+    )
+
+    if test "x$wx_cv_prog_sgicxx744" = "xyes"; then
+        CXXFLAGS="-woff 3970 $CXXFLAGS"
+    fi
  fi
  
  dnl HP-UX c89/aCC compiler warnings
  fi
  
  dnl HP-UX c89/aCC compiler warnings
@@ -1961,12 +1913,16 @@ if test "x$HPCC" = "xyes"; then
      dnl       even for directives inside #if which is not true (i.e. which are
      dnl       used for other compilers/OS) and so we have no way to get rid of it
      dnl 2450: "long long is non standard" -- yes, we know
      dnl       even for directives inside #if which is not true (i.e. which are
      dnl       used for other compilers/OS) and so we have no way to get rid of it
      dnl 2450: "long long is non standard" -- yes, we know
-    CFLAGS="$CFLAGS +W 2011,2450"
+    CFLAGS="+W 2011,2450 $CFLAGS"
  fi
  if test "x$HPCXX" = "xyes"; then
      dnl 2340: "value copied to temporary, reference to temporary used": very
      dnl       painful as triggered by any occurrence of user-defined conversion
  fi
  if test "x$HPCXX" = "xyes"; then
      dnl 2340: "value copied to temporary, reference to temporary used": very
      dnl       painful as triggered by any occurrence of user-defined conversion
-    CXXFLAGS="$CXXFLAGS +W 2340"
+    dnl 4232: "conversion from 'Foo *' to a more strictly aligned type 'Bar *'
+    dnl       may cause misaligned access": this might indicate a real problem
+    dnl       but any use of GTK+ cast macros results in it so it's unusable
+    dnl       for wxGTK code
+    CXXFLAGS="+W 2340,4232 $CXXFLAGS"
  fi
  
  dnl DEC/Compaq/HP cxx warnings
  fi
  
  dnl DEC/Compaq/HP cxx warnings
@@ -1981,10 +1937,12 @@ if test "x$COMPAQCXX" = "xyes"; then
      CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
  fi
  
      CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
  fi
  
+dnl the next few tests are all for C++ features and so need to be done using
+dnl C++ compiler
+AC_LANG_PUSH(C++)
+
  dnl check for std::string or std::wstring
  if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
  dnl check for std::string or std::wstring
  if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
-    AC_LANG_PUSH(C++)
-
      if test "$wxUSE_UNICODE" = "yes"; then
          std_string="std::wstring"
          char_type="wchar_t"
      if test "$wxUSE_UNICODE" = "yes"; then
          std_string="std::wstring"
          char_type="wchar_t"
@@ -1993,125 +1951,213 @@ if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
          char_type="char"
      fi
  
          char_type="char"
      fi
  
-    dnl check if <string> declares std::wstring
-    AC_MSG_CHECKING([for $std_string in <string>])
-    AC_TRY_COMPILE([#include <string>],
-                   [$std_string foo;],
-                   [AC_MSG_RESULT(yes)
-                    AC_DEFINE(HAVE_STD_WSTRING)],
-                   [AC_MSG_RESULT(no)
-                    AC_MSG_CHECKING([if std::basic_string<$char_type> works])
-                    AC_TRY_COMPILE([
-                        #ifdef HAVE_WCHAR_H
-                        #  ifdef __CYGWIN__
-                        #    include <stddef.h>
-                        #  endif
-                        #  include <wchar.h>
-                        #endif
-                        #ifdef HAVE_STDLIB_H
-                        #  include <stdlib.h>
-                        #endif
-                        #include <stdio.h>
-                        #include <string>
-                        ],
-                        [std::basic_string<$char_type> foo;
-                         const $char_type* dummy = foo.c_str();],
-                        [AC_MSG_RESULT(yes)],
-                        [AC_MSG_RESULT([no])
-                         if test "$wxUSE_STL" = "yes"; then
-                             AC_MSG_ERROR([Can't use --enable-stl without $std_string or std::basic_string<$char_type>])
-                         elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
-                             AC_MSG_ERROR([Can't use --enable-std_string without $std_string or std::basic_string<$char_type>])
-                         else
-                             AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
-                             wxUSE_STD_STRING=no
-                         fi
-                        ]
-                    )
-                    ])
+    dnl check if <string> declares std::[w]string
+    AC_CACHE_CHECK([for $std_string in <string>],
+        wx_cv_class_stdstring,
+        [
+            AC_TRY_COMPILE([#include <string>],
+                [$std_string foo;],
+                wx_cv_class_stdstring=yes,
+                wx_cv_class_stdstring=no
+            )
+        ]
+    )
+
+    if test "$wx_cv_class_stdstring" = yes; then
+        if test "$wxUSE_UNICODE" = "yes"; then
+            AC_DEFINE(HAVE_STD_WSTRING)
+        fi
+        dnl we don't need HAVE_STD_STRING, we just suppose it's available if
+        dnl wxUSE_STD_STRING==yes
+    else
+        AC_CACHE_CHECK([if std::basic_string<$char_type> works],
+            wx_cv_class_stdbasicstring,
+            [
+                AC_TRY_COMPILE([
+                    #ifdef HAVE_WCHAR_H
+                    #  ifdef __CYGWIN__
+                    #    include <stddef.h>
+                    #  endif
+                    #  include <wchar.h>
+                    #endif
+                    #ifdef HAVE_STDLIB_H
+                    #  include <stdlib.h>
+                    #endif
+                    #include <stdio.h>
+                    #include <string>
+                    ],
+                    [std::basic_string<$char_type> foo;
+                     const $char_type* dummy = foo.c_str();],
+                    wx_cv_class_stdbasicstring=yes,
+                    wx_cv_class_stdbasicstring=no
+                )
+            ]
+        )
  
  
-    AC_LANG_POP
+        if test "$wx_cv_class_stdbasicstring" != yes; then
+            if test "$wxUSE_STL" = "yes"; then
+                AC_MSG_ERROR([Can't use --enable-stl without $std_string or std::basic_string<$char_type>])
+            elif test "$wxUSE_STD_STRING" = "yes"; then
+                AC_MSG_ERROR([Can't use --enable-std_string without $std_string or std::basic_string<$char_type>])
+            else
+                AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
+                wxUSE_STD_STRING=no
+            fi
+        fi
+    fi
  fi
  
  if test "$wxUSE_STD_IOSTREAM" = "yes"; then
  fi
  
  if test "$wxUSE_STD_IOSTREAM" = "yes"; then
-    AC_LANG_PUSH(C++)
-
      AC_CHECK_TYPES([std::istream, std::ostream],,
                     [wxUSE_STD_IOSTREAM=no],
                     [#include <iostream>])
  
      if test "$wxUSE_STD_IOSTREAM" != "yes"; then
      AC_CHECK_TYPES([std::istream, std::ostream],,
                     [wxUSE_STD_IOSTREAM=no],
                     [#include <iostream>])
  
      if test "$wxUSE_STD_IOSTREAM" != "yes"; then
-        if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then
+        if test "$wxUSE_STD_IOSTREAM" = "yes"; then
              AC_MSG_ERROR([Can't use --enable-std_iostreams without std::istream and std::ostream])
          else
              AC_MSG_WARN([No std::iostreams, switching to --disable-std_iostreams])
          fi
      fi
              AC_MSG_ERROR([Can't use --enable-std_iostreams without std::istream and std::ostream])
          else
              AC_MSG_WARN([No std::iostreams, switching to --disable-std_iostreams])
          fi
      fi
-
-    AC_LANG_POP
  fi
  
  if test "$wxUSE_STL" = "yes"; then
  fi
  
  if test "$wxUSE_STL" = "yes"; then
-    AC_LANG_PUSH(C++)
-
      dnl check for basic STL functionality
      dnl check for basic STL functionality
-    AC_MSG_CHECKING([for basic STL functionality])
-    AC_TRY_COMPILE([#include <string>
-                    #include <functional>
-                    #include <algorithm>
-                    #include <vector>
-                    #include <list>],
-                    [std::vector<int> moo;
-                     std::list<int> foo;
-                     std::vector<int>::iterator it =
-                         std::find_if(moo.begin(), moo.end(),
-                                      std::bind2nd(std::less<int>(), 3));],
-                    [AC_MSG_RESULT([yes])],
-                    [AC_MSG_RESULT([no])
-                     AC_MSG_ERROR([Basic STL functionality missing])])
+    AC_CACHE_CHECK([for basic STL functionality],
+        wx_cv_lib_stl,
+        [AC_TRY_COMPILE([#include <string>
+            #include <functional>
+            #include <algorithm>
+            #include <vector>
+            #include <list>],
+            [std::vector<int> moo;
+             std::list<int> foo;
+             std::vector<int>::iterator it =
+                 std::find_if(moo.begin(), moo.end(),
+                              std::bind2nd(std::less<int>(), 3));],
+            wx_cv_lib_stl=yes,
+            wx_cv_lib_stl=no
+        )]
+    )
+
+    if test "$wx_cv_lib_stl" != yes; then
+         AC_MSG_ERROR([Can't use --enable-stl as basic STL functionality is missing])
+    fi
  
      dnl check for compliant std::string::compare
  
      dnl check for compliant std::string::compare
-    AC_MSG_CHECKING([for compliant std::string::compare])
-    AC_TRY_COMPILE([#include <string>],
-                   [std::string foo, bar;
-                    foo.compare(bar);
-                    foo.compare(1, 1, bar);
-                    foo.compare(1, 1, bar, 1, 1);
-                    foo.compare("");
-                    foo.compare(1, 1, "");
-                    foo.compare(1, 1, "", 2);],
-                   [AC_MSG_RESULT(yes)
-                    AC_DEFINE(HAVE_STD_STRING_COMPARE)],
-                   [AC_MSG_RESULT(no)])
-
-    dnl check for hash_map and hash_set headers
-    AC_CHECK_HEADER([hash_map],
-                    [AC_MSG_CHECKING([for hash_map and hash_set])
-                     AC_TRY_COMPILE([#include <hash_map>
-                                     #include <hash_set>],
-                                    [std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
-                                     std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;],
-                                    [AC_MSG_RESULT(yes)
-                                     AC_DEFINE(HAVE_HASH_MAP)
-                                     AC_DEFINE(HAVE_STD_HASH_MAP)],
-                                    [AC_MSG_RESULT(no)])
-                     ])
+    AC_CACHE_CHECK([for compliant std::string::compare],
+        wx_cv_func_stdstring_compare,
+        [AC_TRY_COMPILE([#include <string>],
+            [std::string foo, bar;
+            foo.compare(bar);
+            foo.compare(1, 1, bar);
+            foo.compare(1, 1, bar, 1, 1);
+            foo.compare("");
+            foo.compare(1, 1, "");
+            foo.compare(1, 1, "", 2);],
+            wx_cv_func_stdstring_compare=yes,
+            wx_cv_func_stdstring_compare=no
+        )]
+    )
  
  
-    AC_CHECK_HEADER([ext/hash_map],
-                    [AC_MSG_CHECKING([for hash_map and hash_set])
-                     AC_TRY_COMPILE([#include <ext/hash_map>
-                                     #include <ext/hash_set>],
-                                    [__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
-                                     __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;],
-                                    [AC_MSG_RESULT(yes)
-                                     AC_DEFINE(HAVE_EXT_HASH_MAP)
-                                     AC_DEFINE(HAVE_GNU_CXX_HASH_MAP)],
-                                    [AC_MSG_RESULT(no)])
-                     ])
+    if test "$wx_cv_func_stdstring_compare" = yes; then
+        AC_DEFINE(HAVE_STD_STRING_COMPARE)
+    fi
+
+    if test "$wx_cv_class_gnuhashmapset" = yes; then
+         AC_DEFINE(HAVE_EXT_HASH_MAP)
+         AC_DEFINE(HAVE_GNU_CXX_HASH_MAP)
+    fi
+
+    AC_CHECK_HEADER([unordered_map],
+        [AC_CACHE_CHECK([for unordered_map and unordered_set in std],
+            wx_cv_class_stdunorderedmapset,
+            [AC_TRY_COMPILE([#include <unordered_map>
+                #include <unordered_set>],
+                [std::unordered_map<double*, char*> test1;
+                 std::unordered_set<char*> test2;],
+                wx_cv_class_stdunorderedmapset=yes,
+                wx_cv_class_stdunorderedmapset=no)
+            ]
+        )],
+        [],
+        [ ]
+    )
+
+    if test "$wx_cv_class_stdunorderedmapset" = yes; then
+         AC_DEFINE(HAVE_STD_UNORDERED_MAP)
+         AC_DEFINE(HAVE_STD_UNORDERED_SET)
+    else
+        AC_CHECK_HEADER([tr1/unordered_map],
+            [AC_CACHE_CHECK([for unordered_map and unordered_set in std::tr1],
+                wx_cv_class_tr1unorderedmapset,
+                [AC_TRY_COMPILE([#include <tr1/unordered_map>
+                    #include <tr1/unordered_set>],
+                    [std::tr1::unordered_map<double*, char*> test1;
+                     std::tr1::unordered_set<char*> test2;
+            #if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<2)
+            #error can't use unordered_{map,set} with gcc-4.[01]: http://gcc.gnu.org/PR24389
+            #endif],
+                    wx_cv_class_tr1unorderedmapset=yes,
+                    wx_cv_class_tr1unorderedmapset=no)
+                ]
+            )],
+            [],
+            [ ]
+        )
+
+        if test "$wx_cv_class_tr1unorderedmapset" = yes; then
+            AC_DEFINE(HAVE_TR1_UNORDERED_MAP)
+            AC_DEFINE(HAVE_TR1_UNORDERED_SET)
+        else
+            dnl check for hash_map and hash_set headers
+            AC_CHECK_HEADER([hash_map],
+                [AC_CACHE_CHECK([for std::hash_map and hash_set],
+                    wx_cv_class_stdhashmapset,
+                    [AC_TRY_COMPILE([#include <hash_map>
+                        #include <hash_set>],
+                        [std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
+                         std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;],
+                        wx_cv_class_stdhashmapset=yes,
+                        wx_cv_class_stdhashmapset=no)
+                    ]
+                )],
+                [],
+                [ ]
+            )
+
+            if test "$wx_cv_class_stdhashmapset" = yes; then
+                AC_DEFINE(HAVE_HASH_MAP)
+                AC_DEFINE(HAVE_STD_HASH_MAP)
+            fi
+
+            AC_CHECK_HEADER([ext/hash_map],
+                [AC_CACHE_CHECK([for GNU hash_map and hash_set],
+                    wx_cv_class_gnuhashmapset,
+                    [AC_TRY_COMPILE([#include <ext/hash_map>
+                        #include <ext/hash_set>],
+                        [__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
+                         __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;],
+                        wx_cv_class_gnuhashmapset=yes,
+                        wx_cv_class_gnuhashmapset=no)
+                    ]
+                )],
+                [],
+                [ ]
+            )
  
  
-    AC_LANG_POP
+        fi
+    fi
  fi
  
  fi
  
+AC_CHECK_HEADERS([type_traits tr1/type_traits])
+
+dnl check for atomic operations builtins for wx/atomic.h:
+WX_ATOMIC_BUILTINS
+
+dnl pop C++
+AC_LANG_POP()
+
  dnl ---------------------------------------------------------------------------
  dnl Define search path for includes and libraries: all headers and libs will be
  dnl looked for in all directories of this path
  dnl ---------------------------------------------------------------------------
  dnl Define search path for includes and libraries: all headers and libs will be
  dnl looked for in all directories of this path
@@ -2128,6 +2174,12 @@ dnl In the same vein. Motif 2.1 should be tried before Motif 1.2 for the
  dnl systems which have both (AIX 4.x does)
  SEARCH_INCLUDE="\
      /usr/local/include        \
  dnl systems which have both (AIX 4.x does)
  SEARCH_INCLUDE="\
      /usr/local/include        \
+    /usr/local/X11/include    \
+    /usr/local/include/X11    \
+    /usr/local/X11R7/include  \
+    /usr/local/X11R6/include  \
+    /usr/local/include/X11R7  \
+    /usr/local/include/X11R6  \
                                \
      /usr/Motif-2.1/include    \
      /usr/Motif-1.2/include    \
                                \
      /usr/Motif-2.1/include    \
      /usr/Motif-1.2/include    \
@@ -2138,36 +2190,34 @@ SEARCH_INCLUDE="\
                                \
      /usr/include/Xm           \
                                \
                                \
      /usr/include/Xm           \
                                \
+    /usr/X11R7/include        \
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
                                \
                                \
+    /usr/include/X11R7        \
      /usr/include/X11R6        \
      /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
                                \
      /usr/X11/include          \
      /usr/include/X11          \
                                \
      /usr/X11/include          \
      /usr/include/X11          \
-    /usr/local/X11/include    \
-    /usr/local/include/X11    \
                                \
      /usr/XFree86/include/X11  \
      /usr/pkg/include          \
                                \
                                \
      /usr/XFree86/include/X11  \
      /usr/pkg/include          \
                                \
+    /usr/local/X1R5/include  \
+    /usr/local/include/X11R5  \
+    /usr/X11R5/include        \
+    /usr/include/X11R5        \
+                              \
+    /usr/local/X11R4/include  \
+    /usr/local/include/X11R4  \
+    /usr/X11R4/include        \
+    /usr/include/X11R4        \
+                              \
      /usr/openwin/share/include"
  
  dnl try to find out the standard lib locations for the systems with multiple
  dnl ABIs
      /usr/openwin/share/include"
  
  dnl try to find out the standard lib locations for the systems with multiple
  dnl ABIs
-AC_MSG_CHECKING([for libraries directory])
+AC_MSG_CHECKING([for libraries directories])
  
  case "${host}" in
      *-*-irix6* )
  
  case "${host}" in
      *-*-irix6* )
@@ -2180,7 +2230,9 @@ case "${host}" in
                          if test -f $libc; then
                              save_LIBS="$LIBS"
                              LIBS="$libc"
                          if test -f $libc; then
                              save_LIBS="$LIBS"
                              LIBS="$libc"
-                            AC_LINK_IFELSE([int main() { return 0; }],
+                            AC_LINK_IFELSE([
+                                    AC_LANG_SOURCE([int main() { return 0; }])
+                                ],
                                  wx_cv_std_libpath=`echo $d | sed s@/usr/@@`)
                              LIBS="$save_LIBS"
                              if test "x$wx_cv_std_libpath" != "x"; then
                                  wx_cv_std_libpath=`echo $d | sed s@/usr/@@`)
                              LIBS="$save_LIBS"
                              if test "x$wx_cv_std_libpath" != "x"; then
@@ -2189,9 +2241,6 @@ case "${host}" in
                          fi
                      done
                  done
                          fi
                      done
                  done
-                if test "x$wx_cv_std_libpath" = "x"; then
-                    wx_cv_std_libpath="lib"
-                fi
              ]
          )
          ;;
              ]
          )
          ;;
@@ -2200,29 +2249,50 @@ case "${host}" in
          dnl use ../lib or ../lib/64 depending on the size of void*
          if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
              wx_cv_std_libpath="lib/64"
          dnl use ../lib or ../lib/64 depending on the size of void*
          if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
              wx_cv_std_libpath="lib/64"
-        else
-            wx_cv_std_libpath="lib"
          fi
          ;;
  
      *-*-linux* )
          fi
          ;;
  
      *-*-linux* )
-        dnl use ../lib or ../lib64 depending on the size of void*
-        if test "$ac_cv_sizeof_void_p" = 8 -a \
-                -d "/usr/lib64" -a ! -h "/usr/lib64"; then
-            wx_cv_std_libpath="lib64"
+        dnl Recent Debian versions (as of 2011) use new approach to multiarch
+        dnl and put the libraries under /usr/lib/arch-linux-gnu. Annoyingly,
+        dnl "arch" here is not `uname -m` because it is "i386" even when uname
+        dnl returns e.g. "i686". So we need to test for it explicitly.
+        if test "$ac_cv_sizeof_void_p" = 8; then
+            if test -d "/usr/lib/`uname -m`-linux-gnu"; then
+                wx_cv_std_libfullpath="/usr/lib/`uname -m`-linux-gnu"
+            elif test -d "/usr/lib64" -a ! -h "/usr/lib64"; then
+                wx_cv_std_libpath="lib64"
+            fi
          else
          else
-            wx_cv_std_libpath="lib"
+            case "${host}" in
+                i*86-*-linux* )
+                    if test -d '/usr/lib/i386-linux-gnu'; then
+                        wx_cv_std_libfullpath='/usr/lib/i386-linux-gnu'
+                    fi
+            esac
          fi
          fi
-        ;;
  
  
-    *)
-        wx_cv_std_libpath="lib";
+        dnl And on top of all this, some packages haven't been updated for
+        dnl full multiarch support yet so we still need to look in /usr/lib
+        dnl too as well.
+        if test -n "$wx_cv_std_libfullpath" -a -d "/usr/lib"; then
+            wx_cv_std_libfullpath="$wx_cv_std_libfullpath /usr/lib"
+        fi
          ;;
  esac
  
          ;;
  esac
  
-AC_MSG_RESULT($wx_cv_std_libpath)
+if test -z "$wx_cv_std_libpath"; then
+    wx_cv_std_libpath="lib"
+fi
+
+if test -z "$wx_cv_std_libfullpath"; then
+    wx_cv_std_libfullpath="/usr/$wx_cv_std_libpath"
+fi
+
+
+AC_MSG_RESULT($wx_cv_std_libfullpath)
  
  
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath"
  
  dnl Cross compiling with gcc?
  if test "$build" != "$host" -a "$GCC" = yes; then
  
  dnl Cross compiling with gcc?
  if test "$build" != "$host" -a "$GCC" = yes; then
@@ -2254,7 +2324,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then
              x_includes=$ac_find_includes
          fi
          if test -z "$x_libraries" -o "$x_libraries" = NONE; then
              x_includes=$ac_find_includes
          fi
          if test -z "$x_libraries" -o "$x_libraries" = NONE; then
-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt)
+            WX_PATH_FIND_LIBRARIES(Xt)
              x_libraries=$ac_find_libraries
          fi
      fi
              x_libraries=$ac_find_libraries
          fi
      fi
@@ -2267,44 +2337,59 @@ 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 check for glibc version
+dnl Only add the -lm library if floating point functions cannot be used
+dnl without it.  This check is important on cygwin because of the bizarre
+dnl way that they have organized functions into libraries.  On cygwin, both
+dnl libc.a and libm.a are symbolic links to a single lib libcygwin.a.  This
+dnl means that
+dnl   1) linking with -lm is not necessary, and
+dnl   2) linking with -lm is dangerous if the order of libraries is wrong
+dnl In particular, if you compile any program with -mno-cygwin and link with
+dnl -lm, it will crash instantly when it is run.  This happens because the
+dnl linker incorrectly links the Cygwin libm.a (==libcygwin.a), which replaces
+dnl the ___main function instead of allowing it to be defined by
+dnl /usr/lib/mingw/libmingw32.a as it should be.
  dnl
  dnl
-dnl VZ: I have no idea why had this check been there originally, but now
-dnl     we could probably do without it by just always adding _GNU_SOURCE
-if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
-    AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
-        AC_TRY_COMPILE([#include <features.h>],
-            [
-                #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
-                not glibc 2.1
-                #endif
-            ],
-            [
-                wx_cv_lib_glibc21=yes
-            ],
-            [
-                wx_cv_lib_glibc21=no
-            ]
-        )
-    ])
-    if test "$wx_cv_lib_glibc21" = "yes"; then
-        AC_DEFINE(wxHAVE_GLIBC2)
+dnl On MacOS X, this test will find that -lm is unnecessary and leave it out.
+dnl
+dnl Just check a few floating point functions. If they are all found without
+dnl -lm, then we must not need -lm.
+have_cos=0
+have_floor=0
+AC_CHECK_FUNCS(cos, have_cos=1)
+AC_CHECK_FUNCS(floor, have_floor=1)
+AC_MSG_CHECKING(if floating point functions link without -lm)
+if test "$have_cos" = 1 -a "$have_floor" = 1; then
+    AC_MSG_RESULT(yes)
+else
+    AC_MSG_RESULT(no)
+    LIBS="$LIBS -lm"
+    # use different functions to avoid configure caching
+    have_sin=0
+    have_ceil=0
+    AC_CHECK_FUNCS(sin, have_sin=1)
+    AC_CHECK_FUNCS(ceil, have_ceil=1)
+    AC_MSG_CHECKING(if floating point functions link with -lm)
+    if test "$have_sin" = 1 -a "$have_ceil" = 1; then
+        AC_MSG_RESULT(yes)
+    else
+        AC_MSG_RESULT(no)
+        # not sure we should warn the user, crash, etc.
      fi
  fi
  
      fi
  fi
  
-dnl we may need _GNU_SOURCE for 2 things:
+dnl check for C99 string to long long conversion functions, assume that if we
+dnl have the unsigned variants, then we have the signed ones as well
  dnl
  dnl
-dnl  1. to get PTHREAD_MUTEX_RECURSIVE with glibc 2.1+ (strictly speaking we
-dnl  only need _XOPEN_SOURCE=500 but just defining this disables _BSD_SOURCE
-dnl  which breaks libtiff compilation, so it is simpler to just define
-dnl  _GNU_SOURCE to get everything)
-dnl
-dnl  2. for Unicode functions
-if test "x$wx_cv_lib_glibc21" = "xyes"; then
-    if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then
-        AC_DEFINE(_GNU_SOURCE)
-    fi
+dnl at least under SGI these functions are only available in C99 code and not
+dnl in C++ so do these tests using C++ compiler
+AC_LANG_PUSH(C++)
+if test "wxUSE_UNICODE" = "yes"; then
+    WX_CHECK_FUNCS(wcstoull)
+else
+    WX_CHECK_FUNCS(strtoull)
  fi
  fi
+AC_LANG_POP()
  
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries
  
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries
@@ -2334,14 +2419,14 @@ if test "$wxUSE_REGEX" != "no"; then
      AC_DEFINE(wxUSE_REGEX)
  
      if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
      AC_DEFINE(wxUSE_REGEX)
  
      if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
-        AC_MSG_WARN([Defaulting to the the builtin regex library for Unicode build.])
+        AC_MSG_WARN([Defaulting to the builtin regex library for Unicode build.])
          wxUSE_REGEX=builtin
      fi
  
      if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
          dnl according to Unix 98 specs, regcomp() is in libc but I believe that
          dnl on some old systems it may be in libregex - check for it too?
          wxUSE_REGEX=builtin
      fi
  
      if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
          dnl according to Unix 98 specs, regcomp() is in libc but I believe that
          dnl on some old systems it may be in libregex - check for it too?
-        AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp re_search)])
+        AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp re_search)],, [ ])
  
          if test "x$ac_cv_func_regcomp" != "xyes"; then
              if test "$wxUSE_REGEX" = "sys" ; then
  
          if test "x$ac_cv_func_regcomp" != "xyes"; then
              if test "$wxUSE_REGEX" = "sys" ; then
@@ -2409,7 +2494,7 @@ if test "$wxUSE_ZLIB" != "no" ; then
              )
              dnl If the test above did not come up with a value (e.g. cross
              dnl compiling) then this should give a definitive answer
              )
              dnl If the test above did not come up with a value (e.g. cross
              dnl compiling) then this should give a definitive answer
-            AC_CHECK_HEADER(zlib.h)
+            AC_CHECK_HEADER(zlib.h,,, [ ])
  
              system_zlib_h_ok=$ac_cv_header_zlib_h
          fi
  
              system_zlib_h_ok=$ac_cv_header_zlib_h
          fi
@@ -2440,118 +2525,125 @@ PNG_LINK=
  if test "$wxUSE_LIBPNG" != "no" ; then
      AC_DEFINE(wxUSE_LIBPNG)
  
  if test "$wxUSE_LIBPNG" != "no" ; then
      AC_DEFINE(wxUSE_LIBPNG)
  
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
-        AC_MSG_WARN([wxMGL doesn't work with builtin png library, will use MGL one instead])
-        wxUSE_LIBPNG=sys
-    fi
-
      dnl for the check below to have a chance to succeed, we must already have
      dnl for the check below to have a chance to succeed, we must already have
-    dnl libz somewhere (don't do this when bulding wxMGL since its libpng
-    dnl doesn't depend on zlib)
-    if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+    dnl libz somewhere
+    if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
          AC_MSG_WARN([system png library doesn't work without system zlib, will use built-in instead])
          wxUSE_LIBPNG=builtin
      fi
  
          AC_MSG_WARN([system png library doesn't work without system zlib, will use built-in instead])
          wxUSE_LIBPNG=builtin
      fi
  
-    if test "$wxUSE_MGL" != 1 ; then
-        dnl Don't check for libpng when building wxMGL, libmgl contains it
-        if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
-            dnl libpng version 0.9 is known to not work, if an even newer
-            dnl version is required, just bump it up in the test below
-            AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
-                [AC_TRY_RUN(
-                    dnl png.h defines PNG_LIBPNG_VER=number
-                    [
-                        #include <png.h>
-                        #include <stdio.h>
+    if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+        dnl libpng version 0.9 is known to not work, if an even newer
+        dnl version is required, just bump it up in the test below
+        AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
+            [AC_TRY_RUN(
+                dnl png.h defines PNG_LIBPNG_VER=number
+                [
+                    #include <png.h>
+                    #include <stdio.h>
  
  
-                        int main()
-                        {
-                            FILE *f=fopen("conftestval", "w");
-                            if (!f) exit(1);
-                            fprintf(f, "%s",
-                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
-                            exit(0);
-                        }
-                    ],
-                    ac_cv_header_png_h=`cat conftestval`,
-                    ac_cv_header_png_h=no,
-                    dnl cross-compiling: test (later) if we have any png.h
-                    unset ac_cv_header_png_h
-                )]
-            )
-            AC_CHECK_HEADER(png.h)
+                    int main()
+                    {
+                        FILE *f=fopen("conftestval", "w");
+                        if (!f) exit(1);
+                        fprintf(f, "%s",
+                                 PNG_LIBPNG_VER > 90 ? "yes" : "no");
+                        exit(0);
+                    }
+                ],
+                ac_cv_header_png_h=`cat conftestval`,
+                ac_cv_header_png_h=no,
+                dnl cross-compiling: test (later) if we have any png.h
+                unset ac_cv_header_png_h
+            )]
+        )
+        AC_CHECK_HEADER(png.h,,, [ ])
  
  
-            if test "$ac_cv_header_png_h" = "yes"; then
-                AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng -lz", , [-lz -lm])
-            fi
+        if test "$ac_cv_header_png_h" = "yes"; then
+            AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
+        fi
  
  
-            if test "x$PNG_LINK" = "x" ; then
-                if test "$wxUSE_LIBPNG" = "sys" ; then
-                    AC_MSG_ERROR([system png library not found or too old! Use --with-libpng=builtin to use built-in version])
-                else
-                    AC_MSG_WARN([system png library not found or too old, will use built-in instead])
-                    wxUSE_LIBPNG=builtin
-                fi
+        if test "x$PNG_LINK" = "x" ; then
+            if test "$wxUSE_LIBPNG" = "sys" ; then
+                AC_MSG_ERROR([system png library not found or too old! Use --with-libpng=builtin to use built-in version])
              else
              else
-                dnl we are using the system library
-                wxUSE_LIBPNG=sys
+                AC_MSG_WARN([system png library not found or too old, will use built-in instead])
+                wxUSE_LIBPNG=builtin
              fi
              fi
+        else
+            dnl we are using the system library
+            wxUSE_LIBPNG=sys
          fi
      fi
          fi
      fi
-
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for jpeg library
  dnl ------------------------------------------------------------------------
  
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for jpeg library
  dnl ------------------------------------------------------------------------
  
+dnl this check must be done before the check for libtiff as libtiff uses
+dnl libjpeg itself
  JPEG_LINK=
  if test "$wxUSE_LIBJPEG" != "no" ; then
      AC_DEFINE(wxUSE_LIBJPEG)
  
  JPEG_LINK=
  if test "$wxUSE_LIBJPEG" != "no" ; then
      AC_DEFINE(wxUSE_LIBJPEG)
  
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
-        AC_MSG_WARN([wxMGL doesn't work with builtin jpeg library, will use MGL one instead])
-        wxUSE_LIBJPEG=sys
-    fi
-
-    if test "$wxUSE_MGL" != 1 ; then
-        dnl Don't check for libjpeg when building wxMGL, libmgl contains it
-        if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
-            dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
-            dnl HAVE_STDLIB_H which are already defined and this provokes
-            dnl a compiler warning which configure considers as an error...
-            AC_MSG_CHECKING(for jpeglib.h)
-            AC_CACHE_VAL(ac_cv_header_jpeglib_h,
-                AC_TRY_COMPILE(
-                    [
-                        #undef HAVE_STDLIB_H
-                        #include <stdio.h>
-                        #include <jpeglib.h>
-                    ],
-                    [
-                    ],
-                    ac_cv_header_jpeglib_h=yes,
-                    ac_cv_header_jpeglib_h=no
-                )
+    if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
+        dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
+        dnl HAVE_STDLIB_H which are already defined and this provokes
+        dnl a compiler warning which configure considers as an error...
+        AC_MSG_CHECKING(for jpeglib.h)
+        AC_CACHE_VAL(ac_cv_header_jpeglib_h,
+            AC_TRY_COMPILE(
+                [
+                    #undef HAVE_STDLIB_H
+                    #include <stdio.h>
+                    #include <jpeglib.h>
+                ],
+                [
+                ],
+                ac_cv_header_jpeglib_h=yes,
+                ac_cv_header_jpeglib_h=no
              )
              )
-            AC_MSG_RESULT($ac_cv_header_jpeglib_h)
+        )
+        AC_MSG_RESULT($ac_cv_header_jpeglib_h)
  
  
-            if test "$ac_cv_header_jpeglib_h" = "yes"; then
-                AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
-            fi
+        if test "$ac_cv_header_jpeglib_h" = "yes"; then
+            AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
+        fi
  
  
-            if test "x$JPEG_LINK" = "x" ; then
-                if test "$wxUSE_LIBJPEG" = "sys" ; then
-                    AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
-                else
-                    AC_MSG_WARN([system jpeg library not found, will use built-in instead])
-                    wxUSE_LIBJPEG=builtin
-                fi
+        if test "x$JPEG_LINK" = "x" ; then
+            if test "$wxUSE_LIBJPEG" = "sys" ; then
+                AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
              else
              else
-                dnl we are using the system library
-                wxUSE_LIBJPEG=sys
+                AC_MSG_WARN([system jpeg library not found, will use built-in instead])
+                wxUSE_LIBJPEG=builtin
+            fi
+        else
+            dnl we are using the system library
+            wxUSE_LIBJPEG=sys
+
+            if test "$wxUSE_MSW" = 1; then
+                dnl boolean is defined by the jpeg headers and also by the
+                dnl Windows headers of some compilers. This type has been
+                dnl renamed in the builtin, so it is only an issue when
+                dnl using an external jpeg lib on Windows.
+                AC_CHECK_TYPES(
+                    [boolean],
+                    [
+                        AC_CHECK_SIZEOF(
+                            [boolean],
+                            [],
+                            [
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
+                            ])
+                        AC_DEFINE_UNQUOTED(
+                            [wxHACK_BOOLEAN],
+                            [wxInt`expr 8 \* $ac_cv_sizeof_boolean`])
+                    ],
+                    [],
+                    [#include <windows.h>])
              fi
          fi
      fi
              fi
          fi
      fi
@@ -2581,7 +2673,9 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
                                           TIFF_LINK=" -ltiff",
                                           ,
                                           $TIFF_PREREQ_LINKS)
                                           TIFF_LINK=" -ltiff",
                                           ,
                                           $TIFF_PREREQ_LINKS)
-                        ]
+                        ],
+                        [],
+                        [ ]
                         )
  
          if test "x$TIFF_LINK" = "x" ; then
                         )
  
          if test "x$TIFF_LINK" = "x" ; then
@@ -2596,42 +2690,47 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
              wxUSE_LIBTIFF=sys
          fi
      fi
              wxUSE_LIBTIFF=sys
          fi
      fi
+    if test "$wxUSE_LIBTIFF" = "builtin" ; then
+        if test "$wxUSE_LIBJPEG" = "no"; then
+            dnl we have to prevent the builtin libtiff configure from building the
+            dnl library with JPEG support as this was explicitly disabled by user,
+            dnl but unfortunately it needs --disable-jpeg and not --without-libjpeg
+            dnl (which will be passed to it anyhow as configure passes arguments to
+            dnl the top-level script to all the other ones called recursively), so
+            dnl we need to hack around this
+            ac_configure_args="$ac_configure_args --disable-jpeg"
+        fi
+
+        dnl If libtiff configure detects lzma library, it enables support for
+        dnl LZMA compression and using it requires linking with liblzma.
+        AC_CHECK_LIB(lzma, lzma_code, [LIBS="$LIBS -llzma"])
+
+        AC_CONFIG_SUBDIRS([src/tiff])
+    fi
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for expat libraries
  dnl ------------------------------------------------------------------------
  
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for expat libraries
  dnl ------------------------------------------------------------------------
  
-if test "$wxUSE_WCHAR_T" != "yes"; then
-    if test "$wxUSE_EXPAT" != "no"; then
-        AC_MSG_WARN([wxWidgets requires wchar_t to use expat, disabling])
-        wxUSE_EXPAT=no
-    fi
-    if test "$wxUSE_XML" != "no"; then
-        AC_MSG_WARN([wxWidgets requires wchar_t to use xml, disabling])
-        wxUSE_XML=no
-    fi
-fi
-
  if test "$wxUSE_EXPAT" != "no"; then
      wxUSE_XML=yes
      AC_DEFINE(wxUSE_EXPAT)
      AC_DEFINE(wxUSE_XML)
  
      if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then
  if test "$wxUSE_EXPAT" != "no"; then
      wxUSE_XML=yes
      AC_DEFINE(wxUSE_EXPAT)
      AC_DEFINE(wxUSE_XML)
  
      if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then
-        AC_CHECK_HEADER([expat.h], [found_expat_h=1])
+        AC_CHECK_HEADER([expat.h], [found_expat_h=1],, [ ])
          if test "x$found_expat_h" = "x1"; then
              dnl Expat 1.95.6 comes with broken expat.h:
              AC_CACHE_CHECK([if expat.h is valid C++ header],
                  wx_cv_expat_is_not_broken,
                  [
          if test "x$found_expat_h" = "x1"; then
              dnl Expat 1.95.6 comes with broken expat.h:
              AC_CACHE_CHECK([if expat.h is valid C++ header],
                  wx_cv_expat_is_not_broken,
                  [
-                AC_LANG_SAVE
-                AC_LANG_CPLUSPLUS
+                AC_LANG_PUSH(C++)
                  AC_TRY_COMPILE([#include <expat.h>],[],
                      wx_cv_expat_is_not_broken=yes,
                      wx_cv_expat_is_not_broken=no
                  )
                  AC_TRY_COMPILE([#include <expat.h>],[],
                      wx_cv_expat_is_not_broken=yes,
                      wx_cv_expat_is_not_broken=no
                  )
-                AC_LANG_RESTORE
+                AC_LANG_POP()
                  ]
              )
              if test "$wx_cv_expat_is_not_broken" = "yes" ; then
                  ]
              )
              if test "$wx_cv_expat_is_not_broken" = "yes" ; then
@@ -2662,7 +2761,7 @@ dnl Check for libmspack
  dnl ------------------------------------------------------------------------
  
  if test "$wxUSE_LIBMSPACK" != "no"; then
  dnl ------------------------------------------------------------------------
  
  if test "$wxUSE_LIBMSPACK" != "no"; then
-    AC_CHECK_HEADER([mspack.h], [found_mspack_h=1])
+    AC_CHECK_HEADER([mspack.h], [found_mspack_h=1],, [ ])
      if test "x$found_mspack_h" = "x1"; then
          AC_CHECK_LIB(mspack, mspack_create_chm_decompressor,
                       MSPACK_LINK=" -lmspack")
      if test "x$found_mspack_h" = "x1"; then
          AC_CHECK_LIB(mspack, mspack_create_chm_decompressor,
                       MSPACK_LINK=" -lmspack")
@@ -2691,16 +2790,22 @@ 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
  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_CHECK_HEADERS(w32api.h,,, [ ])
+    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)
-    ])
-
-    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 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+    ],
+    [ ])
  
  
+    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32"
+    case "${host}" in
+        x86_64-*-mingw32* )
+            dnl we need to define this to embed the manifest for correct
+            dnl platform from wx/msw/wx.rc (this is not needed for x86 which is
+            dnl the default in wx/msw/rcdefs.h)
+            WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
+        ;;
+    esac
      if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
          LIBS="$LIBS -loleacc"
      fi
      if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
          LIBS="$LIBS -loleacc"
      fi
@@ -2711,19 +2816,15 @@ if test "$USE_WIN32" = 1 ; then
              LIBS="$LIBS -lkernel32 -luser32"
      esac
  
              LIBS="$LIBS -lkernel32 -luser32"
      esac
  
-    dnl add extra odbc libs if we have compiled in odbc
-    if test "$wxUSE_ODBC" = "sys" ; then
-        wxUSE_ODBC = "yes"
-    fi
-    if test "$wxUSE_ODBC" = "yes" ; then
-        LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
-        AC_DEFINE(wxUSE_ODBC)
-    fi
-    dnl We might want to abort here if wxUSE_ODBC="builtin" isn't supported on msw.
-
-    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+    dnl This one is still used by some sample makefiles.
+    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
      RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
  
      RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
  
+    dnl This lot we export to wx-config.  It must add the relevant
+    dnl include directories at the point when they can be known.
+    dnl (but are these (still) required anyway?)
+    WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
+
      dnl install Win32-specific files in "make install"
      WIN32INSTALL=win32install
  fi
      dnl install Win32-specific files in "make install"
      WIN32INSTALL=win32install
  fi
@@ -2733,12 +2834,13 @@ if test "$wxUSE_GUI" = "yes"; then
  
      GUI_TK_LIBRARY=
  
  
      GUI_TK_LIBRARY=
  
-    WXGTK12=
+    WXGTK1=
      WXGTK127=
      WXGTK127=
-    WXGTK20=
+    WXGTK2=
+    WXGTK3=
      WXGPE=
  
      WXGPE=
  
-    if test "$wxUSE_COCOA" = 1 ; then
+    if test "$wxUSE_OLD_COCOA" = 1 ; then
          if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
              AC_MSG_WARN([Printing not supported under wxCocoa yet, disabled])
              wxUSE_PRINTING_ARCHITECTURE=no
          if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
              AC_MSG_WARN([Printing not supported under wxCocoa yet, disabled])
              wxUSE_PRINTING_ARCHITECTURE=no
@@ -2748,7 +2850,7 @@ if test "$wxUSE_GUI" = "yes"; then
              wxUSE_DRAG_AND_DROP=no
          fi
          if test "$wxUSE_DRAGIMAGE" = "yes"; then
              wxUSE_DRAG_AND_DROP=no
          fi
          if test "$wxUSE_DRAGIMAGE" = "yes"; then
-            AC_MSG_WARN([Drag Image and DandD not supported under wxCocoa yet, disabled])
+            AC_MSG_WARN([wxDragImage not supported under wxCocoa yet, disabled])
              wxUSE_DRAGIMAGE=no
          fi
      fi
              wxUSE_DRAGIMAGE=no
          fi
      fi
@@ -2765,6 +2867,7 @@ if test "$wxUSE_GUI" = "yes"; then
      fi
  
      if test "$wxUSE_GTK" = 1; then
      fi
  
      if test "$wxUSE_GTK" = 1; then
+        dnl GTK+ test program must be compiled with C compiler
          AC_MSG_CHECKING([for GTK+ version])
  
          gtk_version_cached=1
          AC_MSG_CHECKING([for GTK+ version])
  
          gtk_version_cached=1
@@ -2782,34 +2885,32 @@ if test "$wxUSE_GUI" = "yes"; then
                      GTK_MODULES=gthread
                  fi
  
                      GTK_MODULES=gthread
                  fi
  
+                if test -z "$wxGTK_VERSION"; then
+                    wxGTK_VERSION=any
+                fi
+
                  dnl detect GTK2
                  wx_cv_lib_gtk=
                  if test "x$wxGTK_VERSION" != "x1"
                  then
                  dnl detect GTK2
                  wx_cv_lib_gtk=
                  if test "x$wxGTK_VERSION" != "x1"
                  then
-                    dnl The gthread.pc that ships with solaris returns '-mt',
+                    dnl The gthread.pc that ships with Solaris returns '-mt',
                      dnl it's correct for Sun CC, but gcc requires '-pthreads'.
                      dnl So disable the compile check and remove the -mt below.
                      case "${host}" in
                          *-*-solaris2* )
                              if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
                      dnl it's correct for Sun CC, but gcc requires '-pthreads'.
                      dnl So disable the compile check and remove the -mt below.
                      case "${host}" in
                          *-*-solaris2* )
                              if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
-                            enable_gtktest=no
+                                enable_gtktest=no
                              fi
                      esac
  
                              fi
                      esac
  
-                    AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
-
-                    dnl Remove the '-mt' for gcc on solaris
-                    case "${host}" in
-                        *-*-solaris2* )
-                            if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
-                                GTK_CFLAGS=`echo $GTK_CFLAGS | sed 's/-mt//'`
-                                GTK_LIBS=`echo $GTK_LIBS | sed 's/-mt//'`
-                            fi
-                            dnl solaris also requires -lX11 for static lib
-                            if test "$wxUSE_SHARED" != "yes"; then
-                                GTK_LIBS="$GTK_LIBS -lX11"
-                            fi
-                    esac
+                    if test "$wxGTK_VERSION" != 3; then
+                        AM_PATH_GTK_2_0(2.6.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
+                    fi
+                    if test -z "$wx_cv_lib_gtk"; then
+                        if test "$wxGTK_VERSION" = 3 -o "$wxGTK_VERSION" = any; then
+                            AM_PATH_GTK_3_0(, wx_cv_lib_gtk=3, , $GTK_MODULES)
+                        fi
+                    fi
                  fi
  
                  dnl detect GTK1.x
                  fi
  
                  dnl detect GTK1.x
@@ -2827,10 +2928,13 @@ if test "$wxUSE_GUI" = "yes"; then
                      dnl looks better in AC_MSG_RESULT
                      wx_cv_lib_gtk=none
                  else
                      dnl looks better in AC_MSG_RESULT
                      wx_cv_lib_gtk=none
                  else
+                    dnl we use symbols from X11 directly so we should link with it
+                    GTK_LIBS="$GTK_LIBS -lX11"
+
                      dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
                      dnl subsequent runs
                      wx_cv_cflags_gtk=$GTK_CFLAGS
                      dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
                      dnl subsequent runs
                      wx_cv_cflags_gtk=$GTK_CFLAGS
-                    wx_cv_libs_gtk=`echo $GTK_LIBS | sed -e 's/ -l[[^ ]]*cairo[[^ ]]*//g'`
+                    wx_cv_libs_gtk=$GTK_LIBS
                  fi
              ]
          )
                  fi
              ]
          )
@@ -2842,14 +2946,16 @@ if test "$wxUSE_GUI" = "yes"; then
          fi
  
          case "$wx_cv_lib_gtk" in
          fi
  
          case "$wx_cv_lib_gtk" in
-            2.0)    WXGTK20=1
+            3)      WXGTK3=1
+                    TOOLKIT_VERSION=3
+                    ;;
+            2.0)    WXGTK2=1
                      TOOLKIT_VERSION=2
                      ;;
              1.2.7)  WXGTK127=1
                      TOOLKIT_VERSION=2
                      ;;
              1.2.7)  WXGTK127=1
-                    WXGTK12=1
-                    ;;
-            1.2.3)  WXGTK12=1
+                    WXGTK1=1
                      ;;
                      ;;
+            1.2*)   WXGTK1=1 ;;
              *)      AC_MSG_ERROR([
  The development files for GTK+ were not found. For GTK+ 2, please
  ensure that pkg-config is in the path and that gtk+-2.0.pc is
              *)      AC_MSG_ERROR([
  The development files for GTK+ were not found. For GTK+ 2, please
  ensure that pkg-config is in the path and that gtk+-2.0.pc is
@@ -2861,49 +2967,58 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                      ;;
          esac
  
                      ;;
          esac
  
-        if test "$WXGTK20" = 1; then
+        if test "$WXGTK3" = 1; then
+            AC_DEFINE(__WXGTK218__)
+            AC_DEFINE(__WXGTK210__)
+        elif test "$WXGTK2" = 1; then
              save_CFLAGS="$CFLAGS"
              save_LIBS="$LIBS"
              save_CFLAGS="$CFLAGS"
              save_LIBS="$LIBS"
-            CFLAGS="$CFLAGS $wx_cv_cflags_gtk"
+            CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
              LIBS="$LIBS $wx_cv_libs_gtk"
  
              LIBS="$LIBS $wx_cv_libs_gtk"
  
-            dnl gtk_icon_size_lookup is not available in the GTK+ headers
-            dnl that have shipped with some versions of Sun's JDS. Not using
-            dnl AC_CHECK_FUNCS here since it only checks the function exists
-            dnl in the lib (not the header).
-            AC_MSG_CHECKING([if gtk_icon_size_lookup is missing])
+            dnl test if we have at least GTK+ 2.18:
+            AC_MSG_CHECKING([if GTK+ is version >= 2.18])
              AC_TRY_COMPILE([
                              #include <gtk/gtk.h>
                             ],
                             [
              AC_TRY_COMPILE([
                              #include <gtk/gtk.h>
                             ],
                             [
-                            void *f = gtk_icon_size_lookup;
-                           ],
-                           [
-                            AC_MSG_RESULT([no])
-                           ],
-                           [
-                            AC_DEFINE(NEED_GTK_ICON_SIZE_LOOKUP)
-                            AC_MSG_RESULT([yes])
-                           ])
-
-            dnl test if we have at least GTK+ 2.4:
-            AC_MSG_CHECKING([if GTK+ is version >= 2.4])
-            AC_TRY_COMPILE([
-                            #include <gtk/gtk.h>
-                           ],
-                           [
-                            #if !GTK_CHECK_VERSION(2,4,0)
-                            Not GTK+ 2.4
+                            #if !GTK_CHECK_VERSION(2,18,0)
+                            Not GTK+ 2.18
                              #endif
                             ],
                             [
                              #endif
                             ],
                             [
-                            AC_DEFINE(__WXGTK24__)
+                            AC_DEFINE(__WXGTK218__)
+                            AC_DEFINE(__WXGTK210__)
                              AC_MSG_RESULT([yes])
                              AC_MSG_RESULT([yes])
+                            ac_wxgtk218=1
                             ],
                             [
                              AC_MSG_RESULT([no])
                             ],
                             [
                              AC_MSG_RESULT([no])
+                            ac_wxgtk218=0
                             ])
  
                             ])
  
+            if test "$ac_wxgtk218" = 0; then
+                dnl test if we have at least GTK+ 2.10:
+                AC_MSG_CHECKING([if GTK+ is version >= 2.10])
+                AC_TRY_COMPILE([
+                                #include <gtk/gtk.h>
+                               ],
+                               [
+                                #if !GTK_CHECK_VERSION(2,10,0)
+                                Not GTK+ 2.10
+                                #endif
+                               ],
+                               [
+                                AC_DEFINE(__WXGTK210__)
+                                AC_MSG_RESULT([yes])
+                                ac_wxgtk210=1
+                               ],
+                               [
+                                AC_MSG_RESULT([no])
+                                ac_wxgtk210=0
+                               ])
+            fi
+
              CFLAGS="$save_CFLAGS"
              LIBS="$save_LIBS"
          else
              CFLAGS="$save_CFLAGS"
              LIBS="$save_LIBS"
          else
@@ -2911,29 +3026,27 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                  AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x])
                  wxUSE_UNICODE=no
              fi
                  AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x])
                  wxUSE_UNICODE=no
              fi
-        fi
  
  
-        dnl we need poll() in src/gtk/app.cpp (we know that Darwin doesn't
-        dnl have it but we do the check for the others)
-        if test "$USE_DARWIN" != 1; then
-            AC_CHECK_FUNCS(poll)
+            dnl test for XIM support in libgdk
+            AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
+
+            dnl we need poll() in src/gtk1/app.cpp (we know that Darwin doesn't
+            dnl have it but we do the check for the others)
+            if test "$USE_DARWIN" != 1; then
+                AC_CHECK_FUNCS(poll)
+            fi
          fi
  
          TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
          GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
          fi
  
          TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
          GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
-
          AFMINSTALL=afminstall
          TOOLKIT=GTK
          GUIDIST=GTK_DIST
  
          AFMINSTALL=afminstall
          TOOLKIT=GTK
          GUIDIST=GTK_DIST
  
-        dnl test for XIM support in libgdk
-        AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
-
-
          dnl test for external libxpm if we're configured to use it
          if test "$wxUSE_GPE" = "yes"; then
              AC_MSG_CHECKING(for gpewidget library)
          dnl test for external libxpm if we're configured to use it
          if test "$wxUSE_GPE" = "yes"; then
              AC_MSG_CHECKING(for gpewidget library)
-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget)
+            WX_PATH_FIND_LIBRARIES(gpewidget)
              if test "$ac_find_libraries" != "" ; then
                  WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
                  dnl -lgpewidget must be before all GTK libs and
              if test "$ac_find_libraries" != "" ; then
                  WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
                  dnl -lgpewidget must be before all GTK libs and
@@ -2946,7 +3059,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
              fi
  
              dnl AC_MSG_CHECKING(for gpe library)
              fi
  
              dnl AC_MSG_CHECKING(for gpe library)
-            dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe)
+            dnl WX_PATH_FIND_LIBRARIES(gpe)
              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 -lgpe"
              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 -lgpe"
@@ -2957,72 +3070,22 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          fi
      fi
  
          fi
      fi
  
-    if test "$wxUSE_MGL" = 1; then
-       AC_MSG_CHECKING(for SciTech MGL library)
-        if test "x$MGL_ROOT" = x ; then
-            AC_MSG_RESULT(not found)
-            AC_MSG_ERROR([Cannot find MGL library. Make sure MGL_ROOT is set.])
-        else
-            AC_MSG_RESULT($MGL_ROOT)
-        fi
-
-        AC_MSG_CHECKING(for libmgl location)
-        dnl Find MGL library that we want
-        dnl FIXME_MGL - test for MGL variants for freebsd etc.;
-        dnl             and for non-x86 versions
-        case "${host}" in
-            *-*-linux* )
-              dnl glibc.so, glibc are for older versions of MGL,
-              dnl x86/a, x86/so are used by >= 5.0 R11
-              if test "x$wxUSE_SHARED" = xyes ; then
-                  mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
-              else
-                  mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
-              fi
-              ;;
-            *-pc-msdosdjgpp )
-              mgl_os_candidates="dos32/dj2"
-              ;;
-            *)
-              AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
-        esac
-
-        mgl_lib_type=""
-        mgl_os=""
-
-        for mgl_os_i in $mgl_os_candidates ; do
-            if test "x$mgl_os" = x ; then
-                if test "$wxUSE_DEBUG_FLAG" = yes ; then
-                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=debug
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
-                if test "x$mgl_lib_type" = x ; then
-                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=release
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
-            fi
-        done
-
-        if test "x$mgl_os" = x ; then
-            AC_MSG_RESULT(not found)
-            AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
-        fi
-        AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")
-
-        wxUSE_UNIVERSAL="yes"
-
-        TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
-        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
+    if test "$wxUSE_DFB" = 1; then
+       PKG_PROG_PKG_CONFIG()
  
  
-        AFMINSTALL=afminstall
-        TOOLKIT=MGL
-        GUIDIST=MGL_DIST
+       PKG_CHECK_MODULES(DIRECTFB,
+                         [directfb >= 0.9.23],
+                         [
+                           wxUSE_UNIVERSAL="yes"
+                           TOOLKIT_INCLUDE="$DIRECTFB_CFLAGS"
+                           GUI_TK_LIBRARY="$DIRECTFB_LIBS"
+                           TOOLKIT=DFB
+                           GUIDIST=DFB_DIST
+                         ],
+                         [
+                           AC_MSG_ERROR([DirectFB not found.])
+                         ]
+                         )
      fi
  
      if test "$wxUSE_MICROWIN" = 1; then
      fi
  
      if test "$wxUSE_MICROWIN" = 1; then
@@ -3086,42 +3149,44 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          fi
  
          if test "$wxUSE_UNICODE" = "yes"; then
          fi
  
          if test "$wxUSE_UNICODE" = "yes"; then
-                PKG_CHECK_MODULES(PANGOX, pangox,
-                    [
-                        CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
-                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
-                    ],
-                    [
-                        AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode])
-                    ]
-                )
-                PKG_CHECK_MODULES(PANGOFT2, pangoft2,
-                    [
-                        CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
-                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
-                    ],
-                    [
-                        AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
-                        wxUSE_PRINTING_ARCHITECTURE="no"
-                    ]
-                )
-                PKG_CHECK_MODULES(PANGOXFT, pangoxft,
-                    [
-                        AC_DEFINE(HAVE_PANGO_XFT)
-                        CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
-                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
-                    ],
-                    [
-                        AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
-                    ]
-                )
-                save_CFLAGS="$CFLAGS"
-                save_LIBS="$LIBS"
-                CFLAGS="$CFLAGS $PANGOX_CFLAGS"
-                LIBS="$LIBS $PANGOX_LIBS"
-                AC_CHECK_FUNCS([pango_font_family_is_monospace])
-                CFLAGS="$save_CFLAGS"
-                LIBS="$save_LIBS"
+            PKG_PROG_PKG_CONFIG()
+
+            PKG_CHECK_MODULES(PANGOX, pangox,
+                [
+                    CFLAGS="$PANGOX_CFLAGS $CFLAGS"
+                    CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
+                ],
+                [
+                    AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode])
+                ]
+            )
+            PKG_CHECK_MODULES(PANGOFT2, pangoft2,
+                [
+                    CFLAGS="$PANGOFT2_CFLAGS $CFLAGS"
+                    CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
+                ],
+                [
+                    AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
+                    wxUSE_PRINTING_ARCHITECTURE="no"
+                ]
+            )
+            PKG_CHECK_MODULES(PANGOXFT, pangoxft,
+                [
+                    AC_DEFINE(HAVE_PANGO_XFT)
+                    CFLAGS="$PANGOXFT_CFLAGS $CFLAGS"
+                    CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
+                ],
+                [
+                    AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
+                ]
+            )
+            save_LIBS="$LIBS"
+            LIBS="$LIBS $PANGOX_LIBS"
+            AC_CHECK_FUNCS([pango_font_family_is_monospace])
+            LIBS="$save_LIBS"
          fi
  
          wxUSE_UNIVERSAL="yes"
          fi
  
          wxUSE_UNIVERSAL="yes"
@@ -3139,10 +3204,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
      fi
  
      if test "$wxUSE_MOTIF" = 1; then
      fi
  
      if test "$wxUSE_MOTIF" = 1; then
-        if test "$wxUSE_UNICODE" = "yes"; then
-            AC_MSG_ERROR([Unicode configuration not supported with Motif])
-        fi
-
          AC_MSG_CHECKING(for Motif/Lesstif headers)
          WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
          if test "$ac_find_includes" != "" ; then
          AC_MSG_CHECKING(for Motif/Lesstif headers)
          WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
          if test "$ac_find_includes" != "" ; then
@@ -3151,7 +3212,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
              TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
          else
              save_CFLAGS=$CFLAGS
              TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
          else
              save_CFLAGS=$CFLAGS
-            CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+            CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
  
              AC_TRY_COMPILE(
                  [
  
              AC_TRY_COMPILE(
                  [
@@ -3176,7 +3237,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
  
  
          AC_MSG_CHECKING(for Motif/Lesstif library)
  
  
          AC_MSG_CHECKING(for Motif/Lesstif library)
-        WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
+        WX_PATH_FIND_LIBRARIES(Xm)
  
          if test "x$ac_find_libraries" != "x" ; then
              AC_MSG_RESULT(found in $ac_find_libraries)
  
          if test "x$ac_find_libraries" != "x" ; then
              AC_MSG_RESULT(found in $ac_find_libraries)
@@ -3188,7 +3249,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
              dnl paths but the libs are elsewhere but still in default (linker)
              dnl path -- try to compile a test program to check for this
              save_CFLAGS=$CFLAGS
              dnl paths but the libs are elsewhere but still in default (linker)
              dnl path -- try to compile a test program to check for this
              save_CFLAGS=$CFLAGS
-            CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+            CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
              save_LIBS="$LIBS"
              LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11"
  
              save_LIBS="$LIBS"
              LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11"
  
@@ -3219,13 +3280,13 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          libsm_ice_link=""
          libs_found=0
          for libp in "" " -lXp"; do
          libsm_ice_link=""
          libs_found=0
          for libp in "" " -lXp"; do
-            if test "$libs_found" = "0"; then
+            if test "$libs_found" = 0; then
                  for libsm_ice in "" " -lSM -lICE"; do
                  for libsm_ice in "" " -lSM -lICE"; do
-                    if test "$libs_found" = "0"; then
+                    if test "$libs_found" = 0; then
                          save_LIBS="$LIBS"
                          LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                          save_CFLAGS=$CFLAGS
                          save_LIBS="$LIBS"
                          LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                          save_CFLAGS=$CFLAGS
-                        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+                        CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
  
                          AC_TRY_LINK(
                              [
  
                          AC_TRY_LINK(
                              [
@@ -3254,7 +3315,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
              fi
          done
  
              fi
          done
  
-        if test "$libs_found" = "0"; then
+        if test "$libs_found" = 0; then
              AC_MSG_RESULT([can't find the right libraries])
              AC_MSG_ERROR([can't link a simple motif program])
          fi
              AC_MSG_RESULT([can't find the right libraries])
              AC_MSG_ERROR([can't link a simple motif program])
          fi
@@ -3264,7 +3325,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          AC_CHECK_LIB(Sgm, [SgCreateList], [libsgm_link=" -lSgm"])
  
          save_CFLAGS=$CFLAGS
          AC_CHECK_LIB(Sgm, [SgCreateList], [libsgm_link=" -lSgm"])
  
          save_CFLAGS=$CFLAGS
-        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+        CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
  
          AC_CACHE_CHECK([for Motif 2],
              wx_cv_lib_motif2,
  
          AC_CACHE_CHECK([for Motif 2],
              wx_cv_lib_motif2,
@@ -3315,7 +3376,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          dnl test for external libxpm if we're configured to use it
          if test "$wxUSE_LIBXPM" = "sys"; then
              AC_MSG_CHECKING(for Xpm library)
          dnl test for external libxpm if we're configured to use it
          if test "$wxUSE_LIBXPM" = "sys"; then
              AC_MSG_CHECKING(for Xpm library)
-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
+            WX_PATH_FIND_LIBRARIES(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"
              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"
@@ -3325,7 +3386,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                      wx_cv_x11_xpm_h,
                      [
                          save_CFLAGS=$CFLAGS
                      wx_cv_x11_xpm_h,
                      [
                          save_CFLAGS=$CFLAGS
-                        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+                        CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
  
                          AC_TRY_COMPILE(
                              [
  
                          AC_TRY_COMPILE(
                              [
@@ -3363,7 +3424,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
  
          if test "$wxHAVE_XEXT_LIB" = 1; then
              save_CFLAGS="$CFLAGS"
  
          if test "$wxHAVE_XEXT_LIB" = 1; then
              save_CFLAGS="$CFLAGS"
-            CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+            CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
  
              AC_MSG_CHECKING([for X11/extensions/shape.h])
              AC_TRY_COMPILE([
  
              AC_MSG_CHECKING([for X11/extensions/shape.h])
              AC_TRY_COMPILE([
@@ -3387,7 +3448,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          fi
      fi
  
          fi
      fi
  
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_OSX_CARBON" = 1; then
          AC_MSG_CHECKING([for compiler syntax to enable Pascal strings])
          if test "$GCC" = yes; then
              AC_MSG_RESULT([gcc])
          AC_MSG_CHECKING([for compiler syntax to enable Pascal strings])
          if test "$GCC" = yes; then
              AC_MSG_RESULT([gcc])
@@ -3400,21 +3461,39 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          fi
  
          if test "x$wxUSE_UNIX" = "xyes"; then
          fi
  
          if test "x$wxUSE_UNIX" = "xyes"; then
-            CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon"
+            CPPFLAGS="$CPPFLAGS_PASCAL -I/Developer/Headers/FlatCarbon $CPPFLAGS"
          else
              dnl platform.h needs TARGET_CARBON before setup.h
          else
              dnl platform.h needs TARGET_CARBON before setup.h
-            CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON"
+            CPPFLAGS="$CPPFLAGS_PASCAL -DTARGET_CARBON $CPPFLAGS"
          fi
  
          fi
  
-        TOOLKIT=MAC
+        TOOLKIT=OSX_CARBON
          dnl we can't call this MAC_DIST or autoconf thinks its a macro
          dnl we can't call this MAC_DIST or autoconf thinks its a macro
-        GUIDIST=MACX_DIST
+        GUIDIST=OSX_CARBON_DIST
          dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin
          dnl are different, so they need different names:
          WXBASEPORT="_carbon"
          dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin
          dnl are different, so they need different names:
          WXBASEPORT="_carbon"
+
+        dnl in addition to defining __WXOSX_CARBON__ for this toolkit we want
+        dnl to also define these extra symbols to make it possible to test for
+        dnl any Mac port (__WXMAC__ is for backwards compatibility, __WXOSX__
+        dnl is a new name)
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
+    fi
+
+    if test "$wxUSE_OSX_COCOA" = 1; then
+        TOOLKIT=OSX_COCOA
+        GUIDIST=OSX_COCOA_DIST
+
+        dnl see the comment above in wxUSE_OSX_CARBON branch
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
+    fi
+
+    if test "$wxUSE_OSX_IPHONE" = 1; then
+        TOOLKIT=OSX_IPHONE
      fi
  
      fi
  
-    if test "$wxUSE_COCOA" = 1; then
+    if test "$wxUSE_OLD_COCOA" = 1; then
          TOOLKIT=COCOA
          GUIDIST=COCOA_DIST
      fi
          TOOLKIT=COCOA
          GUIDIST=COCOA_DIST
      fi
@@ -3448,7 +3527,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
      if test "$TOOLKIT" = "PM" ; then
          TOOLKIT_DIR="os2"
      else
      if test "$TOOLKIT" = "PM" ; then
          TOOLKIT_DIR="os2"
      else
-        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"`
+        TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[[A-Z]]' '[[a-z]]'`
      fi
  
      if test "$wxUSE_UNIVERSAL" = "yes"; then
      fi
  
      if test "$wxUSE_UNIVERSAL" = "yes"; then
@@ -3478,6 +3557,7 @@ else
      DISTDIR="wxBase"
  fi
  
      DISTDIR="wxBase"
  fi
  
+
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries included when system library is not used
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries included when system library is not used
  dnl ---------------------------------------------------------------------------
@@ -3486,8 +3566,8 @@ dnl do this after test for X11 above so that we have a chance of finding Xlib.h
  if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
          dnl defines HAVE_X11_XKBLIB_H
  if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
          dnl defines HAVE_X11_XKBLIB_H
-        AC_CHECK_HEADERS(X11/Xlib.h)
-        AC_CHECK_HEADERS([X11/XKBlib.h], [], [],
+        AC_CHECK_HEADERS([X11/Xlib.h],,, [ ])
+        AC_CHECK_HEADERS([X11/XKBlib.h],,,
                           [
                            #if HAVE_X11_XLIB_H
                              #include <X11/Xlib.h>
                           [
                            #if HAVE_X11_XLIB_H
                              #include <X11/Xlib.h>
@@ -3497,189 +3577,172 @@ if test "$wxUSE_GUI" = "yes"; then
  fi
  
  
  fi
  
  
-dnl ----------------------------------------------------------------
-dnl iODBC support
-dnl ----------------------------------------------------------------
-
-IODBC_C_SRC=""
-
-
-dnl ODBC is handled separately for MSW
-if test "$TOOLKIT" != "MSW" ; then
-
-    if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
-        dnl This is not ideal we really ough to use the unixodbc-config
-        dnl  or iodbc-config if they exist.
+dnl ---------------------------------------------------------------------------
+dnl wxDisplay checks
+dnl ---------------------------------------------------------------------------
  
  
-        AC_CHECK_HEADER([sql.h], [found_sql_h=1])
-        if test "x$found_sql_h" = "x1" ; then
-            AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
-            [
-                AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
-                [
-                    AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc")
-                ])
-            ])
-        fi
-        if test "x$ODBC_LINK" = "x" ; then
-            if test "$wxUSE_ODBC" = "sys" ; then
-                AC_MSG_ERROR([system ODBC library not found! Use --with-odbc=builtin to use built-in version])
-            else
-                AC_MSG_WARN([system ODBC library not found, will use built-in instead])
-                wxUSE_ODBC=builtin
+USE_XINERAMA=0
+if test "$wxUSE_DISPLAY" = "yes"; then
+    dnl Xinerama is used for wxGTK1/wxX11/wxMotif only
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$WXGTK1" = 1; then
+        WX_FIND_LIB(Xinerama, XineramaQueryScreens)
+        if test "$ac_find_libraries" != "" ; then
+            if test "$ac_find_libraries" != "std" ; then
+              WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+              if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                  LDFLAGS="$LDFLAGS $ac_path_to_link"
+              fi
              fi
              fi
+            USE_XINERAMA=1
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
          else
          else
-            dnl we are using the system library
-            wxUSE_ODBC=sys
+            AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
+            wxUSE_DISPLAY="no"
          fi
          fi
-    fi
-
-    if test "$wxUSE_ODBC" = "builtin" ; then
-        AC_DEFINE(wxUSE_BUILTIN_IODBC)
+    elif test "$wxUSE_MSW" = 1; then
+        dnl DirectDraw for MSW - optionally used by WxDisplay.
+        AC_CHECK_HEADER([ddraw.h], [], [], [#include <windows.h>])
      fi
  fi
  
      fi
  fi
  
-if test "$wxUSE_ODBC" != "no" ; then
-    AC_DEFINE(wxUSE_ODBC)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
-    dnl is this still necessary?
-    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_IODBC_"
+if test "$wxUSE_DISPLAY" = "yes"; then
+    dnl wxGTK2 needs Xxf86vm as well as Xinerama-using ports from above
+    if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then
+        WX_FIND_LIB(Xxf86vm, XF86VidModeQueryExtension)
+        if test "$ac_find_libraries" != "" ; then
+            AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
+                             [
+                              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+                             ],
+                             [],
+                             [
+                                  #if HAVE_X11_XLIB_H
+                                    #include <X11/Xlib.h>
+                                  #endif
+                             ])
+        fi
+    fi
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
-dnl wxDisplay Sanity checks
-dnl ---------------------------------------------------------------------------
-
-if test "$wxUSE_DISPLAY" = "yes"; then
-dnl ---------------------------------------------------------------------------
-dnl Xinerama (for unix ) - Brian Victor
+dnl X11 session management
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
-        AC_MSG_CHECKING([for Xinerama])
-        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
+if test "$wxUSE_DETECT_SM" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
+        WX_FIND_LIB(SM, SmcOpenConnection)
          if test "$ac_find_libraries" != "" ; then
          if test "$ac_find_libraries" != "" ; then
-            WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-            if test "$ac_path_to_link" != " -L/usr/lib" ; then
+            if test "$ac_find_libraries" != "std" ; then
+              WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+              if test "$ac_path_to_link" != " -L/usr/lib" ; then
                  LDFLAGS="$LDFLAGS $ac_path_to_link"
                  LDFLAGS="$LDFLAGS $ac_path_to_link"
+              fi
              fi
              fi
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
-            AC_MSG_RESULT([yes])
-
-            AC_MSG_CHECKING([for Xxf86vm extension])
-            WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
-            if test "$ac_find_libraries" != "" ; then
-                AC_MSG_RESULT([yes])
-                AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
-                                 [
-                                  GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
-                                 ],
-                                 [],
-                                 [
-                                      #if HAVE_X11_XLIB_H
-                                        #include <X11/Xlib.h>
-                                      #endif
-                                 ])
-            else
-                AC_MSG_RESULT([no])
-            fi
-
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"
          else
          else
-            AC_MSG_RESULT([no])
-            AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
-            wxUSE_DISPLAY="no"
+            AC_MSG_WARN([libSM not found; disabling session management detection])
+            wxUSE_DETECT_SM="no"
          fi
          fi
-    elif test "$wxUSE_MSW" = 1; then
-dnl ---------------------------------------------------------------------------
-dnl DirectDraw  / Multimon for MSW
-dnl ---------------------------------------------------------------------------
-        AC_CHECK_HEADERS([multimon.h ddraw.h], [],
-            [
-                wxUSE_DISPLAY="no"
-                AC_MSG_WARN([ddraw.h or multimon.h not found; disabling wxDisplay])
-            ],
-            [#include <windows.h>])
+    else
+        wxUSE_DETECT_SM="no"
      fi
  fi
  
      fi
  fi
  
+
  dnl ---------------------------------------------------------------------------
  dnl OpenGL libraries
  dnl ---------------------------------------------------------------------------
  
  USE_OPENGL=0
  dnl ---------------------------------------------------------------------------
  dnl OpenGL libraries
  dnl ---------------------------------------------------------------------------
  
  USE_OPENGL=0
-if test "$wxUSE_OPENGL" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
+
+    dnl look in glcanvas.h for the list of platforms supported by wxGlCanvas:
+
+    if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
          OPENGL_LIBS="-framework OpenGL -framework AGL"
      elif test "$wxUSE_MSW" = 1; then
          OPENGL_LIBS="-lopengl32 -lglu32"
          OPENGL_LIBS="-framework OpenGL -framework AGL"
      elif test "$wxUSE_MSW" = 1; then
          OPENGL_LIBS="-lopengl32 -lglu32"
-    else
-        dnl David Elliott: Without this snippet AC_CHECK_HEADER fails to find
-        dnl GL/gl.h on Mac OS X where it is located in
-        dnl /usr/X11R6/include/GL/gl.h:
+    elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1; then
  
  
-        WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, GL/gl.h)
+        dnl adjust CPPFLAGS to include GL/gl.h location if necessary
+        dnl (/opt/graphics/OpenGL is for HP-UX systems, bug 925307)
+        AC_MSG_CHECKING([for OpenGL headers])
+        WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /opt/graphics/OpenGL/include], GL/gl.h)
          if test "$ac_find_includes" != "" ; then
              AC_MSG_RESULT(found in $ac_find_includes)
              WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
          if test "$ac_find_includes" != "" ; then
              AC_MSG_RESULT(found in $ac_find_includes)
              WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
-            CPPFLAGS="$CPPFLAGS$ac_path_to_include"
+            CPPFLAGS="$ac_path_to_include $CPPFLAGS"
+        else
+            AC_MSG_RESULT([not found])
          fi
  
          fi
  
-        AC_CHECK_HEADER(GL/gl.h,
-            [
+        AC_CHECK_HEADER(GL/gl.h, [
+            AC_CHECK_HEADER(GL/glu.h, [
                  found_gl=0
  
                  found_gl=0
  
-                AC_MSG_CHECKING([for -lGL])
-                WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GL)
+                WX_FIND_LIB(GL, glBegin, [/opt/graphics/OpenGL/lib])
                  if test "$ac_find_libraries" != "" ; then
                  if test "$ac_find_libraries" != "" ; then
-                    AC_MSG_RESULT([yes])
-
-                    WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-                    if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                    if test "$ac_find_libraries" != "std" ; then
+                      WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                      if test "$ac_path_to_link" != " -L/usr/lib" ; then
                          LDFLAGS_GL="$ac_path_to_link"
                          LDFLAGS_GL="$ac_path_to_link"
+                      fi
                      fi
  
                      dnl don't suppose that libGL and libGLU are always in the
                      dnl same directory -- this is not true for some common
                      dnl distributions
                      fi
  
                      dnl don't suppose that libGL and libGLU are always in the
                      dnl same directory -- this is not true for some common
                      dnl distributions
-                    AC_MSG_CHECKING([for -lGLU])
-                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
+                    WX_FIND_LIB(GLU, gluBeginCurve, [/opt/graphics/OpenGL/lib])
                      if test "$ac_find_libraries" != "" ; then
                      if test "$ac_find_libraries" != "" ; then
+                      if test "$ac_find_libraries" != "std" ; then
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                          if test "$ac_path_to_link" != " -L/usr/lib" -a \
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                          if test "$ac_path_to_link" != " -L/usr/lib" -a \
-                                    "$ac_path_to_link" != "$LDFLAGS_GL"; then
-                            LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+                                "$ac_path_to_link" != "$LDFLAGS_GL" ; then
+                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
                          fi
                          fi
+                      fi
  
                          found_gl=1
                          OPENGL_LIBS="-lGL -lGLU"
  
                          found_gl=1
                          OPENGL_LIBS="-lGL -lGLU"
-                        AC_MSG_RESULT([yes])
-                    else
-                        AC_MSG_RESULT([no])
                      fi
                      fi
-                else
-                    AC_MSG_RESULT([no])
                  fi
  
                  if test "$found_gl" != 1; then
                  fi
  
                  if test "$found_gl" != 1; then
-                    AC_MSG_CHECKING([for -lMesaGL])
-                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
+                    WX_FIND_LIB(MesaGL, glEnable, [/opt/graphics/OpenGL/lib])
                      if test "$ac_find_libraries" != "" ; then
                      if test "$ac_find_libraries" != "" ; then
+                      if test "$ac_find_libraries" != "std" ; then
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-                        LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
-                        OPENGL_LIBS="-lMesaGL -lMesaGLU"
-                        AC_MSG_RESULT([yes])
-                    else
-                        AC_MSG_RESULT([no])
+                        if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+                        fi
+                      fi
+                      OPENGL_LIBS="-lMesaGL -lMesaGLU"
                      fi
                  fi
                      fi
                  fi
-            ])
+            ],, [ ])
+        ],
+        [],
+        [ ])
  
          if test "x$OPENGL_LIBS" = "x"; then
  
          if test "x$OPENGL_LIBS" = "x"; then
-            dnl it should be an error and not a warning because OpenGL is not on
-            dnl by default and so if it had been explicitly requested, we
-            dnl shouldn't just fall back to compiling the library without it
-            AC_MSG_ERROR(OpenGL libraries not available)
+            if test "$wxUSE_OPENGL" = "yes"; then
+                AC_MSG_ERROR([OpenGL libraries not available])
+            else
+                dnl case wxUSE_OPENGL=auto
+                AC_MSG_WARN([OpenGL libraries not available, disabling support for OpenGL])
+                wxUSE_OPENGL=no
+                USE_OPENGL=0
+            fi
          fi
          fi
+    else
+        AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
+        wxUSE_OPENGL="no"
+    fi
+
+    if test "$wxUSE_OPENGL" = "auto"; then
+        dnl if the OpenGL libraries were unavailable, this would have been
+        dnl changed to "no" above, if it wasn't, change it to "yes" as we've
+        dnl verified that we can indeed use OpenGL
+        wxUSE_OPENGL=yes
      fi
  
      if test "$wxUSE_OPENGL" = "yes"; then
      fi
  
      if test "$wxUSE_OPENGL" = "yes"; then
@@ -3712,85 +3775,104 @@ fi
  if test "$wxUSE_SHARED" = "yes"; then
  
      dnl use versioned symbols if available on the platform
  if test "$wxUSE_SHARED" = "yes"; then
  
      dnl use versioned symbols if available on the platform
-    WX_VERSIONED_SYMBOLS([\$(top_builddir)version-script])
+    WX_VERSIONED_SYMBOLS([\$(wx_top_builddir)/version-script])
+
+    dnl test for GCC's visibility support (sets CFLAGS_VISIBILITY, which is
+    dnl assigned to CFLAGS and CXXFLAGS below)
+    if test "$wxUSE_VISIBILITY" != "no"; then
+        WX_VISIBILITY
+    fi
  
  
+    dnl test for Sun CC which can be used under both Solaris and Linux
+    if test "x$SUNCXX" = xyes; then
+        SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib"
+        WXCONFIG_RPATH="-R\$libdir"
+    else
      case "${host}" in
        *-*-linux* | *-*-gnu* )
      case "${host}" in
        *-*-linux* | *-*-gnu* )
-        SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
+        SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
          WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
          ;;
  
        *-*-solaris2* )
          WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
          ;;
  
        *-*-solaris2* )
-        if test "$GCC" = yes ; then
-            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"
-
-            dnl gcc may use Sun's ld, in which case -rpath gives a confusing
-            dnl error message. We have to try both -Wl,-rpath and -Wl,-R:
-            saveLdflags="$LDFLAGS"
-            LDFLAGS="$saveLdflags -Wl,-rpath,/"
-            AC_MSG_CHECKING([if the linker accepts -rpath])
-            AC_TRY_LINK(
-                [],[],
-                [
-                    AC_MSG_RESULT([yes])
-                    SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
-                    WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
-                ],[
-                    AC_MSG_RESULT([no])
-                    AC_MSG_CHECKING([if the linker accepts -R])
-                    LDFLAGS="$saveLdflags -Wl,-R,/"
-                    AC_TRY_LINK(
-                        [],[],
-                        [
-                            AC_MSG_RESULT([yes])
-                            SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"
-                            WXCONFIG_RPATH="-Wl,-R,\$libdir"
-                        ],[
-                            AC_MSG_RESULT([no])
-                        ])
-                ])
-            LDFLAGS="$saveLdflags"
-        else
-            SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
-            WXCONFIG_RPATH="-R\$libdir"
-        fi
+        dnl here we know that Sun CC is not used as we tested for it above,
+        dnl hence we must be using gcc
+
+        dnl newer versions of gcc need -isystem to compile X headers on
+        dnl Solaris (which use old style C syntax)
+        CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS"
+
+        dnl gcc may use Sun's ld, in which case -rpath gives a confusing
+        dnl error message. We have to try both -Wl,-rpath and -Wl,-R:
+        saveLdflags="$LDFLAGS"
+        LDFLAGS="$saveLdflags -Wl,-rpath,/"
+        AC_MSG_CHECKING([if the linker accepts -rpath])
+        AC_TRY_LINK(
+            [],[],
+            [
+                AC_MSG_RESULT([yes])
+                SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib"
+                WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
+            ],[
+                AC_MSG_RESULT([no])
+                AC_MSG_CHECKING([if the linker accepts -R])
+                LDFLAGS="$saveLdflags -Wl,-R,/"
+                AC_TRY_LINK(
+                    [],[],
+                    [
+                        AC_MSG_RESULT([yes])
+                        SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib"
+                        WXCONFIG_RPATH="-Wl,-R,\$libdir"
+                    ],[
+                        AC_MSG_RESULT([no])
+                    ])
+            ])
+        LDFLAGS="$saveLdflags"
        ;;
  
        *-*-darwin* )
        ;;
  
        *-*-darwin* )
-        install_name_tool=`which install_name_tool`
+        install_name_tool=`which ${HOST_PREFIX}install_name_tool`
          if test "$install_name_tool" -a -x "$install_name_tool"; then
          if test "$install_name_tool" -a -x "$install_name_tool"; then
-            SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+            DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
              cat <<EOF >change-install-names
  #!/bin/sh
-libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
-inst_cmd="install_name_tool "
+libnames=\`cd \${2} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
  for i in \${libnames} ; do
  for i in \${libnames} ; do
-    inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+    ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
+    for dep in \${libnames} ; do
+        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
+    done
  done
  done
-\${inst_cmd} \${3}
  EOF
              chmod +x change-install-names
  EOF
              chmod +x change-install-names
+            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
          fi
          fi
+
+        dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
+        dnl "install_name_tool: changing install names can't be redone for: the_exe_name
+        dnl (for architecture ppc) because larger updated load commands do not fit
+        dnl (the program must be relinked)"
+        HEADER_PAD_OPTION="-headerpad_max_install_names"
        ;;
  
        *-*-cygwin* | *-*-mingw32* )
        ;;
  
        *-*-cygwin* | *-*-mingw32* )
-        dnl this one shouldn't be used for the library build so put it in a
-        dnl separate variable from WXCONFIG_CPPFLAGS
-        WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
          ;;
  
        *-*-hpux* )
          ;;
  
        *-*-hpux* )
-        SAMPLES_RPATH_FLAG="-Wl,+b,\$(top_builddir)lib"
+        SAMPLES_RPATH_FLAG="-Wl,+b,\$(wx_top_builddir)/lib"
          WXCONFIG_RPATH="-Wl,+b,\$libdir"
          ;;
  
      esac
          WXCONFIG_RPATH="-Wl,+b,\$libdir"
          ;;
  
      esac
+    fi
+
+    dnl this one shouldn't be used for the library build so put it in a
+    dnl separate variable from WXCONFIG_CPPFLAGS
+    WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL"
  
      if test $wxUSE_RPATH = "no"; then
          SAMPLES_RPATH_FLAG=''
  
      if test $wxUSE_RPATH = "no"; then
          SAMPLES_RPATH_FLAG=''
-        SAMPLES_RPATH_POSTLINK=''
+        DYLIB_PATH_POSTLINK=''
          WXCONFIG_RPATH=''
      fi
  
          WXCONFIG_RPATH=''
      fi
  
@@ -3813,15 +3895,6 @@ if test "$wxUSE_UNICODE" = "yes"; then
      UNICODE=1
  fi
  
      UNICODE=1
  fi
  
-lib_debug_suffix=
-WX_DEBUGTYPE="release"
-DEBUG_FLAG=0
-if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-    lib_debug_suffix=d
-    WX_DEBUGTYPE="debug"
-    DEBUG_FLAG=1
-fi
-
  WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
  WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
  
  WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
  WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
  
@@ -3830,31 +3903,30 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then
      DEBUG_INFO=1
  fi
  
      DEBUG_INFO=1
  fi
  
-WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'`
  
  
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
  
  
-TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
-
-if test "$cross_compiling" = "yes"; then
-    HOST_SUFFIX="-$host_alias"
-    TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX"
-    TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME"
-fi
+TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
  
  dnl library link name
  
  dnl library link name
-dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix.
+dnl These just save us from exporting lib_{unicode,flavour}_suffix.
  dnl If we ever need to do that, we won't need to keep these.
  dnl If we ever need to do that, we won't need to keep these.
-WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
+else
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
+fi
  if test "${TOOLKIT_DIR}" = "os2"; then
  if test "${TOOLKIT_DIR}" = "os2"; then
-    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
  else
  else
-    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
  fi
  
  
  
  fi
  
  
  
-if test "$wxUSE_COCOA" = 1; then
+if test "$wxUSE_OLD_COCOA" = 1; then
      AC_LANG_SAVE
      AC_WX_LANG_OBJECTIVEC
  dnl Recent AppKit/NSEvent.h include parts of IOKit which eventually
      AC_LANG_SAVE
      AC_WX_LANG_OBJECTIVEC
  dnl Recent AppKit/NSEvent.h include parts of IOKit which eventually
@@ -3883,47 +3955,6 @@ dnl to not typedef Point and thus fix the problem.
      AC_LANG_RESTORE
  fi
  
      AC_LANG_RESTORE
  fi
  
-if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
-    dnl base name of the resource file for wxMac must be the same
-    dnl as library installation base name (-install_name)
-    WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
-    WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
-
-    dnl add the resources target for wxMac
-    LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
-
-    AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
-    AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
-    AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
-
-    MACSETFILE="\$(SETFILE)"
-
-    dnl resources are bundled both with shared library and applications
-    dnl since the carb resource *must* be included in the application
-    if test "$wxUSE_MAC" = 1; then
-        MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r -o"
-
-        dnl this command is used to implement `wx-config --rezflags` and it is
-        dnl eval'd there so escape any metacharacters inside
-        MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r -o"
-    else
-        MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
-        MACRESWXCONFIG="echo -n \\\| ${RESCOMP} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
-    fi
-else
-    dnl default value is to (silently) do nothing in the makefile
-    MACSETFILE="@true"
-    MACRESWXCONFIG="@true"
-
-    dnl confusingly, wxOS2 also uses MACRESCOMP in its post-link step
-    if test "$wxUSE_PM" = 1; then
-        MACRESCOMP="emxbind -ep"
-    else
-        MACRESCOMP="@true"
-    fi
-fi
-
-
  dnl ---------------------------------------------------------------------------
  dnl Checks for typedefs
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl Checks for typedefs
  dnl ---------------------------------------------------------------------------
@@ -3936,16 +3967,13 @@ dnl   defines pid_t if not already defined
  AC_TYPE_PID_T
  dnl   defines size_t if not already defined
  AC_TYPE_SIZE_T
  AC_TYPE_PID_T
  dnl   defines size_t if not already defined
  AC_TYPE_SIZE_T
-dnl   defines uid_t and gid_t if not already defined
-AC_TYPE_UID_T
  
  dnl sets HAVE_SSIZE_T if ssize_t is defined
  AC_CHECK_TYPES(ssize_t)
  
  dnl check what exactly size_t is on this machine - this is necessary to avoid
  dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
  
  dnl sets HAVE_SSIZE_T if ssize_t is defined
  AC_CHECK_TYPES(ssize_t)
  
  dnl check what exactly size_t is on this machine - this is necessary to avoid
  dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH(C++) dnl tests below use overloaded functions and so need C++
  AC_CACHE_CHECK([if size_t is unsigned int],
      wx_cv_size_t_is_uint,
      [
  AC_CACHE_CHECK([if size_t is unsigned int],
      wx_cv_size_t_is_uint,
      [
@@ -3992,7 +4020,31 @@ else
      fi
  fi
  
      fi
  fi
  
-AC_LANG_RESTORE
+AC_CACHE_CHECK([if wchar_t is separate type],
+    wx_cv_wchar_t_is_separate_type,
+    AC_TRY_COMPILE([#include <wchar.h>],
+        [
+            return 0; }
+
+            struct Foo { void foo(wchar_t);
+                         void foo(unsigned short);
+                         void foo(unsigned int);
+                         void foo(unsigned long); };
+
+            int bar() {
+        ],
+        wx_cv_wchar_t_is_separate_type=yes,
+        wx_cv_wchar_t_is_separate_type=no
+    )
+)
+
+if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then
+    AC_DEFINE(wxWCHAR_T_IS_REAL_TYPE, 1)
+else
+    AC_DEFINE(wxWCHAR_T_IS_REAL_TYPE, 0)
+fi
+
+AC_LANG_POP() dnl C++
  
  dnl ---------------------------------------------------------------------------
  dnl Checks for structures
  
  dnl ---------------------------------------------------------------------------
  dnl Checks for structures
@@ -4025,83 +4077,67 @@ dnl ---------------------------------------------------------------------------
  dnl Check for functions
  dnl ---------------------------------------------------------------------------
  
  dnl Check for functions
  dnl ---------------------------------------------------------------------------
  
-dnl don't check for wchar_t functions if we haven't got wchar_t itself
-if test "$wxUSE_WCHAR_T" = "yes"; then
-    AC_DEFINE(wxUSE_WCHAR_T)
-
-    dnl check for wcslen in all possible places
-    WCSLEN_FOUND=0
-    WCHAR_LINK=
-    AC_CHECK_FUNCS(wcslen, WCSLEN_FOUND=1)
+dnl check for wcslen in all possible places
+WCSLEN_FOUND=0
+WCHAR_LINK=
+AC_CHECK_FUNCS(wcslen, WCSLEN_FOUND=1)
  
  
-    if test "$WCSLEN_FOUND" = 0; then
-        if test "$TOOLKIT" = "MSW"; then
-            AC_CHECK_LIB(msvcrt, wcslen, WCHAR_OK=1)
-        else
-            AC_CHECK_LIB(w, wcslen, [
-                            WCHAR_LINK=" -lw"
-                            WCSLEN_FOUND=1
-                        ])
-        fi
+if test "$WCSLEN_FOUND" = 0; then
+    if test "$TOOLKIT" = "MSW"; then
+        AC_CHECK_LIB(msvcrt, wcslen, WCHAR_OK=1)
+    else
+        AC_CHECK_LIB(w, wcslen, [
+                        WCHAR_LINK=" -lw"
+                        WCSLEN_FOUND=1
+                    ])
      fi
      fi
+fi
  
  
-    if test "$WCSLEN_FOUND" = 1; then
-        AC_DEFINE(HAVE_WCSLEN)
-    fi
+if test "$WCSLEN_FOUND" = 1; then
+    AC_DEFINE(HAVE_WCSLEN)
+fi
  
  
-    dnl On HP-UX aCC need this define to find mbstrtowcs() &c
-    dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict
-    dnl with g++'s in <cwchar> (unless -D_INCLUDE__STDC_A1_SOURCE is in the
-    dnl flags when g++ is configured, it will declare it's own).
-    if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
-        CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE "
-    fi
+AC_CHECK_FUNCS([wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp])
  
  
-    dnl Try to use wcsrtombs instead of wcstombs which is buggy in old GNU
-    dnl libc versions if possible. AC_CHECK_FUNCS only checks it's in the
-    dnl library, not the header, so do a header check for mbstate_t first.
-    AC_CHECK_TYPES([mbstate_t],
-                   [AC_CHECK_FUNCS(wcsrtombs)],
-                   [],
-                   [#include <wchar.h>])
-else
-    AC_MSG_WARN([Wide character support is unavailable])
+dnl On HP-UX aCC need this define to find mbstrtowcs() &c
+dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict
+dnl with g++'s in <cwchar> (unless -D_INCLUDE__STDC_A1_SOURCE is in the
+dnl flags when g++ is configured, it will declare its own).
+if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
+    CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
  fi
  
  fi
  
-dnl *printf() functions sometimes are available in the library but not
-dnl prototyped -- if this is the case, we can't use them from C++ code, but to
-dnl detect this we have to use C++ compiler for testing
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+dnl Try to use wcsrtombs instead of wcstombs which is buggy in old GNU
+dnl libc versions if possible. AC_CHECK_FUNCS only checks it's in the
+dnl library, not the header, so do a header check for mbstate_t first.
+AC_CHECK_TYPES([mbstate_t],
+               [AC_CHECK_FUNCS(wcsrtombs)],
+               [],
+               [#include <wchar.h>])
  
  dnl check for vsnprintf() -- a safe version of vsprintf())
  dnl
  
  dnl check for vsnprintf() -- a safe version of vsprintf())
  dnl
-dnl the trouble here is that on some systems (e.g HP-UX 10) this function is
+dnl the trouble here is that on some systems (e.g. HP-UX 10) this function is
  dnl present in libc but not in the system headers and so AC_CHECK_FUNCS (which,
  dnl stupidly, provides a dummy function declaration inside its extension)
  dnl succeeds, even with C++ compiler, but the compilation of wxWidgets fails
  dnl
  dnl so we first check if the function is in the library
  dnl present in libc but not in the system headers and so AC_CHECK_FUNCS (which,
  dnl stupidly, provides a dummy function declaration inside its extension)
  dnl succeeds, even with C++ compiler, but the compilation of wxWidgets fails
  dnl
  dnl so we first check if the function is in the library
-AC_CHECK_FUNCS(snprintf vsnprintf)
+dnl
+dnl FIXME: replace this mess with WX_CHECK_FUNCS()
+AC_CHECK_FUNCS(snprintf vsnprintf vsscanf)
  
  
+AC_LANG_PUSH(C++)
  if test "$ac_cv_func_vsnprintf" = "yes"; then
      dnl yes it is -- now check if it is in the headers
      AC_CACHE_CHECK([for vsnprintf declaration], wx_cv_func_vsnprintf_decl,
          [
              dnl our troubles are not over: HP-UX 11 prototypes vsnprintf() as
  if test "$ac_cv_func_vsnprintf" = "yes"; then
      dnl yes it is -- now check if it is in the headers
      AC_CACHE_CHECK([for vsnprintf declaration], wx_cv_func_vsnprintf_decl,
          [
              dnl our troubles are not over: HP-UX 11 prototypes vsnprintf() as
-            dnl taking "char *" and not "const char *" while Metrowerks does
-            dnl provide a correct vsnprintf declaration but in C++ mode it's
-            dnl always in std namespace and so we have to bring it in scope
+            dnl taking "char *" and not "const char *" so test for this too
              AC_TRY_COMPILE(
                  [
                      #include <stdio.h>
                      #include <stdarg.h>
              AC_TRY_COMPILE(
                  [
                      #include <stdio.h>
                      #include <stdarg.h>
-                    #ifdef __MSL__
-                    #if __MSL__ >= 0x6000
-                    namespace std {}
-                    using namespace std;
-                    #endif
-                    #endif
                  ],
                  [
                      char *buf;
                  ],
                  [
                      char *buf;
@@ -4178,42 +4214,97 @@ if test "$ac_cv_func_snprintf" = "yes"; then
  
      if test "$wx_cv_func_snprintf_decl" = "yes"; then
          AC_DEFINE(HAVE_SNPRINTF_DECL)
  
      if test "$wx_cv_func_snprintf_decl" = "yes"; then
          AC_DEFINE(HAVE_SNPRINTF_DECL)
+    fi
  
  
-        dnl we know there is an snprintf declaration, but some old headers
-        dnl may have one taking a "char *" format instead of "const char *"
-        AC_CACHE_CHECK([if snprintf declaration is broken], wx_cv_func_broken_snprintf_decl,
+    if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
+
+        dnl check if snprintf() has support for positional arguments
+        dnl NB: if snprintf() has positional support we can safely suppose that also
+        dnl     other *printf() functions support them as they all belong to the same
+        dnl     family and they all fallback to the same implementation
+        AC_CACHE_CHECK([if snprintf supports positional arguments], wx_cv_func_snprintf_pos_params,
              [
              [
-                AC_TRY_COMPILE(
+                AC_TRY_RUN(
                      [
                          #include <stdio.h>
                      [
                          #include <stdio.h>
-                        #include <stdarg.h>
-                        #ifdef __MSL__
-                        #if __MSL__ >= 0x6000
-                        namespace std {}
-                        using namespace std;
-                        #endif
-                        #endif
+
+                        int main (void)
+                        {
+                            char buffer[128];
+                            snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3);
+                            if (strcmp ("2 3 1", buffer) == 0)
+                                exit (0);
+                            exit (1);
+                        }
                      ],
                      ],
+                    wx_cv_func_snprintf_pos_params=no,
+                    wx_cv_func_snprintf_pos_params=yes,
+                    dnl be pessimistic when cross-compiling
                      [
                      [
-                        char *buf;
-                        const char *fmt = "%s";
-                        snprintf(buf, 10u, fmt, "wx");
-                    ],
-                    wx_cv_func_broken_snprintf_decl=no,
-                    wx_cv_func_broken_snprintf_decl=yes
+                        AC_MSG_WARN([Assuming Unix98 printf() is not available,
+define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available.])
+                        wx_cv_func_snprintf_pos_params=no
+                    ]
                  )
              ]
          )
  
                  )
              ]
          )
  
-        if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then
-            AC_DEFINE(HAVE_BROKEN_SNPRINTF_DECL)
+        if test "$wx_cv_func_snprintf_pos_params" = "yes"; then
+            AC_DEFINE(HAVE_UNIX98_PRINTF)
          fi
      fi
  fi
  
          fi
      fi
  fi
  
+dnl the same as above but for vsscanf() now: it's not present in at least
+dnl Solaris 9 headers for gcc-3.4 (due to fixinclude's processing of stdio.h)
+if test "$ac_cv_func_vsscanf" = "yes"; then
+    AC_CACHE_CHECK([for vsscanf declaration], wx_cv_func_vsscanf_decl,
+        [
+            AC_TRY_COMPILE(
+                [
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                    #ifdef __MSL__
+                    #if __MSL__ >= 0x6000
+                    namespace std {}
+                    using namespace std;
+                    #endif
+                    #endif
+                ],
+                [
+                    char *buf;
+                    va_list args;
+                    vsscanf(buf, "%s", args);
+                ],
+                wx_cv_func_vsscanf_decl=yes,
+                wx_cv_func_vsscanf_decl=no
+            )
+        ]
+    )
+
+    if test "$wx_cv_func_vsscanf_decl" = "yes"; then
+        AC_DEFINE(HAVE_VSSCANF_DECL)
+    fi
+fi
+AC_LANG_POP()
+
  if test "$wxUSE_UNICODE" = yes; then
  if test "$wxUSE_UNICODE" = yes; then
-    dnl also look if we have wide char IO functions
-    AC_CHECK_FUNCS(wputc wputchar putws fputws wprintf vswprintf)
+
+    dnl also look if we have wide char IO functions, notice that [f]putws are
+    dnl declared in special widec.h under Solaris
+    wchar_headers="#include <stdio.h>
+#include <wchar.h>"
+    case "${host}" in
+        *-*-solaris2* )
+            AC_CHECK_HEADERS(widec.h,,, [AC_INCLUDES_DEFAULT()])
+            if test "$ac_cv_header_widec_h" = "yes"; then
+                wchar_headers="$wchar_headers
+#include <widec.h>"
+            fi
+    esac
+
+    WX_CHECK_FUNCS(putws fputws wprintf vswprintf vswscanf,,,
+                   [$wchar_headers])
  
      dnl MinGW has a vswprintf with a different prototype, and
      dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS
  
      dnl MinGW has a vswprintf with a different prototype, and
      dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS
@@ -4226,27 +4317,24 @@ if test "$wxUSE_UNICODE" = yes; then
                     [AC_MSG_RESULT([no])]);
  fi
  
                     [AC_MSG_RESULT([no])]);
  fi
  
-AC_LANG_RESTORE
-
-if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
-    AC_CHECK_FUNCS(fnmatch)
-fi
-
  if test "$wxUSE_FILE" = "yes"; then
  if test "$wxUSE_FILE" = "yes"; then
-    AC_CHECK_FUNCS(fsync)
+    WX_CHECK_FUNCS(fsync)
  fi
  
  fi
  
+dnl at least under IRIX with mipsPro the C99 round() function is available when
+dnl building using the C compiler but not when using C++ one
+AC_LANG_PUSH(C++)
+WX_CHECK_FUNCS(round,,,[#include <math.h>])
+AC_LANG_POP()
  
  dnl the following tests are for Unix(like) systems only
  if test "$TOOLKIT" != "MSW"; then
  
  dnl check for available version of iconv()
  
  dnl the following tests are for Unix(like) systems only
  if test "$TOOLKIT" != "MSW"; then
  
  dnl check for available version of iconv()
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AM_ICONV
-LIBS="$LIBICONV $LIBS"
-AC_LANG_RESTORE
+if test "$wxUSE_LIBICONV" != "no" ; then
+    AM_ICONV
+    LIBS="$LIBICONV $LIBS"
+fi
  
  dnl check for POSIX signals if we need them
  if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
  
  dnl check for POSIX signals if we need them
  if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
@@ -4258,11 +4346,10 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
      fi
  
      if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
      fi
  
      if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
-      AC_LANG_SAVE
-      AC_LANG_CPLUSPLUS
-
        AC_CACHE_CHECK([for sa_handler type], wx_cv_type_sa_handler,
        [
        AC_CACHE_CHECK([for sa_handler type], wx_cv_type_sa_handler,
        [
+        dnl C compiler happily compiles the code even if there is type mismatch
+        AC_LANG_PUSH(C++)
          AC_TRY_COMPILE([#include <signal.h>],
                       [
                          extern void testSigHandler(int);
          AC_TRY_COMPILE([#include <signal.h>],
                       [
                          extern void testSigHandler(int);
@@ -4274,62 +4361,67 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
                       ], [
                          wx_cv_type_sa_handler=void
                       ])
                       ], [
                          wx_cv_type_sa_handler=void
                       ])
+        AC_LANG_POP()
        ])
  
        ])
  
-      AC_LANG_RESTORE
-
        AC_DEFINE_UNQUOTED(wxTYPE_SA_HANDLER, $wx_cv_type_sa_handler)
      fi
  fi
  
  dnl backtrace() and backtrace_symbols() for wxStackWalker
  if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
        AC_DEFINE_UNQUOTED(wxTYPE_SA_HANDLER, $wx_cv_type_sa_handler)
      fi
  fi
  
  dnl backtrace() and backtrace_symbols() for wxStackWalker
  if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-
      AC_CACHE_CHECK([for backtrace() in <execinfo.h>], wx_cv_func_backtrace,
          [
      AC_CACHE_CHECK([for backtrace() in <execinfo.h>], wx_cv_func_backtrace,
          [
-            AC_TRY_COMPILE([#include <execinfo.h>],
+            AC_SEARCH_LIBS(backtrace, execinfo,
                  [
                  [
-                    void *trace[1];
-                    char **messages;
-
-                    backtrace(trace, 1);
-                    messages = backtrace_symbols(trace, 1);
+                    AC_LANG_PUSH(C++)
+                    AC_TRY_LINK([#include <execinfo.h>],
+                        [
+                            void *trace[1];
+                            char **messages;
+                            backtrace(trace, 1);
+                            messages = backtrace_symbols(trace, 1);
+                        ],
+                        wx_cv_func_backtrace=yes,
+                        wx_cv_func_backtrace=no
+                    )
+                    AC_LANG_POP()
                  ],
                  ],
-                wx_cv_func_backtrace=yes,
                  wx_cv_func_backtrace=no
              )
          ]
      )
  
                  wx_cv_func_backtrace=no
              )
          ]
      )
  
-
      if test "$wx_cv_func_backtrace" = "no"; then
          AC_MSG_WARN([backtrace() is not available, wxStackWalker will not be available])
          wxUSE_STACKWALKER=no
      else
      if test "$wx_cv_func_backtrace" = "no"; then
          AC_MSG_WARN([backtrace() is not available, wxStackWalker will not be available])
          wxUSE_STACKWALKER=no
      else
-        AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle,
-            [
-                AC_TRY_LINK([#include <cxxabi.h>],
-                    [
-                        int rc;
-                        __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
-                    ],
-                    wx_cv_func_cxa_demangle=yes,
-                    wx_cv_func_cxa_demangle=no
-                )
-            ]
-        )
+        if test "$ac_cv_header_cxxabi_h" = "yes"; then
+            AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle,
+                [
+                    AC_LANG_PUSH(C++)
+                    AC_TRY_LINK([#include <cxxabi.h>],
+                        [
+                            int rc;
+                            __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
+                        ],
+                        wx_cv_func_cxa_demangle=yes,
+                        wx_cv_func_cxa_demangle=no
+                    )
+                    AC_LANG_POP()
+                ]
+            )
+        else
+            wx_cv_func_cxa_demangle=no
+        fi
  
          if test "$wx_cv_func_cxa_demangle" = "yes"; then
              AC_DEFINE(HAVE_CXA_DEMANGLE)
          fi
      fi
  
          if test "$wx_cv_func_cxa_demangle" = "yes"; then
              AC_DEFINE(HAVE_CXA_DEMANGLE)
          fi
      fi
-
-    AC_LANG_RESTORE
  fi
  
  fi
  
-if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then
+if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != 1 -a "$USE_UNIX" != 1; then
      AC_MSG_WARN([wxStackWalker is only available on Win32 and UNIX... disabled])
      wxUSE_STACKWALKER=no
  fi
      AC_MSG_WARN([wxStackWalker is only available on Win32 and UNIX... disabled])
      wxUSE_STACKWALKER=no
  fi
@@ -4365,9 +4457,8 @@ AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
  
  if test "$wx_cv_func_statfs" = "yes"; then
      dnl check whether we have its dcelaration too: some systems (AIX 4) lack it
  
  if test "$wx_cv_func_statfs" = "yes"; then
      dnl check whether we have its dcelaration too: some systems (AIX 4) lack it
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
      AC_CACHE_CHECK(for statfs declaration, wx_cv_func_statfs_decl,
      AC_CACHE_CHECK(for statfs declaration, wx_cv_func_statfs_decl,
+        AC_LANG_PUSH(C++)
          AC_TRY_COMPILE(
              [
                   #if defined(__BSD__)
          AC_TRY_COMPILE(
              [
                   #if defined(__BSD__)
@@ -4384,8 +4475,8 @@ if test "$wx_cv_func_statfs" = "yes"; then
              wx_cv_func_statfs_decl=yes,
              wx_cv_func_statfs_decl=no
          )
              wx_cv_func_statfs_decl=yes,
              wx_cv_func_statfs_decl=no
          )
+        AC_LANG_POP()
      )
      )
-    AC_LANG_RESTORE
  
      if test "$wx_cv_func_statfs_decl" = "yes"; then
          AC_DEFINE(HAVE_STATFS_DECL)
  
      if test "$wx_cv_func_statfs_decl" = "yes"; then
          AC_DEFINE(HAVE_STATFS_DECL)
@@ -4416,10 +4507,8 @@ else
          dnl
          dnl for this check C++ compiler has to be used as passing incompatible
          dnl pointers is just a warning and not an error in C
          dnl
          dnl for this check C++ compiler has to be used as passing incompatible
          dnl pointers is just a warning and not an error in C
-        AC_LANG_SAVE
-        AC_LANG_CPLUSPLUS
-
          AC_CACHE_CHECK(for statvfs argument type, wx_cv_type_statvfs_t,
          AC_CACHE_CHECK(for statvfs argument type, wx_cv_type_statvfs_t,
+            AC_LANG_PUSH(C++)
              AC_TRY_COMPILE(
                  [
                      #include <sys/statvfs.h>
              AC_TRY_COMPILE(
                  [
                      #include <sys/statvfs.h>
@@ -4451,10 +4540,9 @@ else
                      )
                  ]
              )
                      )
                  ]
              )
+            AC_LANG_POP()
          )
  
          )
  
-        AC_LANG_RESTORE
-
          if test "$wx_cv_type_statvfs_t" != "unknown"; then
              AC_DEFINE(HAVE_STATVFS)
          fi
          if test "$wx_cv_type_statvfs_t" != "unknown"; then
              AC_DEFINE(HAVE_STATVFS)
          fi
@@ -4481,11 +4569,11 @@ if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
      fi
  fi
  
      fi
  fi
  
-dnl check for timegm() used by datetime.cpp
-AC_CHECK_FUNCS(timegm)
-
  dnl look for a function to modify the environment
  dnl look for a function to modify the environment
-AC_CHECK_FUNCS(putenv setenv, break)
+AC_CHECK_FUNCS(setenv putenv, break)
+if test "$ac_cv_func_setenv" = "yes"; then
+    AC_CHECK_FUNCS(unsetenv)
+fi
  
  HAVE_SOME_SLEEP_FUNC=0
  if test "$USE_BEOS" = 1; then
  
  HAVE_SOME_SLEEP_FUNC=0
  if test "$USE_BEOS" = 1; then
@@ -4514,9 +4602,8 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
                      POSIX4_LINK=" -lposix4"
                  ],
                  [
                      POSIX4_LINK=" -lposix4"
                  ],
                  [
-                    AC_CHECK_FUNCS(usleep,
-                        AC_DEFINE(HAVE_USLEEP),
-                        AC_MSG_WARN([wxSleep() function will not work])
+                    WX_CHECK_FUNCS(usleep,,
+                                    AC_MSG_WARN([wxSleep() function will not work])
                      )
                  ]
              )
                      )
                  ]
              )
@@ -4525,16 +4612,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
  fi
  
  dnl check for uname (POSIX) and gethostname (BSD)
  fi
  
  dnl check for uname (POSIX) and gethostname (BSD)
-AC_CHECK_FUNCS(uname gethostname, break)
-
-dnl check for MT-safe version of strtok (on DEC Alpha, it's ok for C compiler
-dnl but not for C++ one - hence change language)
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-AC_CHECK_FUNCS(strtok_r)
+WX_CHECK_FUNCS(uname,,,[#include <sys/utsname.h>])
+if test "$wx_cv_func_uname" != yes; then
+    WX_CHECK_FUNCS(gethostname)
+fi
  
  
-AC_LANG_RESTORE
+WX_CHECK_FUNCS(strtok_r, [], [], [#define _REENTRANT])
  
  dnl check for inet_addr and inet_aton (these may live either in libc, or in
  dnl libnsl or libresolv or libsocket)
  
  dnl check for inet_addr and inet_aton (these may live either in libc, or in
  dnl libnsl or libresolv or libsocket)
@@ -4570,36 +4653,36 @@ if test "x$INET_LINK" != "x"; then
      INET_LINK=" -l$INET_LINK"
  fi
  
      INET_LINK=" -l$INET_LINK"
  fi
  
-fi
-dnl if !MSW
+WX_CHECK_FUNCS(fdopen)
  
  
+if test "$wxUSE_TARSTREAM" = "yes"; then
+    WX_CHECK_FUNCS(sysconf)
  
  
-dnl ------------------------------------------
-dnl Checks specific to contrib libs (MMedia)
-dnl ------------------------------------------
+    WX_CHECK_FUNCS(getpwuid_r, [], [],
+                   [
+                    #define _REENTRANT
+                    #include <pwd.h>
+                   ],
+                   [[
+                    struct passwd pw, *ppw;
+                    char buf[1024];
+                    getpwuid_r(0, &pw, buf, sizeof(buf), &ppw)
+                   ]])
+
+    WX_CHECK_FUNCS(getgrgid_r, [], [],
+                   [
+                    #define _REENTRANT
+                    #include <grp.h>
+                   ],
+                   [[
+                    struct group grp, *pgrp;
+                    char buf[1024];
+                    getgrgid_r(0, &grp, buf, sizeof(buf), &pgrp)
+                   ]])
+fi
  
  
-dnl Check for ESD:
-EXTRALIBS_ESD=
-AC_CHECK_LIB(esd, esd_close, [
-    AC_CHECK_HEADERS([esd.h], [
-    EXTRALIBS_ESD="-lesd"
-  ])
-])
-AC_SUBST(EXTRALIBS_ESD)
+fi
  
  
-dnl check for known CD-ROM interface
-AC_MSG_CHECKING([for known CD-ROM interface])
-AC_TRY_COMPILE([#ifdef __linux__
-                #include <linux/cdrom.h>
-                #else
-                /* For Solaris */
-                #include <sys/cdio.h>
-                #endif
-                ],
-               [struct cdrom_tocentry entry, old_entry;],
-               [AC_MSG_RESULT([yes])
-                AC_DEFINE(HAVE_KNOWN_CDROM_INTERFACE)],
-               [AC_MSG_RESULT([no])])
  
  dnl ===========================================================================
  dnl Now we have all the info we need - use it!
  
  dnl ===========================================================================
  dnl Now we have all the info we need - use it!
@@ -4649,13 +4732,15 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
          dnl with the convention that anything starting with '-' is a cpp flag
          dnl while anything else is a library (i.e. there is an implicit "-l")
          THREAD_OPTS="-pthread"
          dnl with the convention that anything starting with '-' is a cpp flag
          dnl while anything else is a library (i.e. there is an implicit "-l")
          THREAD_OPTS="-pthread"
+        if test "x$SUNCXX" = xyes; then
+            THREAD_OPTS="-mt lthread $THREAD_OPTS"
+        fi
+
          case "${host}" in
            *-*-solaris2* | *-*-sunos4* )
                  if test "x$GCC" = "xyes"; then
                      dnl Solaris/gcc combination use this one for some reason
                      THREAD_OPTS="-pthreads $THREAD_OPTS"
          case "${host}" in
            *-*-solaris2* | *-*-sunos4* )
                  if test "x$GCC" = "xyes"; then
                      dnl Solaris/gcc combination use this one for some reason
                      THREAD_OPTS="-pthreads $THREAD_OPTS"
-                else
-                    THREAD_OPTS="-mt $THREAD_OPTS"
                  fi
                  ;;
            *-*-freebsd*)
                  fi
                  ;;
            *-*-freebsd*)
@@ -4693,6 +4778,12 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
                  fi
                  ;;
  
                  fi
                  ;;
  
+          *-*-qnx*)
+                dnl under QNX thread functions are in libc so we don't need any
+                dnl special options to link with them
+                THREAD_OPTS=""
+                ;;
+
            *-*-*UnixWare*)
                  dnl flying by man pages here: Caldera online docs use this
                  if test "x$GCC" != "xyes"; then
            *-*-*UnixWare*)
                  dnl flying by man pages here: Caldera online docs use this
                  if test "x$GCC" != "xyes"; then
@@ -4701,10 +4792,22 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
                  ;;
          esac
  
                  ;;
          esac
  
-        dnl simply linking with libpthread should make the test below work but
-        dnl it's far from certain that the threaded programs compiled without
-        dnl any special switches actually work, so try it after all the others
-        THREAD_OPTS="$THREAD_OPTS pthread none"
+        case "${host}" in
+            *-*-qnx*)
+                dnl -lpthread works, i.e. AC_TRY_LINK() would pass, but results
+                dnl in warnings and is not needed under QNX so try without it
+                dnl first
+                THREAD_OPTS="none pthread"
+                ;;
+
+            *)
+                dnl simply linking with libpthread should make the test below
+                dnl work but it's far from certain that the threaded programs
+                dnl compiled without any special switches actually work, so try
+                dnl it after all the others
+                THREAD_OPTS="$THREAD_OPTS pthread none"
+                ;;
+        esac
  
          dnl now test for all possibilities
          THREADS_OK=no
  
          dnl now test for all possibilities
          THREADS_OK=no
@@ -4752,7 +4855,14 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
        else
            dnl yes, these special compiler flags should be used with the
            dnl linker as well
        else
            dnl yes, these special compiler flags should be used with the
            dnl linker as well
+          dnl
+          dnl NB: add them to LDFLAGS immediately because we need them to be
+          dnl     used for the subsequent tests some of which can fail without
+          dnl     MT support, hence the reason for the duplication below:
+          dnl     adding them just to WXCONFIG_LDFLAGS and adding the entire
+          dnl     contents of the latter to LDFLAGS in the end is not enough.
            LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
            LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
+          WXCONFIG_LDFLAGS="$THREADS_CFLAGS $WXCONFIG_LDFLAGS"
            LIBS="$THREADS_LINK $LIBS"
  
            AC_MSG_CHECKING([if more special flags are required for pthreads])
            LIBS="$THREADS_LINK $LIBS"
  
            AC_MSG_CHECKING([if more special flags are required for pthreads])
@@ -4766,6 +4876,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
                  dnl     search path should include -L/usr/lib/threads at the
                  dnl     beginning of the path.
                  LDFLAGS="-L/usr/lib/threads $LDFLAGS"
                  dnl     search path should include -L/usr/lib/threads at the
                  dnl     beginning of the path.
                  LDFLAGS="-L/usr/lib/threads $LDFLAGS"
+                WXCONFIG_LDFLAGS="-L/usr/lib/threads $WXCONFIG_LDFLAGS"
                  flag="-D_THREAD_SAFE"
                  ;;
              *-freebsd*)
                  flag="-D_THREAD_SAFE"
                  ;;
              *-freebsd*)
@@ -4794,12 +4905,22 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
  
      dnl do other tests only if we are using threads
      if test "$wxUSE_THREADS" = "yes" ; then
  
      dnl do other tests only if we are using threads
      if test "$wxUSE_THREADS" = "yes" ; then
-      AC_CHECK_FUNCS(thr_setconcurrency)
+        AC_CHECK_FUNCS(pthread_setconcurrency,
+            AC_DEFINE(HAVE_PTHREAD_SET_CONCURRENCY),
+            [
+                AC_CHECK_FUNCS(thr_setconcurrency,
+                    AC_DEFINE(HAVE_THR_SETCONCURRENCY),
+                    AC_MSG_WARN(Setting thread concurrency will not work properly))
+            ])
  
        dnl can't use AC_CHECK_FUNCS for this one as it's usually a macro and so
        dnl wouldn't be found by it
        AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup,
        [
  
        dnl can't use AC_CHECK_FUNCS for this one as it's usually a macro and so
        dnl wouldn't be found by it
        AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup,
        [
+        dnl C compiler may treat pthread_cleanup_push() as an undeclared
+        dnl function and not give a warning even if it's unavailable, so use
+        dnl the C++ one for this test
+        AC_LANG_PUSH(C++)
          AC_TRY_COMPILE([#include <pthread.h>
                 void ThreadCleanupFunc(void *p);
              ],
          AC_TRY_COMPILE([#include <pthread.h>
                 void ThreadCleanupFunc(void *p);
              ],
@@ -4813,12 +4934,13 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
                 wx_cv_func_pthread_cleanup=no
              ]
          )
                 wx_cv_func_pthread_cleanup=no
              ]
          )
+        AC_LANG_POP()
        ])
        if test "x$wx_cv_func_pthread_cleanup" = "xyes"; then
          AC_DEFINE(wxHAVE_PTHREAD_CLEANUP)
        fi
  
        ])
        if test "x$wx_cv_func_pthread_cleanup" = "xyes"; then
          AC_DEFINE(wxHAVE_PTHREAD_CLEANUP)
        fi
  
-      AC_CHECK_HEADERS(sched.h)
+      AC_CHECK_HEADERS(sched.h,,, [AC_INCLUDES_DEFAULT()])
        if test "$ac_cv_header_sched_h" = "yes"; then
            AC_CHECK_FUNC(sched_yield,
              AC_DEFINE(HAVE_SCHED_YIELD),
        if test "$ac_cv_header_sched_h" = "yes"; then
            AC_CHECK_FUNC(sched_yield,
              AC_DEFINE(HAVE_SCHED_YIELD),
@@ -4863,6 +4985,10 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
                      AC_DEFINE(HAVE_PTHREAD_CANCEL),
                      AC_MSG_WARN([wxThread::Kill() will not work properly]))
  
                      AC_DEFINE(HAVE_PTHREAD_CANCEL),
                      AC_MSG_WARN([wxThread::Kill() will not work properly]))
  
+      AC_CHECK_FUNC(pthread_mutex_timedlock,
+                    AC_DEFINE(HAVE_PTHREAD_MUTEX_TIMEDLOCK),
+                    AC_MSG_WARN([wxMutex::LockTimeout() will not work]))
+
        AC_CHECK_FUNC(pthread_attr_setstacksize,
                      AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE))
  
        AC_CHECK_FUNC(pthread_attr_setstacksize,
                      AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE))
  
@@ -4928,19 +5054,98 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
            AC_MSG_WARN([wxMutex won't be recursive on this platform])
          fi
        fi
            AC_MSG_WARN([wxMutex won't be recursive on this platform])
          fi
        fi
+
+      if test "$wxUSE_COMPILER_TLS" = "auto"; then
+          if test "$USE_NETBSD" = 1; then
+              AC_MSG_WARN([Disabling TLS under NetBSD, please contact wx-dev if it works now])
+              wxUSE_COMPILER_TLS=no
+          else
+              wxUSE_COMPILER_TLS=yes
+          fi
+      fi
+
+      if test "$wxUSE_COMPILER_TLS" = "yes"; then
+          dnl test for compiler thread-specific variables support
+          AC_CACHE_CHECK([for __thread keyword],
+                         wx_cv_cc___thread,
+              [
+                  AC_TRY_COMPILE([#include <pthread.h>],
+                      [
+                          static __thread int n = 0;
+                          static __thread int *p = 0;
+                      ],
+                      wx_cv_cc___thread=yes,
+                      wx_cv_cc___thread=no
+                  )
+              ]
+          )
+
+          if test "$wx_cv_cc___thread" = "yes"; then
+              AX_GXX_VERSION
+              if test -n "$ax_cv_gxx_version"; then
+                  dnl g++ supports __thread since at least version 3.3 but its support
+                  dnl seems to be broken until 4.1, see
+                  dnl   http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/108388
+                  dnl
+                  dnl NB: we still need to test __thread support with
+                  dnl     AC_TRY_COMPILE above even for g++ 4 as it doesn't
+                  dnl     support it for all architectures (e.g. it doesn't
+                  dnl     work under OS X)
+                  AC_MSG_CHECKING([whether __thread support in g++ is usable])
+                  case "$ax_cv_gxx_version" in
+                    1.* | 2.* | 3.* )
+                        AC_MSG_RESULT([no, it's broken])
+                        wx_cv_cc___thread=no
+                        ;;
+                    *)
+                        AC_MSG_RESULT([yes, it works])
+                        ;;
+                  esac
+              fi
+          fi
+
+          if test "$wx_cv_cc___thread" = "yes"; then
+            AC_DEFINE(HAVE___THREAD_KEYWORD)
+          fi
+        fi
+
+        if test "$ac_cv_header_cxxabi_h" = "yes"; then
+            AC_CACHE_CHECK([for abi::__forced_unwind() in <cxxabi.h>],
+                wx_cv_type_abi_forced_unwind,
+                [
+                    AC_LANG_PUSH(C++)
+                    AC_TRY_COMPILE([#include <cxxabi.h>],
+                        [
+                            void foo(abi::__forced_unwind&);
+                        ],
+                        wx_cv_type_abi_forced_unwind=yes,
+                        wx_cv_type_abi_forced_unwind=no
+                    )
+                    AC_LANG_POP()
+                ]
+            )
+        else
+            wx_cv_type_abi_forced_unwind=no
+        fi
+
+        if test "$wx_cv_type_abi_forced_unwind" = "yes"; then
+            AC_DEFINE(HAVE_ABI_FORCEDUNWIND)
+        fi
      fi
  
  dnl from if !MSW
  else
      if test "$wxUSE_THREADS" = "yes" ; then
        case "${host}" in
      fi
  
  dnl from if !MSW
  else
      if test "$wxUSE_THREADS" = "yes" ; then
        case "${host}" in
+        x86_64-*-mingw32* )
+        ;;
          *-*-mingw32* )
              dnl check if the compiler accepts -mthreads
              AC_CACHE_CHECK([if compiler supports -mthreads],
                  wx_cv_cflags_mthread,
                  [
                      CFLAGS_OLD="$CFLAGS"
          *-*-mingw32* )
              dnl check if the compiler accepts -mthreads
              AC_CACHE_CHECK([if compiler supports -mthreads],
                  wx_cv_cflags_mthread,
                  [
                      CFLAGS_OLD="$CFLAGS"
-                    CFLAGS="$CFLAGS -mthreads"
+                    CFLAGS="-mthreads $CFLAGS"
                      AC_TRY_COMPILE([], [],
                          wx_cv_cflags_mthread=yes,
                          wx_cv_cflags_mthread=no
                      AC_TRY_COMPILE([], [],
                          wx_cv_cflags_mthread=yes,
                          wx_cv_cflags_mthread=no
@@ -4959,13 +5164,51 @@ else
          ;;
          *-pc-os2*emx )
              WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__"
          ;;
          *-pc-os2*emx )
              WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__"
-            WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -Zmt -D__ST_MT_ERRNO__"
              LDFLAGS="$LDFLAGS -Zmt"
          ;;
        esac
      fi
  fi
  
              LDFLAGS="$LDFLAGS -Zmt"
          ;;
        esac
      fi
  fi
  
+AC_CHECK_FUNC(localtime_r, [ AC_DEFINE(HAVE_LOCALTIME_R) ])
+AC_CHECK_FUNC(gmtime_r, [ AC_DEFINE(HAVE_GMTIME_R) ])
+dnl By preference, we probably should use getaddrinfo which avoids thread
+dnl safety issues and supports IPv6, however there currently is no code
+dnl for it, so testing for it is temporarily disabled and we are restricted
+dnl to gethostbyname_r/gethostbyaddr_r  and getservbyname_r
+
+dnl AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO), [
+    dnl no getaddrinfo, so check for gethostbyname_r and
+    dnl related functions (taken from python's configure.in)
+    dnl sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments
+      AX_FUNC_WHICH_GETHOSTBYNAME_R
+      if test "x$ac_cv_func_which_gethostbyname_r" = "xno" -o \
+              "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then
+          AC_CHECK_FUNC(gethostbyname, [ AC_DEFINE(HAVE_GETHOSTBYNAME) ])
+      fi
+      dnl A similar test for getservbyname_r
+      dnl I'm tempted to just not do this test which is taking much time and
+      dnl do something similar as for gethostbyaddr_r, but OTOH the macro
+      dnl doing the test already exists, so using it is easy enough.     - SN
+      AC_raf_FUNC_WHICH_GETSERVBYNAME_R
+      if test "x$ac_cv_func_which_getservbyname_r" = "xno" -o \
+              "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then
+          AC_CHECK_FUNCS(getservbyname,[ AC_DEFINE(HAVE_GETSERVBYNAME) ])
+      fi
+      dnl For gethostbyaddr_r, we currently do no separate test, instead, we
+      dnl silently assume it's available exactly if gethostbyname_r is
+      dnl available and always requires two more arguments than
+      dnl gethostbyname_r.
+      dnl (also, I'm lazy and there no m4 file that's ready for use for this
+      dnl  function, although it should be easy to rewrite the gethostbyname_r
+      dnl  check to fit this case, if it's really needed.                - SN )
+dnl    ]
+dnl )
+
+dnl This is currently always defined under Unix, there is no reason to ever
+dnl disable compiler TLS support there.
+AC_DEFINE(wxUSE_COMPILER_TLS)
+
  if test "$wxUSE_THREADS" = "yes"; then
    AC_DEFINE(wxUSE_THREADS)
  
  if test "$wxUSE_THREADS" = "yes"; then
    AC_DEFINE(wxUSE_THREADS)
  
@@ -4973,7 +5216,7 @@ if test "$wxUSE_THREADS" = "yes"; then
  else
    dnl on some systems, _REENTRANT should be defined if we want to use any _r()
    dnl functions - add tests for other functions here as well
  else
    dnl on some systems, _REENTRANT should be defined if we want to use any _r()
    dnl functions - add tests for other functions here as well
-  if test "$ac_cv_func_strtok_r" = "yes"; then
+  if test "$wx_cv_func_strtok_r" = "yes"; then
      AC_MSG_CHECKING(if -D_REENTRANT is needed)
      if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
          WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_REENTRANT"
      AC_MSG_CHECKING(if -D_REENTRANT is needed)
      if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
          WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_REENTRANT"
@@ -4984,13 +5227,12 @@ else
    fi
  fi
  
    fi
  fi
  
-if test "$WXGTK20" = 1 ; then
-  AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK20)
-  WXGTK12=1
+if test "$WXGTK3" = 1 ; then
+    AC_DEFINE_UNQUOTED(__WXGTK3__, 1)
+    WXGTK2=1
  fi
  fi
-
-if test "$WXGTK12" = 1 ; then
-  AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12)
+if test "$WXGTK2" = 1 ; then
+  AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK2)
  fi
  
  if test "$WXGTK127" = 1 ; then
  fi
  
  if test "$WXGTK127" = 1 ; then
@@ -5001,27 +5243,35 @@ if test "$WXGPE" = 1 ; then
    AC_DEFINE_UNQUOTED(__WXGPE__,$WXGPE)
  fi
  
    AC_DEFINE_UNQUOTED(__WXGPE__,$WXGPE)
  fi
  
-dnl DEBUG_FLAG contains debugging options (supposed to be the same for C and C++
-dnl compilers: we'd need a separate WXDEBUG_CXX if this is ever not the case)
-DEBUG_FLAG=
-if test "$wxUSE_DEBUG_INFO" = "yes" ; then
-    DEBUG_FLAG="-g"
-    wxUSE_OPTIMISE=no
+dnl DEBUG_CFLAGS contains debugging options (supposed to be the same for C and C++
+dnl compilers: we'd need a separate DEBUG_CXXFLAGS if this is ever not the case)
+DEBUG_CFLAGS=
+if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then
+    dnl the CXXFLAGS or the CFLAGS variable already contains the -g flag
+    dnl (e.g. it was specified by the user before running configure); since
+    dnl later they will be merged with DEBUG_CFLAGS, don't set the -g option
+    dnl in DEBUG_CFLAGS to avoid (possibly different) flag duplicates
+    AC_MSG_WARN([CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option])
+elif test "$wxUSE_DEBUG_INFO" = "yes" ; then
+    DEBUG_CFLAGS="-g"
  fi
  
  if test "$wxUSE_DEBUG_GDB" = "yes" ; then
      wxUSE_DEBUG_INFO=yes
      if test "$GCC" = yes; then
  fi
  
  if test "$wxUSE_DEBUG_GDB" = "yes" ; then
      wxUSE_DEBUG_INFO=yes
      if test "$GCC" = yes; then
-        DEBUG_FLAG="-ggdb"
+        DEBUG_CFLAGS="-ggdb"
      fi
  fi
  
      fi
  fi
  
-if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
-    AC_DEFINE(WXDEBUG)
-    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__"
-else
+if test "$wxUSE_DEBUG_FLAG" = "no" ; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0"
+
      if test "$wxUSE_GTK" = 1 ; then
      if test "$wxUSE_GTK" = 1 ; then
-        CPPFLAGS="$CPPFLAGS -DGTK_NO_CHECK_CASTS"
+        if test "$WXGTK2" = 1 ; then
+            CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
+        else
+            CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
+        fi
      fi
  fi
  
      fi
  fi
  
@@ -5037,14 +5287,17 @@ if test "$wxUSE_DMALLOC" = "yes" ; then
  fi
  
  dnl cc/cxx/ld option for profiling
  fi
  
  dnl cc/cxx/ld option for profiling
-PROFILE_FLAG=
+PROFILE_FLAGS=
  if test "$wxUSE_PROFILE" = "yes" ; then
  if test "$wxUSE_PROFILE" = "yes" ; then
-    PROFILE_FLAG=" -pg"
+    PROFILE_FLAGS=" -pg"
  fi
  
  if test "$GCC" = "yes" ; then
      if test "$wxUSE_NO_RTTI" = "yes" ; then
  fi
  
  if test "$GCC" = "yes" ; then
      if test "$wxUSE_NO_RTTI" = "yes" ; then
-        WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-rtti"
+        dnl Define wxNO_RTTI on the command line because only g++ 4.3 and later
+        dnl define __GXX_RTTI which allows us to detect the use of -fno-rtti
+        dnl switch but we need to do it manually for the older versions.
+        WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -DwxNO_RTTI -fno-rtti"
      fi
      if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
          WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-exceptions"
      fi
      if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
          WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-exceptions"
@@ -5075,18 +5328,38 @@ if test "$GCC" = "yes" ; then
  fi
  
  dnl C/C++ compiler option for optimization (supposed to be the same for both)
  fi
  
  dnl C/C++ compiler option for optimization (supposed to be the same for both)
-OPTIMISE_FLAG=
-if test "$wxUSE_OPTIMISE" = "no" ; then
-    if test "$GCC" = yes ; then
-        dnl use -O0 because compiling with it is faster than compiling with no
-        dnl optimization options at all (at least with g++ 3.2)
-        OPTIMISE_FLAG="-O0"
-    fi
+OPTIMISE_CFLAGS=
+if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then
+    dnl the CXXFLAGS or the CFLAGS variable already contains -O optimization flag
+    dnl (e.g. it was specified by the user before running configure); since
+    dnl later they will be merged with OPTIMISE_CFLAGS, don't set the -O option
+    dnl in OPTIMISE_CFLAGS to avoid (possibly different) flag duplicates
+    AC_MSG_WARN([CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option])
  else
  else
-    if test "$GCC" = yes ; then
-        OPTIMISE_FLAG="-O2"
+    if test "$wxUSE_OPTIMISE" = "no" ; then
+        if test "$GCC" = yes ; then
+            dnl use -O0 because compiling with it is faster than compiling with no
+            dnl optimization options at all (at least with g++ 3.2)
+            OPTIMISE_CFLAGS="-O0"
+        fi
      else
      else
-        OPTIMISE_FLAG="-O"
+        if test "$GCC" = yes ; then
+            case "${host}" in
+                *-pc-os2_emx | *-pc-os2-emx )
+                    dnl Not all of the supported gcc versions understand
+                    dnl -fstrict-aliasing and none actually needs it (yet).
+                    OPTIMISE_CFLAGS="-O2"
+                ;;
+                *)
+                    dnl Switch on optimisation but keep strict-aliasing off for
+                    dnl now (see -fstrict-aliasing in the gcc manual). When it is
+                    dnl switched back on consider using -Wstrict-aliasing=2.
+                    OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
+                ;;
+            esac
+        else
+            OPTIMISE_CFLAGS="-O"
+        fi
      fi
  fi
  
      fi
  fi
  
@@ -5094,14 +5367,14 @@ dnl ---------------------------------------------------------------------------
  dnl compatibility level
  dnl ---------------------------------------------------------------------------
  
  dnl compatibility level
  dnl ---------------------------------------------------------------------------
  
-if test "x$WXWIN_COMPATIBILITY_2_4" = "xyes"; then
-    AC_DEFINE(WXWIN_COMPATIBILITY_2_4)
+if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
+    AC_DEFINE(WXWIN_COMPATIBILITY_2_6)
  
  
-    WXWIN_COMPATIBILITY_2_6="yes"
+    WXWIN_COMPATIBILITY_2_8="yes"
  fi
  
  fi
  
-if test "x$WXWIN_COMPATIBILITY_2_6" != "xno"; then
-    AC_DEFINE(WXWIN_COMPATIBILITY_2_6)
+if test "x$WXWIN_COMPATIBILITY_2_8" != "xno"; then
+    AC_DEFINE(WXWIN_COMPATIBILITY_2_8)
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -5142,10 +5415,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
      HAVE_DL_FUNCS=0
      HAVE_SHL_FUNCS=0
      if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
      HAVE_DL_FUNCS=0
      HAVE_SHL_FUNCS=0
      if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
-        if test "$USE_DARWIN" = 1; then
-            dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
-            HAVE_DL_FUNCS=1
-        elif test "$USE_DOS" = 1; then
+        if test "$USE_DOS" = 1; then
              HAVE_DL_FUNCS=0
          else
              dnl the test is a bit complicated because we check for dlopen() both with
              HAVE_DL_FUNCS=0
          else
              dnl the test is a bit complicated because we check for dlopen() both with
@@ -5179,15 +5449,21 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
                              ])
              ])
  
                              ])
              ])
  
-        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))
-                ]
-            )
+            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
          fi
+
+        dnl Force HAVE_DL_FUNCS on for Darwin, even if the tests failed (e.g. pre-10.3)
+        if test "$USE_DARWIN" = 1; then
+            dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
+            HAVE_DL_FUNCS=1
          fi
  
          if test "$HAVE_DL_FUNCS" = 0; then
          fi
  
          if test "$HAVE_DL_FUNCS" = 0; then
@@ -5234,6 +5510,45 @@ if test "$wxUSE_PLUGINS" = "yes" ; then
      fi
  fi
  
      fi
  fi
  
+dnl ---------------------------------------------------------------------------
+dnl File system watcher checks
+dnl ---------------------------------------------------------------------------
+
+if test "$wxUSE_FSWATCHER" = "yes"; then
+    dnl wxFileSystemWatcher is always available under MSW but we need either
+    dnl inotify or kqueue support in the system for it under Unix (this
+    dnl includes OS X which does have kqueue but no other platforms)
+    if test "$wxUSE_MSW" != "1"; then
+        if test "$wxUSE_UNIX" = "yes"; then
+            AC_CHECK_HEADERS(sys/inotify.h,,, [AC_INCLUDES_DEFAULT()])
+            if test "$ac_cv_header_sys_inotify_h" = "yes"; then
+                AC_DEFINE(wxHAS_INOTIFY)
+            else
+                AC_CHECK_HEADERS(sys/event.h,,, [AC_INCLUDES_DEFAULT()])
+                if test "$ac_cv_header_sys_event_h" = "yes"; then
+                    AC_DEFINE(wxHAS_KQUEUE)
+                else
+                    wxUSE_FSWATCHER=no
+                fi
+            fi
+        else
+            wxUSE_FSWATCHER=no
+        fi
+    else
+        if test "$wxUSE_THREADS" != "yes"; then
+            AC_MSG_WARN([wxFileSystemWatcher disabled due to --disable-threads])
+            wxUSE_FSWATCHER=no
+        fi
+    fi
+
+    if test "$wxUSE_FSWATCHER" = "yes"; then
+        AC_DEFINE(wxUSE_FSWATCHER)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher"
+    else
+        AC_MSG_WARN([wxFileSystemWatcher won't be available on this platform])
+    fi
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl Register non-GUI class options for makefiles and setup.h
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl Register non-GUI class options for makefiles and setup.h
  dnl ---------------------------------------------------------------------------
@@ -5242,6 +5557,14 @@ if test "$wxUSE_STL" = "yes"; then
    AC_DEFINE(wxUSE_STL)
  fi
  
    AC_DEFINE(wxUSE_STL)
  fi
  
+if test "$wxUSE_EXTENDED_RTTI" = "yes"; then
+  AC_DEFINE(wxUSE_EXTENDED_RTTI)
+fi
+
+if test "$wxUSE_ANY" = "yes"; then
+    AC_DEFINE(wxUSE_ANY)
+fi
+
  if test "$wxUSE_APPLE_IEEE" = "yes"; then
    AC_DEFINE(wxUSE_APPLE_IEEE)
  fi
  if test "$wxUSE_APPLE_IEEE" = "yes"; then
    AC_DEFINE(wxUSE_APPLE_IEEE)
  fi
@@ -5252,26 +5575,28 @@ fi
  
  dnl Unix implementation needs additional checks because audio support
  dnl comes in many favours:
  
  dnl Unix implementation needs additional checks because audio support
  dnl comes in many favours:
-if test "$USE_UNIX" = "1" ; then
+if test "$USE_UNIX" = 1 ; then
      dnl it's not enough to check for just the header because OSS under NetBSD
      dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
      dnl whether we need -lossaudio at link-time
      dnl it's not enough to check for just the header because OSS under NetBSD
      dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
      dnl whether we need -lossaudio at link-time
-    AC_CACHE_CHECK([for ioctl() in sys/soundcard.h], ac_cv_header_sys_soundcard, [
+    AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
          AC_TRY_LINK([
          AC_TRY_LINK([
+                #include <sys/ioctl.h>
                  #include <sys/soundcard.h>
              ],
              [
                  #include <sys/soundcard.h>
              ],
              [
-                ioctl(0, SNDCTL_DSP_SYNC, 0);
+                ioctl(0, SNDCTL_DSP_SPEED, 0);
              ],
              ac_cv_header_sys_soundcard=yes,
              [
                  saveLibs="$LIBS"
                  LIBS="$saveLibs -lossaudio"
                  AC_TRY_LINK([
              ],
              ac_cv_header_sys_soundcard=yes,
              [
                  saveLibs="$LIBS"
                  LIBS="$saveLibs -lossaudio"
                  AC_TRY_LINK([
+                        #include <sys/ioctl.h>
                          #include <sys/soundcard.h>
                      ],
                      [
                          #include <sys/soundcard.h>
                      ],
                      [
-                        ioctl(0, SNDCTL_DSP_SYNC, 0);
+                        ioctl(0, SNDCTL_DSP_SPEED, 0);
                      ],
                      ac_cv_header_sys_soundcard=yes,
                      [
                      ],
                      ac_cv_header_sys_soundcard=yes,
                      [
@@ -5285,18 +5610,18 @@ if test "$USE_UNIX" = "1" ; then
  
      if test "$ac_cv_header_sys_soundcard" = "yes"; then
          AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
  
      if test "$ac_cv_header_sys_soundcard" = "yes"; then
          AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
-    else
-        DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"
      fi
  fi
      fi
  fi
+
  WITH_PLUGIN_SDL=0
  if test "$wxUSE_SOUND" = "yes"; then
  WITH_PLUGIN_SDL=0
  if test "$wxUSE_SOUND" = "yes"; then
-  if test "$USE_UNIX" = "1" ; then
+  if test "$USE_UNIX" = 1 ; then
      if test "$wxUSE_LIBSDL" != "no"; then
        AM_PATH_SDL([1.2.0],
                    [
                      EXTRALIBS_SDL="$SDL_LIBS"
      if test "$wxUSE_LIBSDL" != "no"; then
        AM_PATH_SDL([1.2.0],
                    [
                      EXTRALIBS_SDL="$SDL_LIBS"
-                    CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+                    CFLAGS="$SDL_CFLAGS $CFLAGS"
+                    CXXFLAGS="$SDL_CFLAGS $CXXFLAGS"
                      AC_DEFINE(wxUSE_LIBSDL)
                    ],
                    [wxUSE_LIBSDL="no"])
                      AC_DEFINE(wxUSE_LIBSDL)
                    ],
                    [wxUSE_LIBSDL="no"])
@@ -5305,31 +5630,143 @@ if test "$wxUSE_SOUND" = "yes"; then
        fi
      fi
    fi
        fi
      fi
    fi
+fi
  
  
+if test "$wxUSE_SOUND" = "yes"; then
    AC_DEFINE(wxUSE_SOUND)
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
  fi
  
    AC_DEFINE(wxUSE_SOUND)
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
  fi
  
-if test "$WXGTK20" = 1; then
+if test "$WXGTK2" = 1; then
+    PKG_PROG_PKG_CONFIG()
+
      if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
      if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
+
+        if test "$wxUSE_GTKPRINT" = "yes" ; then
+            if test "$WXGTK3" = 1; then
+                gtk_unix_print="gtk+-unix-print-3.0"
+            else
+                gtk_unix_print="gtk+-unix-print-2.0 >= 2.10"
+            fi
+                PKG_CHECK_MODULES(GTKPRINT,
+                                  [$gtk_unix_print],
+                    [
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GTKPRINT_LIBS"
+                        CFLAGS="$GTKPRINT_CFLAGS $CFLAGS"
+                        CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS"
+                        AC_DEFINE(wxUSE_GTKPRINT)
+                    ],
+                    [
+                        AC_MSG_WARN([GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing])
+                        wxUSE_GTKPRINT="no"
+                    ]
+                )
+        fi
+
+        if test "$WXGTK3" = 1; then
+            wxUSE_LIBGNOMEPRINT=no
+        fi
+
          if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
  
                  PKG_CHECK_MODULES(LIBGNOMEPRINTUI,
                                    [libgnomeprintui-2.2 >= 2.8],
                      [
          if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
  
                  PKG_CHECK_MODULES(LIBGNOMEPRINTUI,
                                    [libgnomeprintui-2.2 >= 2.8],
                      [
-dnl                     EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
-                        CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS"
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBGNOMEPRINTUI_LIBS"
+                        CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS"
+                        CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"
                          AC_DEFINE(wxUSE_LIBGNOMEPRINT)
                      ],
                      [
                          AC_DEFINE(wxUSE_LIBGNOMEPRINT)
                      ],
                      [
-                        AC_MSG_WARN([libgnomeprintui not found, library will use standard PostScript printing])
+                        if test "$wxUSE_GTKPRINT" = yes; then
+                            AC_MSG_RESULT(no)
+                        else
+                            AC_MSG_WARN([libgnomeprintui not found, library will use standard PostScript printing])
+                        fi
                          wxUSE_LIBGNOMEPRINT="no"
                      ]
                  )
          fi
      fi
                          wxUSE_LIBGNOMEPRINT="no"
                      ]
                  )
          fi
      fi
-fi
  
  
+    if test "$wxUSE_MIMETYPE" = "yes" ; then
+        if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then
+
+                PKG_CHECK_MODULES(GNOMEVFS,
+                                  [gnome-vfs-2.0 >= 2.0],
+                    [
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GNOMEVFS_LIBS"
+                        CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS"
+                        CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS"
+                        AC_DEFINE(wxUSE_LIBGNOMEVFS)
+                    ],
+                    [
+                        AC_MSG_WARN([libgnomevfs not found, library won't be able to associate MIME type])
+                        wxUSE_LIBGNOMEVFS="no"
+                    ]
+                )
+        fi
+    fi
+
+    if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes" ; then
+        if test "$wxUSE_LIBNOTIFY" = "yes" ; then
+            HAVE_LIBNOTIFY=0
+            PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.7],
+                [
+                    HAVE_LIBNOTIFY=1
+                    AC_DEFINE(wxUSE_LIBNOTIFY_0_7)
+                ],
+                [
+                    PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.4],
+                        [HAVE_LIBNOTIFY=1],
+                        [AC_MSG_WARN([libnotify not found, wxNotificationMessage will use generic implementation.])]
+                    )
+                ]
+            )
+
+            if test "$HAVE_LIBNOTIFY" = "1" ; then
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBNOTIFY_LIBS"
+                CFLAGS="$LIBNOTIFY_CFLAGS $CFLAGS"
+                CXXFLAGS="$LIBNOTIFY_CFLAGS $CXXFLAGS"
+                AC_DEFINE(wxUSE_LIBNOTIFY)
+            fi
+        fi
+    fi
+
+    if test "$wxUSE_LIBHILDON" = "yes" ; then
+        PKG_CHECK_MODULES(HILDON,
+                          [hildon-lgpl >= 0.9],
+            [
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON_LIBS"
+                CFLAGS="$CFLAGS $HILDON_CFLAGS"
+                CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS"
+                AC_DEFINE(wxUSE_LIBHILDON)
+                ac_hildon_lgpl=1
+            ],
+            [
+                AC_MSG_WARN([libhildon_lgpl not found])
+                        wxUSE_LIBHILDON="no"
+                        ac_hildon_lgpl=0
+            ]
+        )
+
+        if test "$ac_hildon_lgpl" = 0 ; then
+            PKG_CHECK_MODULES(HILDON2,
+                              [hildon-1 >= 1.99],
+                [
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON2_LIBS"
+                    CFLAGS="$CFLAGS $HILDON2_CFLAGS"
+                    CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS"
+                    AC_DEFINE(wxUSE_LIBHILDON2)
+                ],
+                [
+                    AC_MSG_WARN([libhildon_1 not found])
+                            wxUSE_LIBHILDON2="no"
+                ]
+            )
+        fi
+    fi
+fi
  
  if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
    AC_DEFINE(wxUSE_CMDLINE_PARSER)
  
  if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
    AC_DEFINE(wxUSE_CMDLINE_PARSER)
@@ -5351,16 +5788,13 @@ if test "$wxUSE_FFILE" = "yes"; then
    AC_DEFINE(wxUSE_FFILE)
  fi
  
    AC_DEFINE(wxUSE_FFILE)
  fi
  
-if test "$wxUSE_FILESYSTEM" = "yes"; then
-  AC_DEFINE(wxUSE_FILESYSTEM)
-fi
-
-if test "$wxUSE_FS_ZIP" = "yes"; then
-  AC_DEFINE(wxUSE_FS_ZIP)
-fi
-
  if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
  if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
-  AC_DEFINE(wxUSE_ARCHIVE_STREAMS)
+  if test "$wxUSE_STREAMS" != yes; then
+    AC_MSG_WARN(wxArchive requires wxStreams... disabled)
+    wxUSE_ARCHIVE_STREAMS=no
+  else
+    AC_DEFINE(wxUSE_ARCHIVE_STREAMS)
+  fi
  fi
  
  if test "$wxUSE_ZIPSTREAM" = "yes"; then
  fi
  
  if test "$wxUSE_ZIPSTREAM" = "yes"; then
@@ -5373,6 +5807,47 @@ if test "$wxUSE_ZIPSTREAM" = "yes"; then
    fi
  fi
  
    fi
  fi
  
+if test "$wxUSE_TARSTREAM" = "yes"; then
+  if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then
+    AC_MSG_WARN(wxTar requires wxArchive... disabled)
+  else
+    AC_DEFINE(wxUSE_TARSTREAM)
+  fi
+fi
+
+if test "$wxUSE_FILE_HISTORY" = "yes"; then
+  AC_DEFINE(wxUSE_FILE_HISTORY)
+fi
+
+if test "$wxUSE_FILESYSTEM" = "yes"; then
+  if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then
+    AC_MSG_WARN(wxFileSystem requires wxStreams and wxFile or wxFFile... disabled)
+    wxUSE_FILESYSTEM=no
+  else
+    AC_DEFINE(wxUSE_FILESYSTEM)
+  fi
+fi
+
+if test "$wxUSE_FS_ARCHIVE" = "yes"; then
+  if test "$wxUSE_FILESYSTEM" != yes -o "$wxUSE_ARCHIVE_STREAMS" != yes; then
+    AC_MSG_WARN(wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled)
+  else
+    AC_DEFINE(wxUSE_FS_ARCHIVE)
+  fi
+fi
+
+if test "$wxUSE_FS_ZIP" = "yes"; then
+  if test "$wxUSE_FS_ARCHIVE" != yes; then
+    AC_MSG_WARN(wxZipFSHandler requires wxArchiveFSHandler... disabled)
+  else
+    AC_DEFINE(wxUSE_FS_ZIP)
+  fi
+fi
+
+if test "$wxUSE_FSVOLUME" = "yes"; then
+  AC_DEFINE(wxUSE_FSVOLUME)
+fi
+
  if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
    if test "$USE_UNIX" != 1; then
      AC_MSG_WARN([Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called])
  if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
    if test "$USE_UNIX" != 1; then
      AC_MSG_WARN([Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called])
@@ -5387,7 +5862,7 @@ if test "$wxUSE_STACKWALKER" = "yes"; then
  fi
  
  if test "$wxUSE_DEBUGREPORT" = "yes"; then
  fi
  
  if test "$wxUSE_DEBUGREPORT" = "yes"; then
-    if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then
+    if test "$USE_UNIX" != 1 -a "$USE_WIN32" != 1; then
          AC_MSG_WARN([Creating debug reports not currently supported on this system, disabled])
          wxUSE_DEBUGREPORT=no
      else
          AC_MSG_WARN([Creating debug reports not currently supported on this system, disabled])
          wxUSE_DEBUGREPORT=no
      else
@@ -5406,6 +5881,24 @@ if test "$wxUSE_BUSYINFO" = "yes"; then
    AC_DEFINE(wxUSE_BUSYINFO)
  fi
  
    AC_DEFINE(wxUSE_BUSYINFO)
  fi
  
+if test "$wxUSE_HOTKEY" = "yes"; then
+  if test "$wxUSE_MSW" != 1 -a "$wxUSE_OSX_COCOA" != 1 -a "$wxUSE_OSX_CARBON" != 1; then
+    AC_MSG_WARN([Hot keys not supported by the current toolkit, disabled])
+    wxUSE_HOTKEY=no
+  fi
+elif test "$wxUSE_HOTKEY" = "auto"; then
+  if test "$wxUSE_MSW" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OSX_CARBON" = 1; then
+    wxUSE_HOTKEY=yes
+  fi
+fi
+if test "$wxUSE_HOTKEY" = "yes"; then
+  AC_DEFINE(wxUSE_HOTKEY)
+fi
+
+if test "$wxUSE_STD_CONTAINERS" = "yes"; then
+  AC_DEFINE(wxUSE_STD_CONTAINERS)
+fi
+
  if test "$wxUSE_STD_IOSTREAM" = "yes"; then
    AC_DEFINE(wxUSE_STD_IOSTREAM)
  fi
  if test "$wxUSE_STD_IOSTREAM" = "yes"; then
    AC_DEFINE(wxUSE_STD_IOSTREAM)
  fi
@@ -5414,6 +5907,10 @@ if test "$wxUSE_STD_STRING" = "yes"; then
    AC_DEFINE(wxUSE_STD_STRING)
  fi
  
    AC_DEFINE(wxUSE_STD_STRING)
  fi
  
+if test "$wxUSE_STD_STRING_CONV_IN_WXSTRING" = "yes"; then
+  AC_DEFINE(wxUSE_STD_STRING_CONV_IN_WXSTRING)
+fi
+
  if test "$wxUSE_STDPATHS" = "yes"; then
    AC_DEFINE(wxUSE_STDPATHS)
  fi
  if test "$wxUSE_STDPATHS" = "yes"; then
    AC_DEFINE(wxUSE_STDPATHS)
  fi
@@ -5450,6 +5947,13 @@ if test "$wxUSE_INTL" = "yes" ; then
    fi
  fi
  
    fi
  fi
  
+if test "$wxUSE_XLOCALE" = "yes" ; then
+    AC_DEFINE(wxUSE_XLOCALE)
+    AC_CHECK_TYPES(locale_t,,,
+                   [#include <xlocale.h>
+                    #include <locale.h>])
+fi
+
  if test "$wxUSE_LOG" = "yes"; then
    AC_DEFINE(wxUSE_LOG)
  
  if test "$wxUSE_LOG" = "yes"; then
    AC_DEFINE(wxUSE_LOG)
  
@@ -5477,46 +5981,98 @@ if test "$wxUSE_GEOMETRY" = "yes"; then
    AC_DEFINE(wxUSE_GEOMETRY)
  fi
  
    AC_DEFINE(wxUSE_GEOMETRY)
  fi
  
+if test "$wxUSE_BASE64" = "yes"; then
+  AC_DEFINE(wxUSE_BASE64)
+fi
+
  if test "$wxUSE_STREAMS" = "yes" ; then
    AC_DEFINE(wxUSE_STREAMS)
  fi
  
  if test "$wxUSE_STREAMS" = "yes" ; then
    AC_DEFINE(wxUSE_STREAMS)
  fi
  
+if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
+  AC_DEFINE(wxUSE_PRINTF_POS_PARAMS)
+fi
+
+if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then
+  AC_DEFINE(wxUSE_OBJC_UNIQUIFYING)
+fi
+
+dnl ---------------------------------------------------------------------------
+dnl console event loop stuff
+dnl ---------------------------------------------------------------------------
+
+if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then
+    AC_DEFINE(wxUSE_CONSOLE_EVENTLOOP)
+
+    if test "$wxUSE_UNIX" = "yes"; then
+        if test "$wxUSE_SELECT_DISPATCHER" = "yes"; then
+            AC_DEFINE(wxUSE_SELECT_DISPATCHER)
+        fi
+
+        if test "$wxUSE_EPOLL_DISPATCHER" = "yes"; then
+            AC_CHECK_HEADERS(sys/epoll.h,,, [AC_INCLUDES_DEFAULT()])
+            if test "$ac_cv_header_sys_epoll_h" = "yes"; then
+                AC_DEFINE(wxUSE_EPOLL_DISPATCHER)
+            else
+                AC_MSG_WARN([sys/epoll.h not available, wxEpollDispatcher disabled])
+            fi
+        fi
+    fi
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl time/date functions
  dnl ---------------------------------------------------------------------------
  
  dnl ---------------------------------------------------------------------------
  dnl time/date functions
  dnl ---------------------------------------------------------------------------
  
-if test "$wxUSE_DATETIME" = "yes"; then
-    dnl check for strptime and for its declaration as some systems lack it
-    AC_CHECK_FUNCS(strptime)
-    if test "$ac_cv_func_strptime" = "yes"; then
-        AC_CACHE_CHECK([for strptime declaration], wx_cv_func_strptime_decl,
+dnl check for gettimeofday (SVr4, BSD 4.3) and ftime (V7, BSD 4.3) for the
+dnl function to be used for high resolution timers
+AC_CHECK_FUNCS(gettimeofday ftime, break)
+
+if test "$ac_cv_func_gettimeofday" = "yes"; then
+    AC_CACHE_CHECK([whether gettimeofday takes two arguments],
+                   wx_cv_func_gettimeofday_has_2_args,
+    [
+        dnl on some _really_ old systems it takes only 1 argument
+        AC_TRY_COMPILE(
              [
              [
-                AC_LANG_SAVE
-                AC_LANG_CPLUSPLUS
-                AC_TRY_COMPILE(
-                    [
-                        #include <time.h>
-                    ],
-                    [
-                        struct tm t;
-                        strptime("foo", "bar", &t);
-                    ],
-                    wx_cv_func_strptime_decl=yes,
-                    wx_cv_func_strptime_decl=no
-                )
-                AC_LANG_RESTORE
-            ]
+                #include <sys/time.h>
+                #include <unistd.h>
+            ],
+            [
+                struct timeval tv;
+                gettimeofday(&tv, NULL);
+            ],
+            wx_cv_func_gettimeofday_has_2_args=yes,
+            AC_TRY_COMPILE(
+                [
+                    #include <sys/time.h>
+                    #include <unistd.h>
+                ],
+                [
+                    struct timeval tv;
+                    gettimeofday(&tv);
+                ],
+                wx_cv_func_gettimeofday_has_2_args=no,
+                [
+                    AC_MSG_WARN([failed to determine number of gettimeofday() arguments])
+                    wx_cv_func_gettimeofday_has_2_args=unknown
+                ]
+            )
          )
          )
+    ])
+
+    if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
+        AC_DEFINE(WX_GETTIMEOFDAY_NO_TZ)
      fi
      fi
-    if test "$wx_cv_func_strptime_decl" = "yes"; then
-        AC_DEFINE(HAVE_STRPTIME_DECL)
-    fi
+fi
  
  
+if test "$wxUSE_DATETIME" = "yes"; then
      dnl check for timezone variable
      dnl   doesn't exist under Darwin / Mac OS X which uses tm_gmtoff instead
      AC_CACHE_CHECK(for timezone variable in <time.h>,
                     wx_cv_var_timezone,
                     [
      dnl check for timezone variable
      dnl   doesn't exist under Darwin / Mac OS X which uses tm_gmtoff instead
      AC_CACHE_CHECK(for timezone variable in <time.h>,
                     wx_cv_var_timezone,
                     [
+                        AC_LANG_PUSH(C++)
                          AC_TRY_COMPILE(
                              [
                                  #include <time.h>
                          AC_TRY_COMPILE(
                              [
                                  #include <time.h>
@@ -5562,6 +6118,7 @@ if test "$wxUSE_DATETIME" = "yes"; then
                                  )
                              ]
                          )
                                  )
                              ]
                          )
+                        AC_LANG_POP()
                     ]
      )
  
                     ]
      )
  
@@ -5597,66 +6154,18 @@ if test "$wxUSE_DATETIME" = "yes"; then
          AC_DEFINE(WX_GMTOFF_IN_TM)
      fi
  
          AC_DEFINE(WX_GMTOFF_IN_TM)
      fi
  
-    dnl check for gettimeofday (SVr4, BSD 4.3) and ftime (V7, BSD 4.3) for the
-    dnl function to be used for high resolution timers
-    AC_CHECK_FUNCS(gettimeofday ftime, break)
-
-    if test "$ac_cv_func_gettimeofday" = "yes"; then
-        AC_CACHE_CHECK([whether gettimeofday takes two arguments],
-                       wx_cv_func_gettimeofday_has_2_args,
-        [
-            dnl on some _really_ old systems it takes only 1 argument
-            AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
-
-            AC_TRY_COMPILE(
-                [
-                    #include <sys/time.h>
-                    #include <unistd.h>
-                ],
-                [
-                    struct timeval tv;
-                    gettimeofday(&tv, NULL);
-                ],
-                wx_cv_func_gettimeofday_has_2_args=yes,
-                AC_TRY_COMPILE(
-                    [
-                        #include <sys/time.h>
-                        #include <unistd.h>
-                    ],
-                    [
-                        struct timeval tv;
-                        gettimeofday(&tv);
-                    ],
-                    wx_cv_func_gettimeofday_has_2_args=no,
-                    [
-                        AC_MSG_WARN([failed to determine number of gettimeofday() arguments])
-                        wx_cv_func_gettimeofday_has_2_args=unknown
-                    ]
-                )
-            )
-            AC_LANG_RESTORE
-        ])
-
-        if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
-            AC_DEFINE(WX_GETTIMEOFDAY_NO_TZ)
-        fi
-    fi
-
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
  fi
  
  dnl ------------------------------------------------------------------------
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
  fi
  
  dnl ------------------------------------------------------------------------
-dnl wxSocket
+dnl wxProcess
  dnl ------------------------------------------------------------------------
  
  dnl ------------------------------------------------------------------------
  
-dnl VZ: the GUI hooks wxSocket needs are not implemented yet in some toolkits
-if test "$wxUSE_SOCKETS" = "yes"; then
-    if test "$wxUSE_MGL" = "1"; then
-        AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
-        wxUSE_SOCKETS="no"
-    fi
-fi
+AC_CHECK_FUNCS(setpriority)
+
+dnl ------------------------------------------------------------------------
+dnl wxSocket
+dnl ------------------------------------------------------------------------
  
  if test "$wxUSE_SOCKETS" = "yes"; then
      dnl under MSW we always have sockets
  
  if test "$wxUSE_SOCKETS" = "yes"; then
      dnl under MSW we always have sockets
@@ -5687,10 +6196,10 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
          dnl This test needs to be done in C++ mode since gsocket.cpp now
          dnl is C++ code and pointer cast that are possible even without
          dnl warning in C still fail in C++.
          dnl This test needs to be done in C++ mode since gsocket.cpp now
          dnl is C++ code and pointer cast that are possible even without
          dnl warning in C still fail in C++.
-        AC_LANG_PUSH(C++)
          AC_CACHE_CHECK([what is the type of the third argument of getsockname],
                         wx_cv_type_getsockname3,
              [
          AC_CACHE_CHECK([what is the type of the third argument of getsockname],
                         wx_cv_type_getsockname3,
              [
+                AC_LANG_PUSH(C++)
                  AC_TRY_COMPILE(
                      [
                          #include <sys/types.h>
                  AC_TRY_COMPILE(
                      [
                          #include <sys/types.h>
@@ -5708,9 +6217,9 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                          dnl converting between incompatible pointer types, so
                          dnl try to use it to get the correct behaviour at
                          dnl least with gcc (otherwise we'd always use size_t)
                          dnl converting between incompatible pointer types, so
                          dnl try to use it to get the correct behaviour at
                          dnl least with gcc (otherwise we'd always use size_t)
-                        CXXFLAGS_OLD="$CXXFLAGS"
+                        CFLAGS_OLD="$CFLAGS"
                          if test "$GCC" = yes ; then
                          if test "$GCC" = yes ; then
-                            CXXFLAGS="$CXXFLAGS -Werror"
+                            CFLAGS="-Werror $CFLAGS"
                          fi
  
                          AC_TRY_COMPILE(
                          fi
  
                          AC_TRY_COMPILE(
@@ -5737,9 +6246,10 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                              )
                          )
  
                              )
                          )
  
-                        CXXFLAGS="$CXXFLAGS_OLD"
+                        CFLAGS="$CFLAGS_OLD"
                      ]
                  )
                      ]
                  )
+                AC_LANG_POP()
              ])
  
          if test "$wx_cv_type_getsockname3" = "unknown"; then
              ])
  
          if test "$wx_cv_type_getsockname3" = "unknown"; then
@@ -5752,6 +6262,12 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
          AC_CACHE_CHECK([what is the type of the fifth argument of getsockopt],
                         wx_cv_type_getsockopt5,
              [
          AC_CACHE_CHECK([what is the type of the fifth argument of getsockopt],
                         wx_cv_type_getsockopt5,
              [
+                dnl Note that the rules for compatibility of pointers
+                dnl are somewhat different between C and C++, so code
+                dnl that fails in C++ may not even give a warning about
+                dnl converting between incompatible pointer types in C.
+                dnl So this test needs to be done in C++ mode.
+                AC_LANG_PUSH(C++)
                  AC_TRY_COMPILE(
                      [
                          #include <sys/types.h>
                  AC_TRY_COMPILE(
                      [
                          #include <sys/types.h>
@@ -5763,17 +6279,6 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                      ],
                      wx_cv_type_getsockopt5=socklen_t,
                      [
                      ],
                      wx_cv_type_getsockopt5=socklen_t,
                      [
-                        dnl the compiler will compile the version with size_t
-                        dnl even if the real type of the last parameter is int
-                        dnl but it should give at least a warning about
-                        dnl converting between incompatible pointer types, so
-                        dnl try to use it to get the correct behaviour at
-                        dnl least with gcc (otherwise we'd always use size_t)
-                        CXXFLAGS_OLD="$CXXFLAGS"
-                        if test "$GCC" = yes ; then
-                            CXXFLAGS="$CXXFLAGS -Werror"
-                        fi
-
                          AC_TRY_COMPILE(
                              [
                                  #include <sys/types.h>
                          AC_TRY_COMPILE(
                              [
                                  #include <sys/types.h>
@@ -5797,10 +6302,9 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                                  wx_cv_type_getsockopt5=unknown
                              )
                          )
                                  wx_cv_type_getsockopt5=unknown
                              )
                          )
-
-                        CXXFLAGS="$CXXFLAGS_OLD"
                      ]
                  )
                      ]
                  )
+                AC_LANG_POP()
              ])
  
          if test "$wx_cv_type_getsockopt5" = "unknown"; then
              ])
  
          if test "$wx_cv_type_getsockopt5" = "unknown"; then
@@ -5809,11 +6313,37 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
          else
              AC_DEFINE_UNQUOTED(SOCKOPTLEN_T, $wx_cv_type_getsockopt5)
          fi
          else
              AC_DEFINE_UNQUOTED(SOCKOPTLEN_T, $wx_cv_type_getsockopt5)
          fi
-        AC_LANG_POP
      fi
  fi
  
  if test "$wxUSE_SOCKETS" = "yes" ; then
      fi
  fi
  
  if test "$wxUSE_SOCKETS" = "yes" ; then
+    if test "$wxUSE_IPV6" = "yes"; then
+        AC_CACHE_CHECK(
+            [whether we have sockaddr_in6],
+            [wx_cv_type_sockaddr_in6],
+            [
+                AC_TRY_COMPILE(
+                    [
+                        #include <sys/types.h>
+                        #include <sys/socket.h>
+                        #include <netinet/in.h>
+                    ],
+                    [
+                        struct sockaddr_in6 sa6;
+                    ],
+                    wx_cv_type_sockaddr_in6=yes,
+                    wx_cv_type_sockaddr_in6=no
+                )
+            ]
+        )
+
+        if test "$wx_cv_type_sockaddr_in6"="yes"; then
+            AC_DEFINE(wxUSE_IPV6)
+        else
+            AC_MSG_WARN([IPv6 support not available... disabled])
+        fi
+    fi
+
      AC_DEFINE(wxUSE_SOCKETS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
  fi
      AC_DEFINE(wxUSE_SOCKETS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
  fi
@@ -5854,6 +6384,10 @@ if test "$wxUSE_URL" = "yes"; then
      fi
  fi
  
      fi
  fi
  
+if test "$wxUSE_VARIANT" = "yes"; then
+    AC_DEFINE(wxUSE_VARIANT)
+fi
+
  if test "$wxUSE_FS_INET" = "yes"; then
    AC_DEFINE(wxUSE_FS_INET)
  fi
  if test "$wxUSE_FS_INET" = "yes"; then
    AC_DEFINE(wxUSE_FS_INET)
  fi
@@ -5870,7 +6404,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
          wxUSE_JOYSTICK=yes
  
      dnl mac only available on darwin
          wxUSE_JOYSTICK=yes
  
      dnl mac only available on darwin
-    elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
+    elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
          if test "$USE_DARWIN" = 1; then
              dnl check for a bug in the headers, some have bad setEventCallout
              AC_MSG_CHECKING([headers have declarations needed for joystick support])
          if test "$USE_DARWIN" = 1; then
              dnl check for a bug in the headers, some have bad setEventCallout
              AC_MSG_CHECKING([headers have declarations needed for joystick support])
@@ -5881,13 +6415,19 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
                                qi->setEventCallout(NULL, cb, NULL, NULL); ],
                              [ wxUSE_JOYSTICK=yes ]
                            )
                                qi->setEventCallout(NULL, cb, NULL, NULL); ],
                              [ wxUSE_JOYSTICK=yes ]
                            )
-            AC_LANG_POP
+            AC_LANG_POP()
              AC_MSG_RESULT($wxUSE_JOYSTICK)
          fi
  
      dnl joystick support is only for Linux 2.1.x or greater
      else
              AC_MSG_RESULT($wxUSE_JOYSTICK)
          fi
  
      dnl joystick support is only for Linux 2.1.x or greater
      else
-        AC_CHECK_HEADERS(linux/joystick.h, wxUSE_JOYSTICK=yes)
+        dnl notice the dummy includes argument: without it, AC_CHECK_HEADER
+        dnl checks only whether the header can be preprocessed, not that it
+        dnl can be compiled and in Linux 2.6.16 joystick.h is present but
+        dnl can't be compiled because of an error and with the default
+        dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
+        dnl build would fail later
+        AC_CHECK_HEADERS([linux/joystick.h], [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
      fi
  
      if test "$wxUSE_JOYSTICK" = "yes"; then
      fi
  
      if test "$wxUSE_JOYSTICK" = "yes"; then
@@ -5903,6 +6443,10 @@ dnl ---------------------------------------------------------------------------
  dnl String stuff
  dnl ---------------------------------------------------------------------------
  
  dnl String stuff
  dnl ---------------------------------------------------------------------------
  
+if test "$wxUSE_FONTENUM" = "yes" ; then
+  AC_DEFINE(wxUSE_FONTENUM)
+fi
+
  if test "$wxUSE_FONTMAP" = "yes" ; then
    AC_DEFINE(wxUSE_FONTMAP)
  fi
  if test "$wxUSE_FONTMAP" = "yes" ; then
    AC_DEFINE(wxUSE_FONTMAP)
  fi
@@ -5927,22 +6471,14 @@ if test "$wxUSE_UNICODE" = "yes" ; then
      fi
  fi
  
      fi
  fi
  
-if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
-  AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF)
-fi
-
-dnl ----------------------------------------------------------------
-dnl Register PostScript options for makefiles and setup.h
-dnl ----------------------------------------------------------------
+if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then
+    AC_DEFINE(wxUSE_UNICODE_UTF8)
  
  
-if test "$wxUSE_POSTSCRIPT" = "yes" ; then
-  AC_DEFINE(wxUSE_POSTSCRIPT)
+    if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then
+        AC_DEFINE(wxUSE_UTF8_LOCALE_ONLY)
+    fi
  fi
  
  fi
  
-AC_DEFINE(wxUSE_AFM_FOR_POSTSCRIPT)
-
-AC_DEFINE(wxUSE_NORMALIZED_PS_FONTS)
-
  dnl ---------------------------------------------------------------------------
  dnl big GUI components: MDI, doc/view, printing, help, ...
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl big GUI components: MDI, doc/view, printing, help, ...
  dnl ---------------------------------------------------------------------------
@@ -5964,9 +6500,6 @@ fi
  if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
      AC_DEFINE(wxUSE_DOC_VIEW_ARCHITECTURE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
  if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
      AC_DEFINE(wxUSE_DOC_VIEW_ARCHITECTURE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
-    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
-    fi
  fi
  
  if test "$wxUSE_HELP" = "yes"; then
  fi
  
  if test "$wxUSE_HELP" = "yes"; then
@@ -5990,20 +6523,22 @@ if test "$wxUSE_HELP" = "yes"; then
  fi
  
  if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
  fi
  
  if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-        AC_MSG_WARN(Printing support cannot be used without constraints so it won't be compiled without it)
-    else
-        AC_DEFINE(wxUSE_PRINTING_ARCHITECTURE)
-    fi
+    AC_DEFINE(wxUSE_PRINTING_ARCHITECTURE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
  fi
  
-if test "$wxUSE_PROLOGIO" = "yes" -o  "$wxUSE_RESOURCES" = "yes"; then
-    AC_MSG_ERROR([wxExpr and old-style resources are now available in contrib only])
+if test "$wxUSE_POSTSCRIPT" = "yes" ; then
+  AC_DEFINE(wxUSE_POSTSCRIPT)
+fi
+
+AC_DEFINE(wxUSE_AFM_FOR_POSTSCRIPT)
+
+if test "$wxUSE_SVG" = "yes"; then
+    AC_DEFINE(wxUSE_SVG)
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
-dnl wxMetafile availability
+dnl wxMetafile
  dnl ---------------------------------------------------------------------------
  
  if test "$wxUSE_METAFILE" = "yes"; then
  dnl ---------------------------------------------------------------------------
  
  if test "$wxUSE_METAFILE" = "yes"; then
@@ -6011,6 +6546,18 @@ if test "$wxUSE_METAFILE" = "yes"; then
          AC_MSG_WARN([wxMetafile is not available on this system... disabled])
          wxUSE_METAFILE=no
      fi
          AC_MSG_WARN([wxMetafile is not available on this system... disabled])
          wxUSE_METAFILE=no
      fi
+elif test "$wxUSE_METAFILE" = "auto"; then
+    if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then
+        wxUSE_METAFILE=yes
+    fi
+fi
+
+if test "$wxUSE_METAFILE" = "yes"; then
+    AC_DEFINE(wxUSE_METAFILE)
+    if test "$wxUSE_MSW" = 1; then
+        dnl this one should probably be made separately configurable
+        AC_DEFINE(wxUSE_ENH_METAFILE)
+    fi
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -6023,13 +6570,10 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
                            -o "$wxUSE_CLIPBOARD"     = "yes" \
                            -o "$wxUSE_OLE"     = "yes" \
                            -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
                            -o "$wxUSE_CLIPBOARD"     = "yes" \
                            -o "$wxUSE_OLE"     = "yes" \
                            -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
-    AC_CHECK_HEADERS(ole2.h)
+    AC_CHECK_HEADER(ole2.h,,, [ ])
  
      if test "$ac_cv_header_ole2_h" = "yes" ; then
          if test "$GCC" = yes ; then
  
      if test "$ac_cv_header_ole2_h" = "yes" ; then
          if test "$GCC" = yes ; then
-            AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
-
              AC_MSG_CHECKING([if g++ requires -fvtable-thunks])
              AC_TRY_COMPILE([#include <windows.h>
                              #include <ole2.h>],
              AC_MSG_CHECKING([if g++ requires -fvtable-thunks])
              AC_TRY_COMPILE([#include <windows.h>
                              #include <ole2.h>],
@@ -6037,10 +6581,11 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
                             [AC_MSG_RESULT(no)],
                             [AC_MSG_RESULT(yes)
                              WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fvtable-thunks"])
                             [AC_MSG_RESULT(no)],
                             [AC_MSG_RESULT(yes)
                              WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fvtable-thunks"])
-            AC_LANG_RESTORE
              LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
              if test "$wxUSE_OLE" = "yes" ; then
                  AC_DEFINE(wxUSE_OLE)
              LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
              if test "$wxUSE_OLE" = "yes" ; then
                  AC_DEFINE(wxUSE_OLE)
+                AC_DEFINE(wxUSE_OLE_AUTOMATION)
+                AC_DEFINE(wxUSE_ACTIVEX)
                  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
              fi
          fi
                  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
              fi
          fi
@@ -6057,13 +6602,6 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
          wxUSE_DATAOBJ=no
          wxUSE_OLE=no
      fi
          wxUSE_DATAOBJ=no
          wxUSE_OLE=no
      fi
-
-    if test "$wxUSE_METAFILE" = "yes"; then
-        AC_DEFINE(wxUSE_METAFILE)
-
-        dnl this one should probably be made separately configurable
-        AC_DEFINE(wxUSE_ENH_METAFILE)
-    fi
  fi
  
  if test "$wxUSE_IPC" = "yes"; then
  fi
  
  if test "$wxUSE_IPC" = "yes"; then
@@ -6079,12 +6617,7 @@ if test "$wxUSE_IPC" = "yes"; then
  fi
  
  if test "$wxUSE_DATAOBJ" = "yes"; then
  fi
  
  if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1; then
-        AC_MSG_WARN([wxDataObject not yet supported under MGL... disabled])
-        wxUSE_DATAOBJ=no
-    else
-        AC_DEFINE(wxUSE_DATAOBJ)
-    fi
+    AC_DEFINE(wxUSE_DATAOBJ)
  else
      AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
      wxUSE_CLIPBOARD=no
  else
      AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
      wxUSE_CLIPBOARD=no
@@ -6092,8 +6625,8 @@ else
  fi
  
  if test "$wxUSE_CLIPBOARD" = "yes"; then
  fi
  
  if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1; then
-        AC_MSG_WARN([Clipboard not yet supported under MGL... disabled])
+    if test "$wxUSE_DFB" = 1; then
+        AC_MSG_WARN([Clipboard not yet supported under $TOOLKIT... disabled])
          wxUSE_CLIPBOARD=no
      fi
  
          wxUSE_CLIPBOARD=no
      fi
  
@@ -6103,25 +6636,8 @@ if test "$wxUSE_CLIPBOARD" = "yes"; then
  fi
  
  if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
  fi
  
  if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
-    if test "$wxUSE_GTK" = 1; then
-        if test "$WXGTK12" != 1; then
-            AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2... disabled])
-            wxUSE_DRAG_AND_DROP=no
-        fi
-    fi
-
-    if test "$wxUSE_MOTIF" = 1; then
-        AC_MSG_WARN([Drag and drop not yet supported under Motif... disabled])
-        wxUSE_DRAG_AND_DROP=no
-    fi
-
-    if test "$wxUSE_X11" = 1; then
-        AC_MSG_WARN([Drag and drop not yet supported under X11... disabled])
-        wxUSE_DRAG_AND_DROP=no
-    fi
-
-    if test "$wxUSE_MGL" = 1; then
-        AC_MSG_WARN([Drag and drop not yet supported under MGL... disabled])
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
+        AC_MSG_WARN([Drag and drop not yet supported under $TOOLKIT... disabled])
          wxUSE_DRAG_AND_DROP=no
      fi
  
          wxUSE_DRAG_AND_DROP=no
      fi
  
@@ -6135,6 +6651,10 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" -o "$wxUSE_CLIPBOARD" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
  fi
  
+if test "$wxUSE_CLIPBOARD" = "yes"; then
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS clipboard"
+fi
+
  if test "$wxUSE_SPLINES" = "yes" ; then
    AC_DEFINE(wxUSE_SPLINES)
  fi
  if test "$wxUSE_SPLINES" = "yes" ; then
    AC_DEFINE(wxUSE_SPLINES)
  fi
@@ -6143,6 +6663,15 @@ if test "$wxUSE_MOUSEWHEEL" = "yes" ; then
    AC_DEFINE(wxUSE_MOUSEWHEEL)
  fi
  
    AC_DEFINE(wxUSE_MOUSEWHEEL)
  fi
  
+if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
+    AC_DEFINE(wxUSE_UIACTIONSIMULATOR)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction"
+fi
+
+if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then
+    AC_DEFINE(wxUSE_DC_TRANSFORM_MATRIX)
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl GUI controls
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl GUI controls
  dnl ---------------------------------------------------------------------------
@@ -6152,11 +6681,25 @@ if test "$wxUSE_CONTROLS" = "yes"; then
    USES_CONTROLS=1
  fi
  
    USES_CONTROLS=1
  fi
  
+if test "$wxUSE_MARKUP" = "yes"; then
+  AC_DEFINE(wxUSE_MARKUP)
+fi
+
  if test "$wxUSE_ACCEL" = "yes"; then
    AC_DEFINE(wxUSE_ACCEL)
    USES_CONTROLS=1
  fi
  
  if test "$wxUSE_ACCEL" = "yes"; then
    AC_DEFINE(wxUSE_ACCEL)
    USES_CONTROLS=1
  fi
  
+if test "$wxUSE_ANIMATIONCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_ANIMATIONCTRL)
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate"
+fi
+
+if test "$wxUSE_BANNERWINDOW" = "yes"; then
+  AC_DEFINE(wxUSE_BANNERWINDOW)
+fi
+
  if test "$wxUSE_BUTTON" = "yes"; then
    AC_DEFINE(wxUSE_BUTTON)
    USES_CONTROLS=1
  if test "$wxUSE_BUTTON" = "yes"; then
    AC_DEFINE(wxUSE_BUTTON)
    USES_CONTROLS=1
@@ -6179,11 +6722,27 @@ if test "$wxUSE_CARET" = "yes"; then
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
  fi
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
  fi
  
+if test "$wxUSE_COLLPANE" = "yes"; then
+    AC_DEFINE(wxUSE_COLLPANE)
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS collpane"
+fi
+
  if test "$wxUSE_COMBOBOX" = "yes"; then
    AC_DEFINE(wxUSE_COMBOBOX)
    USES_CONTROLS=1
  fi
  
  if test "$wxUSE_COMBOBOX" = "yes"; then
    AC_DEFINE(wxUSE_COMBOBOX)
    USES_CONTROLS=1
  fi
  
+if test "$wxUSE_COMBOCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_COMBOCTRL)
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_COMMANDLINKBUTTON" = "yes"; then
+  AC_DEFINE(wxUSE_COMMANDLINKBUTTON)
+  USES_CONTROLS=1
+fi
+
  if test "$wxUSE_CHOICE" = "yes"; then
    AC_DEFINE(wxUSE_CHOICE)
    USES_CONTROLS=1
  if test "$wxUSE_CHOICE" = "yes"; then
    AC_DEFINE(wxUSE_CHOICE)
    USES_CONTROLS=1
@@ -6202,7 +6761,11 @@ fi
  if test "$wxUSE_CHECKLST" = "yes"; then
    AC_DEFINE(wxUSE_CHECKLISTBOX)
    USES_CONTROLS=1
  if test "$wxUSE_CHECKLST" = "yes"; then
    AC_DEFINE(wxUSE_CHECKLISTBOX)
    USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
+fi
+
+if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_COLOURPICKERCTRL)
+  USES_CONTROLS=1
  fi
  
  if test "$wxUSE_DATEPICKCTRL" = "yes"; then
  fi
  
  if test "$wxUSE_DATEPICKCTRL" = "yes"; then
@@ -6210,9 +6773,38 @@ if test "$wxUSE_DATEPICKCTRL" = "yes"; then
    USES_CONTROLS=1
  fi
  
    USES_CONTROLS=1
  fi
  
+if test "$wxUSE_DIRPICKERCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_DIRPICKERCTRL)
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_FILECTRL" = "yes"; then
+  AC_DEFINE(wxUSE_FILECTRL)
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_FILEPICKERCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_FILEPICKERCTRL)
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_FONTPICKERCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_FONTPICKERCTRL)
+  USES_CONTROLS=1
+fi
+
  if test "$wxUSE_DISPLAY" = "yes"; then
  if test "$wxUSE_DISPLAY" = "yes"; then
-    AC_DEFINE(wxUSE_DISPLAY)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
+    if test "$wxUSE_DFB" = 1; then
+        AC_MSG_WARN([wxDisplay not yet supported under $TOOLKIT... disabled])
+        wxUSE_DISPLAY=no
+    else
+        AC_DEFINE(wxUSE_DISPLAY)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
+    fi
+fi
+
+if test "$wxUSE_DETECT_SM" = "yes"; then
+    AC_DEFINE(wxUSE_DETECT_SM)
  fi
  
  if test "$wxUSE_GAUGE" = "yes"; then
  fi
  
  if test "$wxUSE_GAUGE" = "yes"; then
@@ -6226,10 +6818,35 @@ if test "$wxUSE_GRID" = "yes"; then
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
  fi
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
  fi
  
+if test "$wxUSE_HEADERCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_HEADERCTRL)
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_HYPERLINKCTRL)
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BITMAPCOMBOBOX" = "yes"; then
+  AC_DEFINE(wxUSE_BITMAPCOMBOBOX)
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_DATAVIEWCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_DATAVIEWCTRL)
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dataview"
+fi
+
  if test "$wxUSE_IMAGLIST" = "yes"; then
      AC_DEFINE(wxUSE_IMAGLIST)
  fi
  
  if test "$wxUSE_IMAGLIST" = "yes"; then
      AC_DEFINE(wxUSE_IMAGLIST)
  fi
  
+if test "$wxUSE_INFOBAR" = "yes"; then
+    AC_DEFINE(wxUSE_INFOBAR)
+fi
+
  if test "$wxUSE_LISTBOOK" = "yes"; then
      AC_DEFINE(wxUSE_LISTBOOK)
      USES_CONTROLS=1
  if test "$wxUSE_LISTBOOK" = "yes"; then
      AC_DEFINE(wxUSE_LISTBOOK)
      USES_CONTROLS=1
@@ -6238,7 +6855,6 @@ fi
  if test "$wxUSE_LISTBOX" = "yes"; then
      AC_DEFINE(wxUSE_LISTBOX)
      USES_CONTROLS=1
  if test "$wxUSE_LISTBOX" = "yes"; then
      AC_DEFINE(wxUSE_LISTBOX)
      USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox"
  fi
  
  if test "$wxUSE_LISTCTRL" = "yes"; then
  fi
  
  if test "$wxUSE_LISTCTRL" = "yes"; then
@@ -6251,17 +6867,26 @@ if test "$wxUSE_LISTCTRL" = "yes"; then
      fi
  fi
  
      fi
  fi
  
+if test "$wxUSE_EDITABLELISTBOX" = "yes"; then
+    AC_DEFINE(wxUSE_EDITABLELISTBOX)
+    USES_CONTROLS=1
+fi
+
  if test "$wxUSE_NOTEBOOK" = "yes"; then
      AC_DEFINE(wxUSE_NOTEBOOK)
      USES_CONTROLS=1
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
  fi
  
  if test "$wxUSE_NOTEBOOK" = "yes"; then
      AC_DEFINE(wxUSE_NOTEBOOK)
      USES_CONTROLS=1
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
  fi
  
-dnl if test "$wxUSE_PROPSHEET" = "yes"; then
-dnl     AC_DEFINE(wxUSE_PROPSHEET)
-dnl     USES_CONTROLS=1
-dnl     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
-dnl fi
+if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes"; then
+    AC_DEFINE(wxUSE_NOTIFICATION_MESSAGE)
+fi
+
+if test "$wxUSE_ODCOMBOBOX" = "yes"; then
+  AC_DEFINE(wxUSE_ODCOMBOBOX)
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo"
+fi
  
  if test "$wxUSE_RADIOBOX" = "yes"; then
      AC_DEFINE(wxUSE_RADIOBOX)
  
  if test "$wxUSE_RADIOBOX" = "yes"; then
      AC_DEFINE(wxUSE_RADIOBOX)
@@ -6273,6 +6898,18 @@ if test "$wxUSE_RADIOBTN" = "yes"; then
      USES_CONTROLS=1
  fi
  
      USES_CONTROLS=1
  fi
  
+if test "$wxUSE_REARRANGECTRL" = "yes"; then
+    AC_DEFINE(wxUSE_REARRANGECTRL)
+fi
+
+if test "$wxUSE_RICHMSGDLG" = "yes"; then
+    AC_DEFINE(wxUSE_RICHMSGDLG)
+fi
+
+if test "$wxUSE_RICHTOOLTIP" = "yes"; then
+    AC_DEFINE(wxUSE_RICHTOOLTIP)
+fi
+
  if test "$wxUSE_SASH" = "yes"; then
      AC_DEFINE(wxUSE_SASH)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
  if test "$wxUSE_SASH" = "yes"; then
      AC_DEFINE(wxUSE_SASH)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
@@ -6281,7 +6918,12 @@ fi
  if test "$wxUSE_SCROLLBAR" = "yes"; then
      AC_DEFINE(wxUSE_SCROLLBAR)
      USES_CONTROLS=1
  if test "$wxUSE_SCROLLBAR" = "yes"; then
      AC_DEFINE(wxUSE_SCROLLBAR)
      USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll"
+fi
+
+if test "$wxUSE_SEARCHCTRL" = "yes"; then
+    AC_DEFINE(wxUSE_SEARCHCTRL)
+    USES_CONTROLS=1
  fi
  
  if test "$wxUSE_SLIDER" = "yes"; then
  fi
  
  if test "$wxUSE_SLIDER" = "yes"; then
@@ -6333,25 +6975,27 @@ if test "$wxUSE_STATUSBAR" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
  fi
  
-if test "$wxUSE_TABDIALOG" = "yes"; then
-    AC_DEFINE(wxUSE_TAB_DIALOG)
-fi
-
  if test "$wxUSE_TEXTCTRL" = "yes"; then
      AC_DEFINE(wxUSE_TEXTCTRL)
      USES_CONTROLS=1
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
  if test "$wxUSE_TEXTCTRL" = "yes"; then
      AC_DEFINE(wxUSE_TEXTCTRL)
      USES_CONTROLS=1
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+
+    dnl we don't have special switches to disable wxUSE_RICHEDIT[2], it doesn't
+    dnl seem useful to allow disabling them
+    AC_DEFINE(wxUSE_RICHEDIT)
+    AC_DEFINE(wxUSE_RICHEDIT2)
+fi
+
+if test "$wxUSE_TIMEPICKCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_TIMEPICKCTRL)
+  USES_CONTROLS=1
  fi
  
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
  fi
  
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
-    if test "$wxUSE_COCOA" = 1 ; then
+    if test "$wxUSE_OLD_COCOA" = 1 ; then
          AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
          wxUSE_TOGGLEBTN=no
      fi
          AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
          wxUSE_TOGGLEBTN=no
      fi
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled])
-        wxUSE_TOGGLEBTN=no
-    fi
  
      if test "$wxUSE_TOGGLEBTN" = "yes"; then
          AC_DEFINE(wxUSE_TOGGLEBTN)
  
      if test "$wxUSE_TOGGLEBTN" = "yes"; then
          AC_DEFINE(wxUSE_TOGGLEBTN)
@@ -6359,24 +7003,15 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
      fi
  fi
  
      fi
  fi
  
-if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
-    AC_DEFINE(wxUSE_TOOLBAR_SIMPLE)
-    wxUSE_TOOLBAR="yes"
-    USES_CONTROLS=1
-fi
-
  if test "$wxUSE_TOOLBAR" = "yes"; then
      AC_DEFINE(wxUSE_TOOLBAR)
      USES_CONTROLS=1
  
  if test "$wxUSE_TOOLBAR" = "yes"; then
      AC_DEFINE(wxUSE_TOOLBAR)
      USES_CONTROLS=1
  
-    dnl if wxUSE_TOOLBAR and !wxUSE_TOOLBAR_SIMPLE => wxUSE_TOOLBAR_NATIVE
-    if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        wxUSE_TOOLBAR_NATIVE="no"
+    else
          wxUSE_TOOLBAR_NATIVE="yes"
          wxUSE_TOOLBAR_NATIVE="yes"
-    fi
-
-    if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
          AC_DEFINE(wxUSE_TOOLBAR_NATIVE)
          AC_DEFINE(wxUSE_TOOLBAR_NATIVE)
-        USES_CONTROLS=1
      fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
      fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
@@ -6399,6 +7034,11 @@ if test "$wxUSE_TREEBOOK" = "yes"; then
      USES_CONTROLS=1
  fi
  
      USES_CONTROLS=1
  fi
  
+if test "$wxUSE_TOOLBOOK" = "yes"; then
+    AC_DEFINE(wxUSE_TOOLBOOK)
+    USES_CONTROLS=1
+fi
+
  if test "$wxUSE_TREECTRL" = "yes"; then
      if test "$wxUSE_IMAGLIST" = "yes"; then
          AC_DEFINE(wxUSE_TREECTRL)
  if test "$wxUSE_TREECTRL" = "yes"; then
      if test "$wxUSE_IMAGLIST" = "yes"; then
          AC_DEFINE(wxUSE_TREECTRL)
@@ -6409,8 +7049,14 @@ if test "$wxUSE_TREECTRL" = "yes"; then
      fi
  fi
  
      fi
  fi
  
+if test "$wxUSE_TREELISTCTRL" = "yes"; then
+    AC_DEFINE(wxUSE_TREELISTCTRL)
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelist"
+fi
+
  if test "$wxUSE_POPUPWIN" = "yes"; then
  if test "$wxUSE_POPUPWIN" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
+    if test "$wxUSE_OLD_COCOA" = 1 ; then
          AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
      else
          if test "$wxUSE_PM" = 1; then
          AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
      else
          if test "$wxUSE_PM" = 1; then
@@ -6425,8 +7071,8 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
  fi
  
  if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
  fi
  
  if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
-        AC_MSG_WARN([Dialup manager not yet supported under Mac OS X... disabled])
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
+        AC_MSG_WARN([Dialup manager not supported on this platform... disabled])
      else
          AC_DEFINE(wxUSE_DIALUP_MANAGER)
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
      else
          AC_DEFINE(wxUSE_DIALUP_MANAGER)
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
@@ -6455,8 +7101,25 @@ if test "$wxUSE_ACCESSIBILITY" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
  fi
  
-if test "$wxUSE_DC_CACHEING" = "yes"; then
-    AC_DEFINE(wxUSE_DC_CACHEING)
+if test "$wxUSE_ARTPROVIDER_STD" = "yes"; then
+    AC_DEFINE(wxUSE_ARTPROVIDER_STD)
+fi
+
+if test "$wxUSE_ARTPROVIDER_TANGO" = "auto"; then
+    dnl Tango-based art provider is not needed in GTK-based ports as the
+    dnl native art provider completely replaces it.
+    if test "$wxUSE_GTK" != 1; then
+        dnl It also requires support for memory-mapped PNG images.
+        if test "$wxUSE_LIBPNG" != no -a \
+                "$wxUSE_IMAGE" = yes -a \
+                "$wxUSE_STREAMS" = yes; then
+            wxUSE_ARTPROVIDER_TANGO="yes"
+        fi
+    fi
+fi
+
+if test "$wxUSE_ARTPROVIDER_TANGO" = "yes"; then
+    AC_DEFINE(wxUSE_ARTPROVIDER_TANGO)
  fi
  
  if test "$wxUSE_DRAGIMAGE" = "yes"; then
  fi
  
  if test "$wxUSE_DRAGIMAGE" = "yes"; then
@@ -6478,14 +7141,11 @@ if test "$wxUSE_HTML" = "yes"; then
      AC_DEFINE(wxUSE_HTML)
      USE_HTML=1
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
      AC_DEFINE(wxUSE_HTML)
      USE_HTML=1
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
-    if test "$wxUSE_MAC" = 1; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
-    fi
  fi
  if test "$wxUSE_WEBKIT" = "yes"; then
      if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
          old_CPPFLAGS="$CPPFLAGS"
  fi
  if test "$wxUSE_WEBKIT" = "yes"; then
      if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
          old_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS -x objective-c++"
+        CPPFLAGS="-x objective-c++ $CPPFLAGS"
          AC_CHECK_HEADER([WebKit/HIWebView.h],
                          [
                             AC_DEFINE(wxUSE_WEBKIT)
          AC_CHECK_HEADER([WebKit/HIWebView.h],
                          [
                             AC_DEFINE(wxUSE_WEBKIT)
@@ -6495,13 +7155,19 @@ if test "$wxUSE_WEBKIT" = "yes"; then
                             AC_MSG_WARN([WebKit headers not found; disabling wxWebKit])
                             wxUSE_WEBKIT=no
                          ],
                             AC_MSG_WARN([WebKit headers not found; disabling wxWebKit])
                             wxUSE_WEBKIT=no
                          ],
-                        [#include <Carbon/Carbon.h>])
+                        [
+                           #include <Carbon/Carbon.h>
+                           #include <WebKit/WebKit.h>
+                        ])
          CPPFLAGS="$old_CPPFLAGS"
          CPPFLAGS="$old_CPPFLAGS"
-    elif test "$wxUSE_COCOA" = 1; then
+    elif test "$wxUSE_OLD_COCOA" = 1; then
          AC_DEFINE(wxUSE_WEBKIT)
      else
          wxUSE_WEBKIT=no
      fi
          AC_DEFINE(wxUSE_WEBKIT)
      else
          wxUSE_WEBKIT=no
      fi
+    if test "$wxUSE_WEBKIT" = "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
+    fi
  fi
  
  USE_XRC=0
  fi
  
  USE_XRC=0
@@ -6516,30 +7182,65 @@ if test "$wxUSE_XRC" = "yes"; then
      fi
  fi
  
      fi
  fi
  
+USE_AUI=0
+if test "$wxUSE_AUI" = "yes"; then
+   AC_DEFINE(wxUSE_AUI)
+   USE_AUI=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui"
+fi
+
+USE_PROPGRID=0
+if test "$wxUSE_PROPGRID" = "yes"; then
+   AC_DEFINE(wxUSE_PROPGRID)
+   USE_PROPGRID=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
+fi
+
+USE_RIBBON=0
+if test "$wxUSE_RIBBON" = "yes"; then
+   AC_DEFINE(wxUSE_RIBBON)
+   USE_RIBBON=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon"
+fi
+
+USE_STC=0
+if test "$wxUSE_STC" = "yes"; then
+   AC_DEFINE(wxUSE_STC)
+   USE_STC=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
+
+   dnl python is used to update src/stc.h (see build/bakefiles/scintilla.bkl)
+   AC_PATH_PROG(PYTHON, python)
+   if test "x$PYTHON" = "x"; then
+     COND_PYTHON="#"
+   fi
+   AC_SUBST(COND_PYTHON)
+fi
+
  if test "$wxUSE_MENUS" = "yes"; then
      AC_DEFINE(wxUSE_MENUS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
  fi
  
  if test "$wxUSE_MENUS" = "yes"; then
      AC_DEFINE(wxUSE_MENUS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
  fi
  
-if test "$wxUSE_METAFILE" = "yes"; then
-    AC_DEFINE(wxUSE_METAFILE)
-fi
-
  if test "$wxUSE_MIMETYPE" = "yes"; then
      AC_DEFINE(wxUSE_MIMETYPE)
  fi
  
  if test "$wxUSE_MINIFRAME" = "yes"; then
      AC_DEFINE(wxUSE_MINIFRAME)
  if test "$wxUSE_MIMETYPE" = "yes"; then
      AC_DEFINE(wxUSE_MIMETYPE)
  fi
  
  if test "$wxUSE_MINIFRAME" = "yes"; then
      AC_DEFINE(wxUSE_MINIFRAME)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
  fi
  
  if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
      AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
  fi
  
  if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
      AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
-    if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
-        "$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-    fi
+fi
+
+if test "$wxUSE_TASKBARICON" = "yes"; then
+    AC_DEFINE(wxUSE_TASKBARICON)
+    dnl This is used under MSW, just enable it always without testing for the
+    dnl toolkit nor providing a separate option for it because it's totally
+    dnl harmless to have it defined even if it's unnecessary.
+    AC_DEFINE(wxUSE_TASKBARICON_BALLOONS)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
  fi
  
  
  fi
  
  
@@ -6549,7 +7250,12 @@ if test "$wxUSE_VALIDATORS" = "yes"; then
  fi
  
  if test "$wxUSE_PALETTE" = "yes" ; then
  fi
  
  if test "$wxUSE_PALETTE" = "yes" ; then
-  AC_DEFINE(wxUSE_PALETTE)
+    if test "$wxUSE_DFB" = 1; then
+        AC_MSG_WARN([wxPalette not yet supported under DFB... disabled])
+        wxUSE_PALETTE=no
+    else
+        AC_DEFINE(wxUSE_PALETTE)
+    fi
  fi
  
  if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
  fi
  
  if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
@@ -6564,6 +7270,71 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
  fi
  
+if test "$wxUSE_WEBVIEW" = "yes"; then
+    USE_WEBVIEW_WEBKIT=0
+    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then
+        if test "$wxUSE_GTK" = 1; then
+            webkitgtk=webkit-1.0
+            if test "$WXGTK3" = 1; then
+                webkitgtk=webkitgtk-3.0
+            fi
+            PKG_CHECK_MODULES([WEBKIT],
+                              [$webkitgtk >= 1.3.1],
+                              [
+                                USE_WEBVIEW_WEBKIT=1
+                                CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+                                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS"
+                              ],
+                              [
+                                AC_MSG_WARN([webkitgtk not found.])
+                              ])
+        elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+            dnl Under Mac we always have the libraries but check for the
+            dnl headers
+            old_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="-x objective-c++ $CPPFLAGS"
+            AC_CHECK_HEADER([WebKit/HIWebView.h],
+                            [
+                                USE_WEBVIEW_WEBKIT=1
+                                WEBKIT_LINK="-framework WebKit"
+                            ],
+                            [
+                                AC_MSG_WARN([WebKit headers not found])
+                            ],
+                            [
+                                #include <Carbon/Carbon.h>
+                                #include <WebKit/WebKit.h>
+                            ])
+            CPPFLAGS="$old_CPPFLAGS"
+        fi
+    fi
+
+    wxUSE_WEBVIEW="no"
+    if test "$wxUSE_GTK" = 1 -o "$wxUSE_MAC" = 1; then
+        if test "$USE_WEBVIEW_WEBKIT" = 1; then
+            wxUSE_WEBVIEW="yes"
+            AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
+        else
+            AC_MSG_WARN([WebKit not available, disabling wxWebView])
+        fi
+    elif test "$wxUSE_MSW" = 1; then
+        if test "$wxUSE_WEBVIEW_IE" = "yes"; then
+            dnl TODO: Check for the required headers/libraries under Windows
+            dnl       too and do the right thing automatically there too.
+            wxUSE_WEBVIEW="yes"
+            AC_DEFINE(wxUSE_WEBVIEW_IE)
+        fi
+    fi
+fi
+
+if test "$wxUSE_WEBVIEW" = "yes"; then
+    USE_WEBVIEW=1
+    AC_DEFINE(wxUSE_WEBVIEW)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
+else
+    USE_WEBVIEW=0
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl wxImage options
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl wxImage options
  dnl ---------------------------------------------------------------------------
@@ -6579,6 +7350,10 @@ if test "$wxUSE_IMAGE" = "yes" ; then
        AC_DEFINE(wxUSE_PCX)
      fi
  
        AC_DEFINE(wxUSE_PCX)
      fi
  
+    if test "$wxUSE_TGA" = "yes" ; then
+      AC_DEFINE(wxUSE_TGA)
+    fi
+
      if test "$wxUSE_IFF" = "yes" ; then
        AC_DEFINE(wxUSE_IFF)
      fi
      if test "$wxUSE_IFF" = "yes" ; then
        AC_DEFINE(wxUSE_IFF)
      fi
@@ -6600,6 +7375,10 @@ dnl ---------------------------------------------------------------------------
  dnl common dialogs
  dnl ---------------------------------------------------------------------------
  
  dnl common dialogs
  dnl ---------------------------------------------------------------------------
  
+if test "$wxUSE_ABOUTDLG" = "yes"; then
+    AC_DEFINE(wxUSE_ABOUTDLG)
+fi
+
  if test "$wxUSE_CHOICEDLG" = "yes"; then
      AC_DEFINE(wxUSE_CHOICEDLG)
  fi
  if test "$wxUSE_CHOICEDLG" = "yes"; then
      AC_DEFINE(wxUSE_CHOICEDLG)
  fi
@@ -6637,11 +7416,7 @@ if test "$wxUSE_NUMBERDLG" = "yes"; then
  fi
  
  if test "$wxUSE_PROGRESSDLG" = "yes"; then
  fi
  
  if test "$wxUSE_PROGRESSDLG" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       AC_MSG_WARN(wxProgressDialog requires constraints so it won't be compiled without them)
-    else
-        AC_DEFINE(wxUSE_PROGRESSDLG)
-    fi
+    AC_DEFINE(wxUSE_PROGRESSDLG)
  fi
  
  if test "$wxUSE_SPLASH" = "yes"; then
  fi
  
  if test "$wxUSE_SPLASH" = "yes"; then
@@ -6650,11 +7425,7 @@ if test "$wxUSE_SPLASH" = "yes"; then
  fi
  
  if test "$wxUSE_STARTUP_TIPS" = "yes"; then
  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)
-    else
-        AC_DEFINE(wxUSE_STARTUP_TIPS)
-    fi
+    AC_DEFINE(wxUSE_STARTUP_TIPS)
  fi
  
  if test "$wxUSE_TEXTDLG" = "yes"; then
  fi
  
  if test "$wxUSE_TEXTDLG" = "yes"; then
@@ -6667,97 +7438,216 @@ if test "$wxUSE_WIZARDDLG" = "yes"; then
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
-dnl wxMediaCtrl
+dnl options used under wxMSW and wxPM
  dnl ---------------------------------------------------------------------------
  
  dnl ---------------------------------------------------------------------------
  
-if test "$wxUSE_MEDIACTRL" = "yes"; then
-    dnl -----------------------------------------------------------------------
-    dnl GStreamer
-    dnl -----------------------------------------------------------------------
-    if test "$wxUSE_GTK" = 1; then
-        wxUSE_GSTREAMER="yes"
+if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then
+    if test "$wxUSE_OWNER_DRAWN" = "yes"; then
+        AC_DEFINE(wxUSE_OWNER_DRAWN)
+    fi
+fi
  
  
-        dnl -------------------------------------------------------------------
-        dnl Test for gstreamer module from pkg-config
-        dnl -------------------------------------------------------------------
-        PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.8,
-        [
-            CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS"
-            LIBS="$LIBS $GSTREAMER_LIBS -lgstplay-0.8"
-        ],
-        [
-            AC_MSG_WARN([GStreamer installation not found])
-            wxUSE_GSTREAMER="no"
-        ])
+dnl ---------------------------------------------------------------------------
+dnl wxMSW-only options
+dnl ---------------------------------------------------------------------------
+
+if test "$wxUSE_MSW" = 1 ; then
+
+    if test "$wxUSE_DC_CACHEING" = "yes"; then
+        AC_DEFINE(wxUSE_DC_CACHEING)
+    fi
+
+    if test "$wxUSE_DIB" = "yes"; then
+        AC_DEFINE(wxUSE_WXDIB)
+    fi
+
+    if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
+        AC_DEFINE(wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+    fi
+
+    if test "$wxUSE_UXTHEME" = "yes"; then
+        AC_DEFINE(wxUSE_UXTHEME)
+    fi
+
+fi
+dnl wxUSE_MSW = 1
+
+dnl not quite MSW-only although mostly useful to disable this under MSW
+if test "$wxUSE_AUTOID_MANAGEMENT" = "yes"; then
+    AC_DEFINE(wxUSE_AUTOID_MANAGEMENT)
+fi
+
+if test "$USE_WIN32" = 1 ; then
+    if test "$wxUSE_INICONF" = "yes"; then
+        AC_DEFINE(wxUSE_INICONF)
+    fi
+
+    if test "$wxUSE_REGKEY" = "yes"; then
+        AC_DEFINE(wxUSE_REGKEY)
+    fi
+fi
+dnl USE_WIN32 = 1
+
+dnl ---------------------------------------------------------------------------
+dnl wxGraphicsContext
+dnl ---------------------------------------------------------------------------
+
+dnl Under Mac we don't even provide --enable-graphics_ctx switch as we always
+dnl need it -- but because we don't have the option, wxUSE_GRAPHICS_CONTEXT is
+dnl not defined automatically and we need to do it ourselves
+if test "$wxUSE_MAC" = 1; then
+    wxUSE_GRAPHICS_CONTEXT="yes"
+fi
+
+if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
+    wx_has_graphics=0
+    if test "$wxUSE_MSW" = 1; then
+        AC_CACHE_CHECK([if GDI+ is available], wx_cv_lib_gdiplus,
+            [
+                dnl we need just the header, not the library, as we load the
+                dnl GDI+ DLL dynamically anyhow during run-time
+                AC_LANG_PUSH(C++)
+                AC_TRY_COMPILE(
+                    [#include <windows.h>
+                     #include <gdiplus.h>],
+                    [
+                        using namespace Gdiplus;
+                    ],
+                    wx_cv_lib_gdiplus=yes,
+                    wx_cv_lib_gdiplus=no
+                )
+                AC_LANG_POP()
+            ]
+        )
+        if test "$wx_cv_lib_gdiplus" = "yes"; then
+            wx_has_graphics=1
+        fi
+    elif test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
+        PKG_CHECK_MODULES(CAIRO, cairo,
+            [wx_has_graphics=1],
+            [AC_MSG_WARN([Cairo library not found])]
+        )
+        if test "$wx_has_graphics" = 1; then
+            dnl Check that Cairo library is new enough: wxGraphicsContext
+            dnl won't compile without cairo_push_group() and
+            dnl cairo_pop_group_to_source() which are new in 1.2.
+            save_LIBS="$LIBS"
+            LIBS="$LIBS $CAIRO_LIBS"
+            AC_CHECK_FUNCS([cairo_push_group])
+            LIBS="$save_LIBS"
+            if test "$ac_cv_func_cairo_push_group" = "no"; then
+                wx_has_graphics=0
+                AC_MSG_WARN([Cairo library is too old and misses cairo_push_group()])
+            else
+                AC_DEFINE(wxUSE_CAIRO)
+
+                dnl We don't need to do this for wxGTK as we already get Cairo
+                dnl flags as part of GTK+ ones.
+                if test "$wxUSE_GTK" != 1; then
+                    CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS"
+                fi
+            fi
+        fi
+    else
+        dnl assume it's ok, add more checks here if needed
+        wx_has_graphics=1
+    fi
+
+    if test "$wx_has_graphics" = 1; then
+        AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
+    else
+        AC_MSG_WARN([wxGraphicsContext won't be available])
+    fi
+fi
+
+dnl ---------------------------------------------------------------------------
+dnl wxMediaCtrl
+dnl ---------------------------------------------------------------------------
+
+USE_MEDIA=0
+
+if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
+    USE_MEDIA=1
+
+    dnl -----------------------------------------------------------------------
+    dnl GStreamer
+    dnl -----------------------------------------------------------------------
+    if test "$wxUSE_GTK" = 1; then
+        wxUSE_GSTREAMER="no"
  
          dnl -------------------------------------------------------------------
  
          dnl -------------------------------------------------------------------
-        dnl Perform a check for a GStreamer element using gst-inspect
-        dnl Thomas Vander Stichele <thomas at apestaart dot org>
-        dnl Last modification: 25/01/2005
+        dnl Test for at least 0.8 gstreamer module from pkg-config
+        dnl Even totem doesn't accept 0.9 evidently.
          dnl
          dnl
-        dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+        dnl So, we first check to see if 0.10 if available - if not we
+        dnl try the older 0.8 version
          dnl -------------------------------------------------------------------
          dnl -------------------------------------------------------------------
-        AC_DEFUN([AM_GST_ELEMENT_CHECK],
-        [
-        if test "x$GST_INSPECT" == "x"; then
-            AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
-        fi
+        GST_VERSION_MAJOR=0
+        GST_VERSION_MINOR=10
+        GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
  
  
-        if test "x$GST_INSPECT" != "x"; then
-            AC_MSG_CHECKING(GStreamer element $1)
-            if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
-            AC_MSG_RESULT(found.)
-            $2
-            else
-            AC_MSG_RESULT(not found.)
-            $3
-            fi
+        if test "$wxUSE_GSTREAMER8" = "no"; then
+            PKG_CHECK_MODULES(GST,
+                [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION],
+                [
+                    wxUSE_GSTREAMER="yes"
+                    GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"
+                ],
+                [
+                    AC_MSG_WARN([GStreamer 0.10 not available, falling back to 0.8])
+                    GST_VERSION_MINOR=8
+                ]
+            )
+        else
+            dnl check only for 0.8
+            GST_VERSION_MINOR=8
          fi
          fi
-        ])
  
  
-        dnl -------------------------------------------------------------------
-        dnl Test for x video sink (video useless without)
-        dnl -------------------------------------------------------------------
-        AM_GST_ELEMENT_CHECK(xvimagesink,[],
-                        [
-                            wxUSE_GSTREAMER="no"
-                            AC_MSG_WARN([x video sink not found - cannot use GStreamer])
-                        ])
+        if test $GST_VERSION_MINOR = "8"; then
+            GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
+            PKG_CHECK_MODULES(GST,
+                [gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION],
+                wxUSE_GSTREAMER="yes",
+                [
+                    AC_MSG_WARN([GStreamer 0.8/0.10 not available.])
+                ])
+        fi
  
  
-        dnl -------------------------------------------------------------------
-        dnl Check for gstplay-0.8 lib and corresponding x overlay header
-        dnl -------------------------------------------------------------------
-        AC_CHECK_HEADER(gst/xoverlay/xoverlay.h, [],
-                        [
-                            wxUSE_GSTREAMER="no"
-                            AC_MSG_WARN([xoverlay header not found, cannot use GStreamer])
-                        ],
-                        [#include <gst/gst.h>])
  
  
-        AC_MSG_CHECKING([for gstplay 0.8])
-        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],gstplay-0.8)
+        if test "$wxUSE_GSTREAMER" = "yes"; then
+            CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
+            EXTRALIBS_MEDIA="$GST_LIBS"
  
  
-        if test "$ac_find_libraries" = "" ; then
-            AC_MSG_RESULT([no])
-            wxUSE_GSTREAMER="no"
+            AC_DEFINE(wxUSE_GSTREAMER)
          else
          else
-            AC_MSG_RESULT([yes])
+            USE_MEDIA=0
          fi
  
          fi
  
-        if test "$wxUSE_GSTREAMER" = "yes"; then
-            AC_DEFINE(wxUSE_GSTREAMER)
-            AC_MSG_RESULT([GStreamer detection successful])
+    elif test "$wxUSE_MAC" = 1; then 
+         dnl We always have the necessary libraries under Mac 
+         dnl but we need to link with it explicitly.
+         GST_LIBS="-framework QTKit"
+    fi
+
+    if test $USE_MEDIA = 1; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
+        AC_DEFINE(wxUSE_MEDIACTRL)
+    else
+        if test "$wxUSE_MEDIACTRL" = "yes"; then
+            AC_MSG_ERROR([GStreamer not available])
+        else
+            dnl was set to 'auto'
+            AC_MSG_WARN([GStreamer not available... disabling wxMediaCtrl])
          fi
      fi
          fi
      fi
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
-    AC_DEFINE(wxUSE_MEDIACTRL)
  fi
  
  dnl ---------------------------------------------------------------------------
  dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
  dnl ---------------------------------------------------------------------------
  
  fi
  
  dnl ---------------------------------------------------------------------------
  dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
  dnl ---------------------------------------------------------------------------
  
-if test "$cross_compiling" = "yes"; then
+if test "$cross_compiling" != "no"; then
      dnl Use best guess from host as we can't use uname when cross compiling
      OSINFO="\"$host\""
  else
      dnl Use best guess from host as we can't use uname when cross compiling
      OSINFO="\"$host\""
  else
@@ -6785,114 +7675,130 @@ dnl ---------------------------------------------------------------------------
  dnl define variables with all built libraries for wx-config
  dnl ---------------------------------------------------------------------------
  
  dnl define variables with all built libraries for wx-config
  dnl ---------------------------------------------------------------------------
  
-CORE_BASE_LIBS="net base"
-CORE_GUI_LIBS="adv core"
+STD_BASE_LIBS="base"
+STD_GUI_LIBS=""
+BUILT_WX_LIBS="base"
+ALL_WX_LIBS="xrc stc gl media qa html adv core xml net base"
  
  
-if test "$wxUSE_XML" = "yes" ; then
-    CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
-fi
-if test "$wxUSE_ODBC" != "no" ; then
-    CORE_BASE_LIBS="odbc $CORE_BASE_LIBS"
-    CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS"
-fi
-if test "$wxUSE_HTML" = "yes" ; then
-    CORE_GUI_LIBS="html $CORE_GUI_LIBS"
-fi
-if test "$wxUSE_DEBUGREPORT" = "yes" ; then
-    CORE_GUI_LIBS="qa $CORE_GUI_LIBS"
+if test "$wxUSE_SOCKETS" = "yes" ; then
+    STD_BASE_LIBS="net $STD_BASE_LIBS"
+    BUILT_WX_LIBS="net $BUILT_WX_LIBS"
  fi
  fi
-if test "$wxUSE_XRC" = "yes" ; then
-    CORE_GUI_LIBS="xrc $CORE_GUI_LIBS"
+if test "$wxUSE_XML" = "yes" ; then
+    STD_BASE_LIBS="xml $STD_BASE_LIBS"
+    BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
  fi
  
  fi
  
-if test "$wxUSE_GUI" != "yes"; then
-    CORE_GUI_LIBS=""
-fi
+if test "$wxUSE_GUI" = "yes"; then
+    STD_GUI_LIBS="adv core"
+    BUILT_WX_LIBS="$STD_GUI_LIBS $BUILT_WX_LIBS"
  
  
-AC_SUBST(CORE_BASE_LIBS)
-AC_SUBST(CORE_GUI_LIBS)
+    if test "$wxUSE_DEBUGREPORT" = "yes" ; then
+        STD_GUI_LIBS="qa $STD_GUI_LIBS"
+        BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_HTML" = "yes" ; then
+        STD_GUI_LIBS="html $STD_GUI_LIBS"
+        BUILT_WX_LIBS="html $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_MEDIACTRL" = "yes" ; then
+        BUILT_WX_LIBS="media $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_OPENGL" = "yes" ; then
+        BUILT_WX_LIBS="gl $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_AUI" = "yes" ; then
+        BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_PROPGRID" = "yes" ; then
+        BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_RIBBON" = "yes" ; then
+        BUILT_WX_LIBS="ribbon $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_RICHTEXT" = "yes" ; then
+        BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_STC" = "yes" ; then
+        BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_WEBVIEW" = "yes" ; then
+        STD_GUI_LIBS="webview $STD_GUI_LIBS"
+        BUILT_WX_LIBS="webview $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_XRC" = "yes" ; then
+        STD_GUI_LIBS="xrc $STD_GUI_LIBS"
+        BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"
+    fi
+fi
  
  
+AC_SUBST(ALL_WX_LIBS)
+AC_SUBST(BUILT_WX_LIBS)
+AC_SUBST(STD_BASE_LIBS)
+AC_SUBST(STD_GUI_LIBS)
  
  dnl ---------------------------------------------------------------------------
  dnl Output the makefiles and such from the results found above
  dnl ---------------------------------------------------------------------------
  
  dnl all additional libraries (except wxWidgets itself) we link with
  
  dnl ---------------------------------------------------------------------------
  dnl Output the makefiles and such from the results found above
  dnl ---------------------------------------------------------------------------
  
  dnl all additional libraries (except wxWidgets itself) we link with
-
-dnl note that we always link with -lm except for Mac OS X
-dnl extended.c uses floor() and is always linked in
-
+EXTRA_FRAMEWORKS=
  if test "$wxUSE_MAC" = 1 ; then
  if test "$wxUSE_MAC" = 1 ; then
-    if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
-        if test "$USE_DARWIN" = 1; then
-            LDFLAGS="$LDFLAGS -framework QuickTime"
+    if test "$USE_DARWIN" = 1; then
+        if test "$wxUSE_OSX_IPHONE" = 1; then
+            EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore"
          else
          else
-            LDFLAGS="$LDFLAGS -lQuickTimeLib"
+            EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
+
+            dnl The case of QuickTime framework is special: we only need it in
+            dnl 32 bit builds and not in 64 bit and, moreover, linking with it
+            dnl in 64 bit builds results in a warning because the framework is
+            dnl not available in 64 bits itself. So make an effort to avoid it
+            dnl when building for 64 bits only (i.e. not universal build).
+
+            if test "$cross_compiling" != "no"; then
+                dnl The check below doesn't work well when cross-compiling
+                dnl ("file" under non-OS X systems might not recognize
+                dnl universal binaries) so assume we do build for 32 bits as
+                dnl it's safer: at worst we'll get a warning when building in
+                dnl 64 bits only, but at least the build will still work.
+                wx_cv_target_x86_64=no
+            else
+                AC_CACHE_CHECK(
+                    [if we target only x86_64],
+                    wx_cv_target_x86_64,
+                    AC_LINK_IFELSE(
+                        [AC_LANG_SOURCE([int main() { return 0; }])],
+                        if file conftest$ac_exeext|grep -q 'i386\|ppc'; then
+                            wx_cv_target_x86_64=no
+                        else
+                            wx_cv_target_x86_64=yes
+                        fi
+                    )
+                )
+            fi
+
+            if test "$wx_cv_target_x86_64" != "yes"; then
+                EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
+            fi
          fi
      fi
          fi
      fi
-    if test "$USE_DARWIN" = 1; then
-        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System"
-    else
-        LDFLAGS="$LDFLAGS -lCarbonLib"
-    fi
  fi
  fi
-if test "$wxUSE_COCOA" = 1 ; then
-    LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
+if test "$wxUSE_OLD_COCOA" = 1 ; then
+    EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa"
      if test "$wxUSE_MEDIACTRL" = "yes"; then
      if test "$wxUSE_MEDIACTRL" = "yes"; then
-        LDFLAGS="$LDFLAGS -framework QuickTime"
+        EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
      fi
  fi
      fi
  fi
-if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
-    LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then
+    EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
  fi
  
  fi
  
-dnl FIXME: should this be covered by the conditional above
-dnl given the -lm comment there?  Or should that comment (and
-dnl this one) be removed..   [ 7 Nov 2001 ]
+LDFLAGS="$LDFLAGS $EXTRA_FRAMEWORKS"
+WXCONFIG_LDFLAGS="$WXCONFIG_LDFLAGS $EXTRA_FRAMEWORKS"
  
  LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
  
  
  LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
  
-dnl Only add the -lm library if floating point functions cannot be used
-dnl without it.  This check is important on cygwin because of the bizarre
-dnl way that they have organized functions into libraries.  On cygwin, both
-dnl libc.a and libm.a are symbolic links to a single lib libcygwin.a.  This
-dnl means that
-dnl   1) linking with -lm is not necessary, and
-dnl   2) linking with -lm is dangerous if the order of libraries is wrong
-dnl In particular, if you compile any program with -mno-cygwin and link with
-dnl -lm, it will crash instantly when it is run.  This happens because the
-dnl linker incorrectly links the Cygwin libm.a (==libcygwin.a), which replaces
-dnl the ___main function instead of allowing it to be defined by
-dnl /usr/lib/mingw/libmingw32.a as it should be.
-dnl
-dnl On MacOS X, this test will find that -lm is unnecessary and leave it out.
-dnl
-dnl Just check a few floating point functions. If they are all found without
-dnl -lm, then we must not need -lm.
-have_cos=0
-have_floor=0
-AC_CHECK_FUNCS(cos, have_cos=1)
-AC_CHECK_FUNCS(floor, have_floor=1)
-AC_MSG_CHECKING(if floating point functions link without -lm)
-if test "$have_cos" = 1 -a "$have_floor" = 1; then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT(no)
-    LIBS="$LIBS -lm"
-    # use different functions to avoid configure caching
-    have_sin=0
-    have_ceil=0
-    AC_CHECK_FUNCS(sin, have_sin=1)
-    AC_CHECK_FUNCS(ceil, have_ceil=1)
-    AC_MSG_CHECKING(if floating point functions link with -lm)
-    if test "$have_sin" = 1 -a "$have_ceil" = 1; then
-        AC_MSG_RESULT(yes)
-    else
-        AC_MSG_RESULT(no)
-        # not sure we should warn the user, crash, etc.
-    fi
-fi
-
  if test "$wxUSE_GUI" = "yes"; then
  
      dnl TODO add checks that these samples will really compile (i.e. all the
  if test "$wxUSE_GUI" = "yes"; then
  
      dnl TODO add checks that these samples will really compile (i.e. all the
@@ -6900,9 +7806,8 @@ if test "$wxUSE_GUI" = "yes"; then
  
      dnl TODO some samples are never built so far: mfc (requires VC++)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
  
      dnl TODO some samples are never built so far: mfc (requires VC++)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
-                     dynamic erase event exec font image minimal mobile \
-                     mobile/wxedit mobile/styles propsize render \
-                     richedit rotate shaped vscroll widgets"
+                     erase event exec font image minimal preferences render \
+                     shaped svg taborder vscroll widgets wrapsizer"
  
      if test "$wxUSE_MONOLITHIC" != "yes"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
  
      if test "$wxUSE_MONOLITHIC" != "yes"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
@@ -6910,7 +7815,7 @@ if test "$wxUSE_GUI" = "yes"; then
      if test "$TOOLKIT" = "MSW"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest"
          if test "$wxUSE_UNIVERSAL" != "yes"; then
      if test "$TOOLKIT" = "MSW"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest"
          if test "$wxUSE_UNIVERSAL" != "yes"; then
-            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg"
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg dll"
          fi
      fi
      if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then
          fi
      fi
      if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then
@@ -6918,6 +7823,12 @@ if test "$wxUSE_GUI" = "yes"; then
      fi
  else
      SAMPLES_SUBDIRS="console"
      fi
  else
      SAMPLES_SUBDIRS="console"
+    if test "$wxUSE_SOCKETS" = "yes" ; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
+    fi
+    if test "$wxUSE_IPC" = "yes" ; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc"
+    fi
  fi
  
  
  fi
  
  
@@ -6927,14 +7838,14 @@ dnl check for icc before gcc as icc is also recognized as gcc
  if test "x$INTELCC" = "xyes" ; then
      dnl Warnings which can't be easily suppressed in C code are disabled:
      dnl
  if test "x$INTELCC" = "xyes" ; then
      dnl Warnings which can't be easily suppressed in C code are disabled:
      dnl
-    dnl     remark #810: conversion from "x" to "y" may lose significant bits
-    dnl     remark #869: parameter "foo" was never referenced
-    dnl     remark #1572: floating-point equality and inequality comparisons
-    dnl                   are unreliable
-    dnl     remark #1684: conversion from pointer to same-sized integral type
-    dnl
-    dnl (for others see below)
-    CWARNINGS="-Wall -wd810,869,981,1418,1572,1684"
+    dnl     #810: conversion from "x" to "y" may lose significant bits
+    dnl     #869: parameter "foo" was never referenced
+    dnl     #1572: floating-point equality and inequality comparisons
+    dnl            are unreliable
+    dnl     #1684: conversion from pointer to same-sized integral type
+    dnl     #2259: non-pointer conversion from "x" to "y" may lose significant
+    dnl            bits
+    CWARNINGS="-Wall -wd810,869,981,1418,1572,1684,2259"
  elif test "$GCC" = yes ; then
      CWARNINGS="-Wall -Wundef"
  fi
  elif test "$GCC" = yes ; then
      CWARNINGS="-Wall -Wundef"
  fi
@@ -6946,18 +7857,27 @@ if test "x$INTELCXX" = "xyes" ; then
      dnl (279) are generated for standard macros and so there is nothing we can
      dnl do about them
      dnl
      dnl (279) are generated for standard macros and so there is nothing we can
      dnl do about them
      dnl
-    dnl     remark #279: controlling expression is constant
-    dnl     remark #383: value copied to temporary, reference to temporary used
-    dnl     remark #444: destructor for base class "xxx" is not virtual
-    dnl     remark #810: conversion from "x" to "y" may lose significant bits
-    dnl     remark #869: parameter "foo" was never referenced
-    dnl     remark #981: operands are evaluated in unspecified order
-    dnl     remark #1418: external definition with no prior declaration
-    dnl     remark #1419: external declaration in primary source file
-    CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
+    dnl     #279: controlling expression is constant
+    dnl     #383: value copied to temporary, reference to temporary used
+    dnl     #444: destructor for base class "xxx" is not virtual
+    dnl     #981: operands are evaluated in unspecified order
+    dnl     #1418: external definition with no prior declaration
+    dnl     #1419: external declaration in primary source file
+    dnl     #1881: argument must be a constant null pointer value
+    dnl
+    dnl (for others see CWARNINGS above)
+    CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419,1881,2259"
  elif test "$GXX" = yes ; then
  elif test "$GXX" = yes ; then
-    dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
-    CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy"
+    CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
+    AX_CXXFLAGS_GCC_OPTION(-Woverloaded-virtual, CXXWARNINGS)
+
+    dnl when building under Mac we currently get hundreds of deprecation
+    dnl warnings for Carbon symbols from the standard headers -- disable them
+    dnl as we already know that they're deprecated and nothing else can be seen
+    dnl with these warnings on
+    if test "$wxUSE_MAC" = 1 ; then
+        CXXWARNINGS="$CXXWARNINGS -Wno-deprecated-declarations"
+    fi
  fi
  
  
  fi
  
  
@@ -6970,15 +7890,17 @@ dnl add -I options we use during library compilation
  dnl
  dnl note that the order is somewhat important: wxWidgets headers should
  dnl come first and the one with setup.h should be before $(top_srcdir)/include
  dnl
  dnl note that the order is somewhat important: wxWidgets headers should
  dnl come first and the one with setup.h should be before $(top_srcdir)/include
-dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g.
-dnl CodeWarrior):
-CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $CPPFLAGS \
- -I\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
- -I\${top_srcdir}/include $TOOLKIT_INCLUDE`
-
-C_AND_CXX_FLAGS="$DEBUG_FLAG $PROFILE_FLAG $OPTIMISE_FLAG"
-CFLAGS=`echo $WXCONFIG_CFLAGS $CFLAGS $CWARNINGS $C_AND_CXX_FLAGS`
-CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $CXXFLAGS $C_AND_CXX_FLAGS`
+dnl in case the latter contains setup.h used by non-autoconf makefiles
+CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \
+ -I\\${wx_top_builddir}/lib/wx/include/${TOOLCHAIN_FULLNAME} \
+ -I\\${top_srcdir}/include $TOOLKIT_INCLUDE \
+ $CPPFLAGS `
+
+C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
+CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
+CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS `
+OBJCFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $OBJCFLAGS `
+OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS `
  
  dnl now that we added WXCONFIG_CPPFLAGS to CPPFLAGS we can add the wx-config
  dnl only stuff to it
  
  dnl now that we added WXCONFIG_CPPFLAGS to CPPFLAGS we can add the wx-config
  dnl only stuff to it
@@ -7005,15 +7927,16 @@ LIBS=`echo $LIBS`
  EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
  EXTRALIBS_XML="$EXPAT_LINK"
  EXTRALIBS_HTML="$MSPACK_LINK"
  EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
  EXTRALIBS_XML="$EXPAT_LINK"
  EXTRALIBS_HTML="$MSPACK_LINK"
-EXTRALIBS_ODBC="$ODBC_LINK"
+EXTRALIBS_MEDIA="$GST_LIBS"
+EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
  if test "$wxUSE_GUI" = "yes"; then
  if test "$wxUSE_GUI" = "yes"; then
-    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_GNOMEPRINT`
+    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK`
  fi
  if test "$wxUSE_OPENGL" = "yes"; then
      EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
  fi
  
  fi
  if test "$wxUSE_OPENGL" = "yes"; then
      EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
  fi
  
-LDFLAGS="$LDFLAGS $PROFILE_FLAG"
+LDFLAGS="$LDFLAGS $PROFILE_FLAGS"
  
  WXCONFIG_LIBS="$LIBS"
  
  
  WXCONFIG_LIBS="$LIBS"
  
@@ -7024,9 +7947,6 @@ fi
  if test "$wxUSE_EXPAT" = "builtin" ; then
      wxconfig_3rdparty="expat $wxconfig_3rdparty"
  fi
  if test "$wxUSE_EXPAT" = "builtin" ; then
      wxconfig_3rdparty="expat $wxconfig_3rdparty"
  fi
-if test "$wxUSE_ODBC" = "builtin" ; then
-    wxconfig_3rdparty="odbc $wxconfig_3rdparty"
-fi
  if test "$wxUSE_LIBTIFF" = "builtin" ; then
      wxconfig_3rdparty="tiff $wxconfig_3rdparty"
  fi
  if test "$wxUSE_LIBTIFF" = "builtin" ; then
      wxconfig_3rdparty="tiff $wxconfig_3rdparty"
  fi
@@ -7041,12 +7961,23 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
  fi
  
  for i in $wxconfig_3rdparty ; do
  fi
  
  for i in $wxconfig_3rdparty ; do
-    WXCONFIG_LIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
+    WXCONFIG_LIBS="-lwx${i}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
  done
  
  
  if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
      WXUNIV=1
  done
  
  
  if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
      WXUNIV=1
+
+    case "$wxUNIV_THEMES" in
+        ''|all)
+            AC_DEFINE(wxUSE_ALL_THEMES)
+            ;;
+
+        *)
+            for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[[a-z]]' '[[A-Z]]'`; do
+                AC_DEFINE_UNQUOTED(wxUSE_THEME_$t)
+            done
+    esac
  else
      WXUNIV=0
  fi
  else
      WXUNIV=0
  fi
@@ -7054,7 +7985,6 @@ fi
  AC_SUBST(wxUSE_ZLIB)
  AC_SUBST(wxUSE_REGEX)
  AC_SUBST(wxUSE_EXPAT)
  AC_SUBST(wxUSE_ZLIB)
  AC_SUBST(wxUSE_REGEX)
  AC_SUBST(wxUSE_EXPAT)
-AC_SUBST(wxUSE_ODBC)
  AC_SUBST(wxUSE_LIBJPEG)
  AC_SUBST(wxUSE_LIBPNG)
  AC_SUBST(wxUSE_LIBTIFF)
  AC_SUBST(wxUSE_LIBJPEG)
  AC_SUBST(wxUSE_LIBPNG)
  AC_SUBST(wxUSE_LIBTIFF)
@@ -7071,12 +8001,6 @@ else
      USE_PLUGINS=0
  fi
  
      USE_PLUGINS=0
  fi
  
-if test $wxUSE_ODBC != "no" ; then
-    USE_ODBC=1
-else
-    USE_ODBC=0
-fi
-
  if test "$wxUSE_DEBUGREPORT" = "yes" ; then
      USE_QA=1
  else
  if test "$wxUSE_DEBUGREPORT" = "yes" ; then
      USE_QA=1
  else
@@ -7098,38 +8022,70 @@ AC_SUBST(WXUNIV)
  AC_SUBST(MONOLITHIC)
  AC_SUBST(USE_PLUGINS)
  AC_SUBST(LIBS)
  AC_SUBST(MONOLITHIC)
  AC_SUBST(USE_PLUGINS)
  AC_SUBST(LIBS)
+AC_SUBST(CXXWARNINGS)
  AC_SUBST(EXTRALIBS)
  AC_SUBST(EXTRALIBS_XML)
  AC_SUBST(EXTRALIBS_HTML)
  AC_SUBST(EXTRALIBS)
  AC_SUBST(EXTRALIBS_XML)
  AC_SUBST(EXTRALIBS_HTML)
-AC_SUBST(EXTRALIBS_ODBC)
+AC_SUBST(EXTRALIBS_MEDIA)
  AC_SUBST(EXTRALIBS_GUI)
  AC_SUBST(EXTRALIBS_OPENGL)
  AC_SUBST(EXTRALIBS_SDL)
  AC_SUBST(EXTRALIBS_GUI)
  AC_SUBST(EXTRALIBS_OPENGL)
  AC_SUBST(EXTRALIBS_SDL)
+AC_SUBST(EXTRALIBS_STC)
  AC_SUBST(WITH_PLUGIN_SDL)
  AC_SUBST(WITH_PLUGIN_SDL)
-AC_SUBST(EXTRALIBS_GNOMEPRINT)
  AC_SUBST(UNICODE)
  AC_SUBST(UNICODE)
-AC_SUBST(BUILD)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(DEBUG_FLAG)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(DEBUG_FLAG)
-TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[[A-Z]]" "[[a-z]]"`
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'`
  AC_SUBST(TOOLKIT_LOWERCASE)
  AC_SUBST(TOOLKIT_VERSION)
  AC_SUBST(TOOLKIT_LOWERCASE)
  AC_SUBST(TOOLKIT_VERSION)
+AC_SUBST(DYLIB_RPATH_INSTALL)
+AC_SUBST(DYLIB_RPATH_POSTLINK)
  AC_SUBST(SAMPLES_RPATH_FLAG)
  AC_SUBST(SAMPLES_RPATH_FLAG)
-AC_SUBST(SAMPLES_RPATH_POSTLINK)
+AC_SUBST(HEADER_PAD_OPTION)
  AC_SUBST(HOST_SUFFIX)
  AC_SUBST(CPPUNIT_CFLAGS)
  AC_SUBST(CPPUNIT_LIBS)
  
  case "$TOOLKIT" in
      GTK)
  AC_SUBST(HOST_SUFFIX)
  AC_SUBST(CPPUNIT_CFLAGS)
  AC_SUBST(CPPUNIT_LIBS)
  
  case "$TOOLKIT" in
      GTK)
-        TOOLKIT_USER="GTK+"
-        if test "$WXGTK20" = 1; then
-            TOOLKIT_USER="$TOOLKIT_USER 2"
+        TOOLKIT_DESC="GTK+"
+        if test "$WXGTK2" = 1; then
+            if test "$WXGTK3" = 1; then
+                TOOLKIT_DESC="$TOOLKIT_DESC 3"
+            else
+                TOOLKIT_DESC="$TOOLKIT_DESC 2"
+            fi
+            if test "$wxUSE_GTKPRINT" = "yes" ; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";
+            fi
+            if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint";
+            fi
+            if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomevfs"
+            fi
+            if test "$wxUSE_LIBNOTIFY" = "yes" ; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA libnotify"
+            fi
+            if test "$wxUSE_LIBHILDON" = "yes"; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
+            fi
+            if test "$wxUSE_LIBHILDON2" = "yes"; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
+            fi
+
+            if test "$TOOLKIT_EXTRA" != ""; then
+                TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`"
+            fi
          fi
          ;;
  
          fi
          ;;
  
+    ?*)
+        TOOLKIT_DESC=$TOOLKIT_LOWERCASE
+        ;;
+
      *)
      *)
-        TOOLKIT_USER=$TOOLKIT_LOWERCASE
+        TOOLKIT_DESC="base only"
          ;;
  esac
  
          ;;
  esac
  
@@ -7137,19 +8093,155 @@ if test "$wxUSE_WINE" = "yes"; then
      BAKEFILE_FORCE_PLATFORM=win32
  fi
  
      BAKEFILE_FORCE_PLATFORM=win32
  fi
  
+dnl gcc 3.4 has a pch bug which truncates wide character constants in headers.
+dnl Hopefully for a non-unicode build there aren't any wide constants in
+dnl headers, but for a unicode build it's best to disable pch.
+if test "$wxUSE_UNICODE" = yes -a "$GCC" = yes -a "$bk_use_pch" != no
+then
+    AC_CACHE_CHECK(
+        [for gcc precompiled header bug],
+        [wx_cv_gcc_pch_bug],
+        [[
+            echo '#include <stdio.h>
+                  const wchar_t test_var[] = L"awidetest";' > conftest.h
+
+            echo '#include "conftest.h"
+                  int main()
+                  {
+                     printf("%ls", test_var);
+                     return 0;
+                  }' > conftest.cpp
+
+            wx_cv_gcc_pch_bug="pch not supported"
+
+            if $CXX conftest.h >/dev/null 2>&1
+            then
+                wx_cv_gcc_pch_bug=
+
+                if $CXX -o conftest$PROGRAM_EXT conftest.cpp >/dev/null 2>&1
+                then
+                    if tr -dc '[a-z]' < conftest$PROGRAM_EXT |
+                        grep awidetest >/dev/null
+                    then
+                        wx_cv_gcc_pch_bug=no
+                    else
+                        wx_cv_gcc_pch_bug=yes
+                    fi
+                fi
+            fi
+
+            rm -f conftest.h conftest.gch conftest.cpp conftest$PROGRAM_EXT
+        ]])
+
+    if test "$wx_cv_gcc_pch_bug" = yes; then
+        dnl make the default for pch 'no'
+        dnl further below check whether the user overrode and warn them
+        bk_use_pch=no
+    fi
+fi
+
  AC_BAKEFILE([m4_include(autoconf_inc.m4)])
  
  AC_BAKEFILE([m4_include(autoconf_inc.m4)])
  
-if test "$wxUSE_SHARED" = "yes"; then
+dnl make install path absolute (if not already);
+dnl will fail with (some) MSDOS paths
+case ${INSTALL} in
+  /* ) # Absolute
+     ;;
+  ?:* ) # Drive letter, considered as absolute.
+     ;;
+  *)
+     INSTALL=`pwd`/${INSTALL} ;;
+esac
+
+if test "$wxUSE_GUI" = "yes"; then
+
+if test "$wxUSE_MSW" = 1 ; then
+    if test "x$WINDRES" = "x"; then
+        AC_MSG_ERROR([Required windres program not found])
+    fi
+
+    RESCOMP="$WINDRES"
+fi
+
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
+    dnl base name of the resource file for wxMac must be the same
+    dnl as library installation base name (-install_name)
+    WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
+    WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
+
+    dnl add the resources target for wxMac
+    LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+
+    AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
+
+    MACSETFILE="\$(SETFILE)"
+
+    dnl resources are bundled both with shared library and applications
+    dnl since the carb resource *must* be included in the application
+    if test "$wxUSE_OSX_CARBON" = 1; then
+        POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
+        RESCOMP="$REZ"
+        WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
+    else
+        POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}"
+        RESCOMP="cat /dev/null \| $REZ"
+        WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII"
+    fi
+
+else
+    dnl default value is to (silently) do nothing in the makefile
+    MACSETFILE="@true"
+
+    if test "$wxUSE_PM" = 1; then
+        RESCOMP="emxbind"
+        WXCONFIG_RESFLAGS="-ep"
  
  
-    dnl We get the shared build linker from bakefile, since it
-    dnl moved all the logic for this out of this file and into
-    dnl its own macro.  But it can't decide on whether to return
-    dnl us $(VAR), ${VAR}, or the present expansion of VAR.
-    dnl So normalise and expand everything here now, because its
-    dnl not going to change inside wx-config anyway.
-    sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'`
-    EXE_LINKER=`eval echo "$sanitised_bakefile_mess"`
+        dnl Is this one really used anywhere for pm?
+        POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS"
+    else
+        POSTLINK_COMMAND="@true"
+    fi
+fi
+
+fi
+dnl wxUSE_GUI = 1
+
+
+dnl find out if the compiler supports PCH
+dnl
+dnl TODO: this should be in bakefile
+if test $GCC_PCH = 1
+then
+    if test "$wx_cv_gcc_pch_bug" = yes; then
+        AC_MSG_WARN([*** Precompiled header support is broken on this compiler])
+        AC_MSG_WARN([*** --enable-precomp-headers is not recommended])
+        AC_MSG_WARN([*** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361])
+    fi
+
+    # Our WX_PRECOMP flag does not make sense for any language except C++ because
+    # the headers that benefit from precompilation are mostly C++ headers.
+    CXXFLAGS="-DWX_PRECOMP $CXXFLAGS"
+    # When Bakefile can do multi-language PCH (e.g. C++ and Objective-C++) enable this:
+    #OBJCXXFLAGS="-DWX_PRECOMP $CXXFLAGS"
+fi
+
+dnl HACK ALERT!!
+dnl For now, we need to alter bk-deps not to generate deps
+dnl when we've configured a Universal binary build.
+dnl The next version of Bakefile will have the correct fix for this
+dnl at which time, this hack can be removed.
+
+if test "$wxUSE_MAC" = 1 ; then
+    if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then
+        if test "x$disable_macosx_deps" = "xyes"; then
+            sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp
+                mv temp bk-deps
+            chmod +x bk-deps
+        fi
+    fi
+fi
  
  
+if test "$wxUSE_SHARED" = "yes"; then
      dnl Need addtional flag on OS/2, so override bakefiles value
      dnl (there currently is no suitable variable to which the
      dnl  missing flags could be added, AFAICS. SN, 18.12.2004. )
      dnl Need addtional flag on OS/2, so override bakefiles value
      dnl (there currently is no suitable variable to which the
      dnl  missing flags could be added, AFAICS. SN, 18.12.2004. )
@@ -7157,15 +8249,10 @@ if test "$wxUSE_SHARED" = "yes"; then
        *-pc-os2_emx | *-pc-os2-emx )
          SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
          SHARED_LD_CXX="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
        *-pc-os2_emx | *-pc-os2-emx )
          SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
          SHARED_LD_CXX="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
-       cp -p ${srcdir}/src/os2/dllnames.sh .
-       cp -p ${srcdir}/src/os2/dllar.sh .
+        cp -p ${srcdir}/src/os2/dllnames.sh .
+        cp -p ${srcdir}/src/os2/dllar.sh .
        ;;
      esac
        ;;
      esac
-else
-
-    dnl No bakefile support for static builds, but this should be ok for most.
-    EXE_LINKER="$CXX -o"
-
  fi
  if test "$wxUSE_OMF" = "yes"; then
      case "${host}" in
  fi
  if test "$wxUSE_OMF" = "yes"; then
      case "${host}" in
@@ -7177,16 +8264,48 @@ if test "$wxUSE_OMF" = "yes"; then
      esac
  fi
  
      esac
  fi
  
-dnl find out if the compiler supports PCH
-dnl
-dnl TODO: this should be in bakefile
-if test $GCC_PCH = 1 ; then
-    CPPFLAGS="-DWX_PRECOMP $CPPFLAGS"
-fi
-
  dnl TOOLCHAIN_DEFS should be used for both wx and client code
  WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
  
  dnl TOOLCHAIN_DEFS should be used for both wx and client code
  WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS"
  
+
+dnl Sun cc is compatible with gcc and so either of them can use the C
+dnl libraries built with the other, i.e. gcc can be used to build wxGTK under
+dnl Solaris where GTK+ is compiled using cc and cc can be used under Linux
+dnl where GTK+ is built with gcc
+dnl
+dnl However the compiler options are not compatible at all and in particular
+dnl gcc doesn't like cc -mt option and cc doesn't like -pthread. We simply
+dnl filter them out as we already have the correct options for multithreaded
+dnl programs if we're using threads (and if we don't, it shouldn't matter)
+case "${host}" in
+    *-*-solaris2* )
+        dnl system packages are compiled with Sun CC and so pkg-config outputs
+        dnl CC-specific "-mt" flag, remove it when using gcc
+        if test "$GCC" = yes; then
+            CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//g'`
+            LIBS=`echo $LIBS | sed 's/-mt//g'`
+            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//g'`
+        fi
+        ;;
+
+    *-*-linux* )
+        dnl OTOH when using Sun CC under Linux, the flags contain gcc-specific
+        dnl -pthreads which Sun CC doesn't know about
+        if test "x$SUNCXX" = xyes; then
+            CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//g'`
+            LIBS=`echo $LIBS | sed 's/-pthread//g'`
+            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//g'`
+        fi
+        ;;
+esac
+
+dnl Add visibility support flags to CFLAGS/CXXFLAGS - do it this late so that
+dnl it doesn't affect compilation checks above
+CFLAGS="$CFLAGS $CFLAGS_VISIBILITY"
+CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+OBJCFLAGS="$OBJCFLAGS $CFLAGS_VISIBILITY"
+OBJCXXFLAGS="$OBJCXXFLAGS $CXXFLAGS_VISIBILITY"
+
  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
@@ -7224,7 +8343,6 @@ AC_SUBST(WX_RELEASE)
  AC_SUBST(WX_VERSION)
  AC_SUBST(WX_SUBVERSION)
  AC_SUBST(WX_CHARTYPE)
  AC_SUBST(WX_VERSION)
  AC_SUBST(WX_SUBVERSION)
  AC_SUBST(WX_CHARTYPE)
-AC_SUBST(WX_DEBUGTYPE)
  
  dnl note that in addition to the usual CPP/C/CXXFLAGS which are used for
  dnl building the library itself, we also have WXCONFIG_-prefixed variants which
  
  dnl note that in addition to the usual CPP/C/CXXFLAGS which are used for
  dnl building the library itself, we also have WXCONFIG_-prefixed variants which
@@ -7242,8 +8360,9 @@ AC_SUBST(WXCONFIG_CXXFLAGS)
  
  AC_SUBST(WXCONFIG_LIBS)
  AC_SUBST(WXCONFIG_RPATH)
  
  AC_SUBST(WXCONFIG_LIBS)
  AC_SUBST(WXCONFIG_RPATH)
+AC_SUBST(WXCONFIG_LDFLAGS)
  AC_SUBST(WXCONFIG_LDFLAGS_GUI)
  AC_SUBST(WXCONFIG_LDFLAGS_GUI)
-AC_SUBST(EXE_LINKER)
+AC_SUBST(WXCONFIG_RESFLAGS)
  
  dnl distribution vars
  AC_SUBST(GUIDIST)
  
  dnl distribution vars
  AC_SUBST(GUIDIST)
@@ -7261,6 +8380,8 @@ AC_SUBST(WX_VERSION_TAG)
  
  dnl additional resurces settings
  AC_SUBST(RESCOMP)
  
  dnl additional resurces settings
  AC_SUBST(RESCOMP)
+AC_SUBST(WINDRES)
+AC_SUBST(REZ)
  AC_SUBST(RESFLAGS)
  AC_SUBST(RESPROGRAMOBJ)
  AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
  AC_SUBST(RESFLAGS)
  AC_SUBST(RESPROGRAMOBJ)
  AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
@@ -7269,9 +8390,8 @@ AC_SUBST(WX_RESOURCES_MACOSX_DATA)
  dnl additional for Mac OS X
  AC_SUBST(DEREZ)
  AC_SUBST(LIBWXMACRES)
  dnl additional for Mac OS X
  AC_SUBST(DEREZ)
  AC_SUBST(LIBWXMACRES)
-AC_SUBST(MACRESCOMP)
+AC_SUBST(POSTLINK_COMMAND)
  AC_SUBST(MACSETFILE)
  AC_SUBST(MACSETFILE)
-AC_SUBST(MACRESWXCONFIG)
  
  dnl other tools
  AC_SUBST(GCC)
  
  dnl other tools
  AC_SUBST(GCC)
@@ -7287,10 +8407,7 @@ AC_PROG_MAKE_SET
  AC_CONFIG_HEADERS([lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in])
  
  if test "$USE_WIN32" = 1; then
  AC_CONFIG_HEADERS([lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in])
  
  if test "$USE_WIN32" = 1; then
-    AC_CONFIG_COMMANDS(
-        [
-            rcdefs.h
-        ],
+    AC_CONFIG_COMMANDS([rcdefs.h],
          [
              mkdir -p $outdir &&
              $CPP $infile | sed 's/^# *[1-9].*//;s/^ *//;/./,/^$/!d' > $outdir/rcdefs.h
          [
              mkdir -p $outdir &&
              $CPP $infile | sed 's/^# *[1-9].*//;s/^ *//;/./,/^$/!d' > $outdir/rcdefs.h
@@ -7311,7 +8428,15 @@ AC_CONFIG_FILES([ lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.
                  [ chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} ],
                  [ TOOLCHAIN_FULLNAME="${TOOLCHAIN_FULLNAME}" ])
  
                  [ chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} ],
                  [ TOOLCHAIN_FULLNAME="${TOOLCHAIN_FULLNAME}" ])
  
-AC_CONFIG_FILES([ version-script Makefile ])
+dnl this is used to run ifacecheck with the same flags used by the compiler
+dnl for the real compilation:
+AC_CONFIG_FILES([ utils/ifacecheck/rungccxml.sh ],
+                [ chmod +x utils/ifacecheck/rungccxml.sh ])
+
+if test "$wx_cv_version_script" = "yes"; then
+    AC_CONFIG_FILES(version-script)
+fi
+AC_CONFIG_FILES(Makefile)
  
  AC_CONFIG_COMMANDS([wx-config],
                     [ rm -f wx-config
  
  AC_CONFIG_COMMANDS([wx-config],
                     [ rm -f wx-config
@@ -7326,27 +8451,27 @@ dnl resembles an installed wx in prefix=$builddir.  It is troublesome
  dnl though in this form because AC_CONFIG_LINKS will fail for directories
  dnl on platforms that do not have symlinks.
  dnl AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR:include ])
  dnl though in this form because AC_CONFIG_LINKS will fail for directories
  dnl on platforms that do not have symlinks.
  dnl AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR:include ])
-dnl AC_CONFIG_LINKS([ contrib/include ])
  
  if test "$wxWITH_SUBDIRS" != "no"; then
  
  if test "$wxWITH_SUBDIRS" != "no"; then
-dnl Configure samples, contrib etc. directories, but only if they are present:
+dnl Configure samples, demos etc. directories, but only if they are present:
  if test "$wxUSE_GUI" = "yes"; then
  if test "$wxUSE_GUI" = "yes"; then
-    SUBDIRS="samples demos utils contrib"
-else dnl we build wxBase only
-    dnl there are no wxBase programs in contrib nor demos
+    SUBDIRS="samples demos utils"
+else
+    dnl we build wxBase only
+    dnl there are no wxBase programs in demos
      SUBDIRS="samples utils"
  fi
  dnl Add tests to the list of subdirs if cppunit 1.8.0+ is detected
  AM_PATH_CPPUNIT(1.8.0, [SUBDIRS="$SUBDIRS tests"])
  
      SUBDIRS="samples utils"
  fi
  dnl Add tests to the list of subdirs if cppunit 1.8.0+ is detected
  AM_PATH_CPPUNIT(1.8.0, [SUBDIRS="$SUBDIRS tests"])
  
-for subdir in `echo $SUBDIRS`; do
+for subdir in $SUBDIRS; do
      if test -d ${srcdir}/${subdir} ; then
          if test "$wxUSE_GUI" = "yes"; then
              if test ${subdir} = "samples"; then
                  dnl only take those samples which compile in the current
                  dnl configuration and which exist
                  makefiles="samples/Makefile.in $makefiles"
      if test -d ${srcdir}/${subdir} ; then
          if test "$wxUSE_GUI" = "yes"; then
              if test ${subdir} = "samples"; then
                  dnl only take those samples which compile in the current
                  dnl configuration and which exist
                  makefiles="samples/Makefile.in $makefiles"
-                for sample in `echo $SAMPLES_SUBDIRS`; do
+                for sample in $SAMPLES_SUBDIRS; do
                      if test -d $srcdir/samples/$sample; then
                          makefiles="samples/$sample/Makefile.in $makefiles"
                      fi
                      if test -d $srcdir/samples/$sample; then
                          makefiles="samples/$sample/Makefile.in $makefiles"
                      fi
@@ -7354,27 +8479,34 @@ for subdir in `echo $SUBDIRS`; do
              else
                  dnl assume that everything compiles for utils &c
                  dnl any that shouldn't be built can be added to
              else
                  dnl assume that everything compiles for utils &c
                  dnl any that shouldn't be built can be added to
-                dnl DISABLED_UTILS, DISABLED_CONTRIB or DISABLED_DEMOS
-                disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
+                dnl DISABLED_UTILS, DISABLED_DEMOS
+                disabled_var=DISABLED_`echo $subdir | tr '[[a-z]]' '[[A-Z]]'`
                  eval "disabled=\$$disabled_var"
                  disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
                  eval "disabled=\$$disabled_var"
                  disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
-                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`
+                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
              fi
              fi
-        else dnl we build wxBase only
-            dnl don't take all samples/utils, just those which build with
-            dnl wxBase
+        else
+            dnl we build wxBase only
+            dnl don't take all samples/utils, just those which build with wxBase
              if test ${subdir} = "samples"; then
              if test ${subdir} = "samples"; then
-                makefiles="samples/Makefile.in samples/console/Makefile.in"
+                dnl only take those samples which compile in the current
+                dnl configuration and which exist
+                makefiles="samples/Makefile.in $makefiles"
+                for sample in `echo $SAMPLES_SUBDIRS`; do
+                    if test -d $srcdir/samples/$sample; then
+                        makefiles="samples/$sample/Makefile.in $makefiles"
+                    fi
+                done
              elif test ${subdir} = "utils"; then
                  makefiles=""
              elif test ${subdir} = "utils"; then
                  makefiles=""
-                for util in HelpGen tex2rtf ; do
+                for util in ifacecheck ; do
                      if test -d $srcdir/utils/$util ; then
                      if test -d $srcdir/utils/$util ; then
-                        makefiles="utils/$util/Makefile.in \
-                                   utils/$util/src/Makefile.in \
+                        makefiles="utils/$util/src/Makefile.in \
                                     $makefiles"
                      fi
                  done
                                     $makefiles"
                      fi
                  done
-            else dnl assume that everything compiles for tests
+            else
+                dnl assume that everything compiles for tests
                  makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
              fi
          fi
                  makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
              fi
          fi
@@ -7393,18 +8525,26 @@ dnl report how we have been configured
  echo
  echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
  echo ""
  echo
  echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
  echo ""
-echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_USER:-base only}"
+echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_DESC}"
  echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
  echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
-
-echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
  echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
  echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
-echo "  Should wxWidgets be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
+echo $ECHO_N "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}$ECHO_C"
+if test "$wxUSE_UNICODE" = "yes"; then
+    if test "$wxUSE_UNICODE_UTF8" = "yes"; then
+        echo " (using UTF-8)"
+    else
+        echo " (using wchar_t)"
+    fi
+else
+    echo
+fi
  
  echo "  What level of wxWidgets compatibility should be enabled?"
  
  echo "  What level of wxWidgets compatibility should be enabled?"
-echo "                                       wxWidgets 2.4      ${WXWIN_COMPATIBILITY_2_4:-no}"
-echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-yes}"
+echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-no}"
+echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
  
  echo "  Which libraries should wxWidgets use?"
  
  echo "  Which libraries should wxWidgets use?"
+echo "                                       STL                ${wxUSE_STL}"
  echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
  echo "                                       png                ${wxUSE_LIBPNG-none}"
  echo "                                       regex              ${wxUSE_REGEX}"
  echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
  echo "                                       png                ${wxUSE_LIBPNG-none}"
  echo "                                       regex              ${wxUSE_REGEX}"
@@ -7413,11 +8553,9 @@ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
  echo "                                       xpm                ${wxUSE_LIBXPM-none}"
  fi
  echo "                                       zlib               ${wxUSE_ZLIB}"
  echo "                                       xpm                ${wxUSE_LIBXPM-none}"
  fi
  echo "                                       zlib               ${wxUSE_ZLIB}"
-echo "                                       odbc               ${wxUSE_ODBC}"
  echo "                                       expat              ${wxUSE_EXPAT}"
  echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
  echo "                                       sdl                ${wxUSE_LIBSDL}"
  echo "                                       expat              ${wxUSE_EXPAT}"
  echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
  echo "                                       sdl                ${wxUSE_LIBSDL}"
-echo "                                       gnomeprint         ${wxUSE_LIBGNOMEPRINT-none}"
  
  echo ""
  
  
  echo ""