Tidy up the include guards for the various wxWebView header files.

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

index f00cd43de8dffd1929f810f2a6fb3638b6166306..9c35b151ce440821df6cbf64325673bd60814edc 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,7 +17,7 @@ dnl ---------------------------------------------------------------------------
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
-AC_INIT([wxWidgets], [2.9.1], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.9.3], [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])
@@ -43,7 +43,7 @@ dnl wx_release_number += 1
  
  wx_major_version_number=2
  wx_minor_version_number=9
  
  wx_major_version_number=2
  wx_minor_version_number=9
-wx_release_number=1
+wx_release_number=3
  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
@@ -103,14 +103,15 @@ 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 OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL 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_OSX_CARBON=0
  DEFAULT_wxUSE_OSX_COCOA=0
  DEFAULT_wxUSE_GTK=0
  DEFAULT_wxUSE_OSX_CARBON=0
  DEFAULT_wxUSE_OSX_COCOA=0
+DEFAULT_wxUSE_OSX_IPHONE=0
  DEFAULT_wxUSE_MGL=0
  DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_wxUSE_MOTIF=0
  DEFAULT_wxUSE_MGL=0
  DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_wxUSE_MOTIF=0
@@ -122,10 +123,11 @@ DEFAULT_wxUSE_DFB=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
  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_COCOA=0
+DEFAULT_DEFAULT_wxUSE_OLD_COCOA=0
  DEFAULT_DEFAULT_wxUSE_GTK=0
  DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
  DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
  DEFAULT_DEFAULT_wxUSE_GTK=0
  DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
  DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
+DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
  DEFAULT_DEFAULT_wxUSE_MGL=0
  DEFAULT_DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_DEFAULT_wxUSE_MOTIF=0
  DEFAULT_DEFAULT_wxUSE_MGL=0
  DEFAULT_DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_DEFAULT_wxUSE_MOTIF=0
@@ -182,6 +184,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
@@ -316,6 +323,15 @@ 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
    *-*-darwin* )
      dnl Darwin based distributions (including Mac OS X)
      USE_BSD=1
@@ -356,6 +372,7 @@ dnl wxUSE_ALL_FEATURES which is the only which has to be set to "yes" by
  dnl default)
  DEFAULT_wxUSE_ALL_FEATURES=yes
  
  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
  
  DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
  DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
  
@@ -363,16 +380,17 @@ dnl libraries disabled by default
  DEFAULT_wxUSE_DMALLOC=no
  DEFAULT_wxUSE_LIBGNOMEVFS=no
  DEFAULT_wxUSE_LIBHILDON=no
  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_LIBMSPACK=no
  DEFAULT_wxUSE_LIBSDL=no
  
  dnl features disabled by default
  DEFAULT_wxUSE_ACCESSIBILITY=no
-DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
  DEFAULT_wxUSE_IPV6=no
  DEFAULT_wxUSE_GSTREAMER8=no
  
  dnl automatic features
  DEFAULT_wxUSE_IPV6=no
  DEFAULT_wxUSE_GSTREAMER8=no
  
  dnl automatic features
+DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto
  DEFAULT_wxUSE_UNICODE_UTF8=auto
  DEFAULT_wxUSE_OPENGL=auto
  DEFAULT_wxUSE_MEDIACTRL=auto
  DEFAULT_wxUSE_UNICODE_UTF8=auto
  DEFAULT_wxUSE_OPENGL=auto
  DEFAULT_wxUSE_MEDIACTRL=auto
@@ -382,6 +400,7 @@ DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
  
  dnl Mac/Cocoa users need to enable building universal binaries explicitly
  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
  
  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
  
  
  DEFAULT_wxUSE_OFFICIAL_BUILD=no
  
@@ -435,6 +454,7 @@ if test "$wxUSE_ALL_FEATURES" = "no"; then
      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"
      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
  
      DEFAULT_wxUSE_MEDIACTRL=no
  fi
  
@@ -453,10 +473,15 @@ 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 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])
  dnl shouldn't default to wxUSE_ALL_FEATURES
  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(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(mac,           [  --with-mac              use Mac OS X (Default) ], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(cocoa,         [  --with-cocoa            use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=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(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])
@@ -509,7 +534,7 @@ if test "$wxUSE_GUI" = "yes"; then
          fi
        done
      else
          fi
        done
      else
-      dnl try to guess the most apropriate toolkit for this platform
+      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}"
        for toolkit in $ALL_TOOLKITS; do
          var=DEFAULT_DEFAULT_wxUSE_$toolkit
          eval "wxUSE_$toolkit=\$${var}"
@@ -518,8 +543,8 @@ if test "$wxUSE_GUI" = "yes"; then
  
      dnl we suppose that expr is available (maybe there is a better way to do
      dnl this? what about using ALL_TOOLKITS? TODO)
  
      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_OSX_CARBON:-0} \
-                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+    NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-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.
                    + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
  
      dnl Allow wxUSE_PM only for OS/2 with EMX.
@@ -541,8 +566,10 @@ if test "$wxUSE_GUI" = "yes"; then
      # to be removed when --disable-gtk2 isn't needed
      if test "x$wxUSE_GTK2" = "xyes"; then
          wxGTK_VERSION=2
      # to be removed when --disable-gtk2 isn't needed
      if test "x$wxUSE_GTK2" = "xyes"; then
          wxGTK_VERSION=2
+        wxUSE_GTK1=0
      elif test "x$wxUSE_GTK2" = "xno"; then
          wxGTK_VERSION=1
      elif test "x$wxUSE_GTK2" = "xno"; then
          wxGTK_VERSION=1
+        wxUSE_GTK1=1
      fi
  
      for toolkit in $ALL_TOOLKITS; do
      fi
  
      for toolkit in $ALL_TOOLKITS; do
@@ -562,7 +589,9 @@ else
  fi
  
  wxUSE_MAC=0
  fi
  
  wxUSE_MAC=0
-if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then
+if test "$wxUSE_OSX_CARBON" = 1 \
+       -o "$wxUSE_OSX_COCOA" = 1 \
+       -o "$wxUSE_OSX_IPHONE" = 1; then
      wxUSE_MAC=1
  fi
  
      wxUSE_MAC=1
  fi
  
@@ -579,7 +608,7 @@ WX_ARG_WITH(libmspack,     [  --with-libmspack        use libmspack (CHM help fi
  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_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(hildon,        [  --with-hildon           use Hildon framework for Nokia 770], wxUSE_LIBHILDON)
+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
  WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
  
  fi
@@ -671,9 +700,16 @@ dnl global compile options
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_DISABLE(shared,     [  --disable-shared        create static library instead of shared], wxUSE_SHARED)
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_DISABLE(shared,     [  --disable-shared        create static library instead of shared], wxUSE_SHARED)
-WX_ARG_ENABLE(stl,         [  --enable-stl            use STL for containers], wxUSE_STL)
+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_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_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)
@@ -692,7 +728,9 @@ WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without C++
  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(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  create Mac PowerPC and Intel Universal binary]], wxUSE_UNIVERSAL_BINARY)
+
+WX_ARG_ENABLE_PARAM(universal_binary, [[  --enable-universal_binary  create universal binary with Mac PPC and i386 (and x86_64 if using Cocoa) 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_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)
@@ -728,6 +766,7 @@ WX_ARG_FEATURE(epollloop,     [  --enable-epollloop      use wxEpollDispatcher c
  WX_ARG_FEATURE(selectloop,    [  --enable-selectloop     use wxSelectDispatcher class], wxUSE_SELECT_DISPATCHER)
  
  dnl please keep the settings below in alphabetical order
  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(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)
@@ -742,12 +781,14 @@ WX_ARG_FEATURE(dynamicloader, [  --enable-dynamicloader  use (new) wxDynamicLibr
  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(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(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(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(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)
@@ -758,7 +799,7 @@ WX_ARG_FEATURE(sound,         [  --enable-sound          use wxSound class], wxU
  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(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(system_options,[  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
+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(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)
@@ -792,6 +833,7 @@ WX_ARG_FEATURE(htmlhelp,    [  --enable-htmlhelp       use wxHTML-based help], w
  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(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(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)
@@ -803,10 +845,16 @@ WX_ARG_FEATURE(mediactrl,   [  --enable-mediactrl      use wxMediaCtrl class], w
  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(webkit,      [  --enable-webkit         use wxWebKitCtrl (Mac)], wxUSE_WEBKIT)
  WX_ARG_FEATURE(richtext,    [  --enable-richtext       use wxRichTextCtrl], wxUSE_RICHTEXT)
  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(webkit,      [  --enable-webkit         use wxWebKitCtrl (Mac)], wxUSE_WEBKIT)
  WX_ARG_FEATURE(richtext,    [  --enable-richtext       use wxRichTextCtrl], wxUSE_RICHTEXT)
-WX_ARG_FEATURE(graphics_ctx,[  --enable-graphics_ctx   use graphics context 2D drawing API], wxUSE_GRAPHICS_CONTEXT)
  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(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(web,         [  --enable-web            use wxWeb library], wxUSE_WEB)
+
+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
  
  dnl ---------------------------------------------------------------------------
  dnl IPC &c
  
  dnl ---------------------------------------------------------------------------
  dnl IPC &c
@@ -842,6 +890,7 @@ if test "$wxUSE_CONTROLS" = "no"; then
      DEFAULT_wxUSE_COLOURPICKERCTRL=no
      DEFAULT_wxUSE_COMBOBOX=no
      DEFAULT_wxUSE_COMBOBOX=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_DATAVIEWCTRL=no
      DEFAULT_wxUSE_DATEPICKCTRL=no
      DEFAULT_wxUSE_DETECT_SM=no
@@ -858,10 +907,12 @@ if test "$wxUSE_CONTROLS" = "no"; then
      DEFAULT_wxUSE_LISTBOOK=no
      DEFAULT_wxUSE_LISTBOX=no
      DEFAULT_wxUSE_LISTCTRL=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_NOTEBOOK=no
      DEFAULT_wxUSE_POPUPWIN=no
      DEFAULT_wxUSE_RADIOBOX=no
      DEFAULT_wxUSE_RADIOBTN=no
+    DEFAULT_wxUSE_RICHMSGDLG=no
      DEFAULT_wxUSE_REARRANGECTRL=no
      DEFAULT_wxUSE_SASH=no
      DEFAULT_wxUSE_SCROLLBAR=no
      DEFAULT_wxUSE_REARRANGECTRL=no
      DEFAULT_wxUSE_SASH=no
      DEFAULT_wxUSE_SCROLLBAR=no
@@ -884,9 +935,14 @@ if test "$wxUSE_CONTROLS" = "no"; then
      DEFAULT_wxUSE_TREECTRL=no
  fi
  
      DEFAULT_wxUSE_TREECTRL=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)
  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(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(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)
@@ -900,6 +956,7 @@ WX_ARG_FEATURE(collpane,    [  --enable-collpane       use wxCollapsiblePane cla
  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(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(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)
@@ -914,6 +971,7 @@ WX_ARG_FEATURE(grid,        [  --enable-grid           use wxGrid class], wxUSE_
  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(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(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)
@@ -923,6 +981,7 @@ WX_ARG_FEATURE(odcombobox,  [  --enable-odcombobox     use wxOwnerDrawnComboBox
  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(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(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(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)
@@ -981,6 +1040,9 @@ WX_ARG_FEATURE(joystick,    [  --enable-joystick       use wxJoystick], wxUSE_JO
  WX_ARG_FEATURE(metafile,    [  --enable-metafiles      use wxMetaFile (Win32 only)], 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(metafile,    [  --enable-metafiles      use wxMetaFile (Win32 only)], 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-webview-webkit use wxWebView WebKit backend], wxUSE_WEBVIEW_WEBKIT)
  
  dnl ---------------------------------------------------------------------------
  dnl support for image formats that do not rely on external library
  
  dnl ---------------------------------------------------------------------------
  dnl support for image formats that do not rely on external library
@@ -1005,6 +1067,7 @@ WX_ARG_FEATURE(ps-in-msw,   [  --enable-ps-in-msw      use PS printing in wxMSW
  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(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-webview-ie     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
  
  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
@@ -1076,13 +1139,18 @@ if test "$wxUSE_MAC" = 1; then
  
  retest_macosx_linking=no
  
  
  retest_macosx_linking=no
  
+OSX_ARCH_OPTS=""
+if test "x$wxUSE_MAC_ARCH" != xno; then
+    OSX_ARCH_OPTS="-arch $wxUSE_MAC_ARCH"
+fi
+
  dnl Support the old --enable-universal_binary in case anyone was using it.
      if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
          dnl --enable-universal_binary uses a default SDK (currently 10.4u)
          dnl --enable-universal_binary=SDK names a path to an SDK
          if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
              # Implicitly turn on the new --with-macosx-sdk using the default
  dnl Support the old --enable-universal_binary in case anyone was using it.
      if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
          dnl --enable-universal_binary uses a default SDK (currently 10.4u)
          dnl --enable-universal_binary=SDK names a path to an SDK
          if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
              # Implicitly turn on the new --with-macosx-sdk using the default
-            # SDK which provides the behavior this option has always had.
+            # SDK which provides the behaviour this option has always had.
              if test "x$wxUSE_MACOSX_SDK" = "x"; then
                  AC_MSG_WARN([Enabling default SDK due to --enable-universal_binary.])
                  AC_MSG_WARN([If you don't want this, specify --without-macosx-sdk])
              if test "x$wxUSE_MACOSX_SDK" = "x"; then
                  AC_MSG_WARN([Enabling default SDK due to --enable-universal_binary.])
                  AC_MSG_WARN([If you don't want this, specify --without-macosx-sdk])
@@ -1105,12 +1173,13 @@ dnl Support the old --enable-universal_binary in case anyone was using it.
              fi
          fi
          dnl FIXME: I think it would be better to put this into CC, CXX, and LD rather than the flags.
              fi
          fi
          dnl FIXME: I think it would be better to put this into CC, CXX, and LD rather than the flags.
-        OSX_UNIV_OPTS="-arch ppc -arch i386"
-        CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
-        CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
-        OBJCXXFLAGS="$OSX_UNIV_OPTS $OBJCXXFLAGS"
-        OBJCFLAGS="$OSX_UNIV_OPTS $OBJCFLAGS"
-        LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
+        OSX_ARCH_OPTS="-arch ppc -arch i386"
+       if test "$wxUSE_OSX_COCOA" = 1; then
+            OSX_ARCH_OPTS="$OSX_ARCH_OPTS -arch x86_64"
+        fi
+        AC_MSG_CHECKING([for universal binary architectures])
+       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 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
@@ -1134,6 +1203,12 @@ dnl Support the old --enable-universal_binary in case anyone was using it.
          bk_use_pch=no
      fi
  
          bk_use_pch=no
      fi
  
+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"
+
  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
  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
@@ -1152,10 +1227,8 @@ if test "x$wxUSE_MACOSX_SDK" != "x"; then
      else
          AC_MSG_RESULT([exists])
      fi
      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"
      MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK"
-    eval "CC=\"$CC $MACOSX_SDK_OPTS\""
-    eval "CXX=\"$CXX $MACOSX_SDK_OPTS\""
-    eval "LD=\"$LD $MACOSX_SDK_OPTS\""
      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
      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
@@ -1193,14 +1266,31 @@ dnl We need to quote the next line where we don't need macros and do need [] in
          wxUSE_MACOSX_VERSION_MIN=
      fi
  elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
          wxUSE_MACOSX_VERSION_MIN=
      fi
  elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
-    OSX_VERSION=`sw_vers -productVersion | grep 10.[[0-9]]`
-    if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then
-        # otherwise configure stops on leopard for universal_binary
-        wxUSE_MACOSX_VERSION_MIN=10.4
+    AC_CHECK_PROGS(OSX_SW_VERS, sw_vers)
+    if test "$OSX_SW_VERS" != ""; then
+        OSX_VERSION=`sw_vers -productVersion | grep 10.[[0-9]]`
      else
      else
-        # for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard
-        wxUSE_MACOSX_VERSION_MIN=10.5
+        dnl can't determine it (happens e.g. when cross-compiling) so use a
+        dnl conservative default
+        AC_MSG_WARN([Assuming OS X 10.4, use --with-macosx-version-min to override.])
+        OSX_VERSION="10.4"
      fi
      fi
+
+    case "$OSX_VERSION" in
+        10.4* )
+            wxUSE_MACOSX_VERSION_MIN=10.4
+            ;;
+
+        * )
+            if test "$wxUSE_OSX_CARBON" = 1; then
+                # otherwise configure stops on leopard for universal_binary
+                wxUSE_MACOSX_VERSION_MIN=10.4
+            else
+                # for Cocoa, use 10.5 to be able to compile it in 64 bits too
+                wxUSE_MACOSX_VERSION_MIN=10.5
+            fi
+            ;;
+    esac
  fi
  
  NEEDS_GCC40="no"
  fi
  
  NEEDS_GCC40="no"
@@ -1220,20 +1310,30 @@ if test "x$NEEDS_GCC40" == "xyes"; then
          CCVERSION=`$CC --version | grep 4.[[2-9]].`
          if test "x$CCVERSION" != "x"; then
              echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead."
          CCVERSION=`$CC --version | grep 4.[[2-9]].`
          if test "x$CCVERSION" != "x"; then
              echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead."
-            CC="/usr/bin/gcc-4.0"
+            CC="gcc-4.0"
          fi
      fi
  
      if test "x$CXX" = "xg++"; then
          CCVERSION=`$CXX --version | grep 4.[[2-9]].`
          if test "x$CCVERSION" != "x"; then
          fi
      fi
  
      if test "x$CXX" = "xg++"; then
          CCVERSION=`$CXX --version | grep 4.[[2-9]].`
          if test "x$CCVERSION" != "x"; then
-            CXX="/usr/bin/g++-4.0"
+            CXX="g++-4.0"
          fi
      fi
  fi
  
          fi
      fi
  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\""
+fi
+
  if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
  if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
-    MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
+    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\""
      eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\""
      eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\""
      eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\""
@@ -1364,7 +1464,7 @@ if test "$wxUSE_WINE" = "yes"; then
      LDFLAGS_GUI="-mwindows"
  fi
  
      LDFLAGS_GUI="-mwindows"
  fi
  
-dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only
+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
  dnl     take effect on Cygwin/Mingw and not other platforms.
  if test "$wants_win32" = 1 ; then
      USE_UNIX=0
@@ -1588,11 +1688,10 @@ 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],
  
  dnl checks needed to define wxVaCopy
  AC_CACHE_CHECK([for va_copy],
@@ -1783,18 +1882,57 @@ if test "x$SUNCC" = xyes; then
      CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS"
  fi
  
      CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS"
  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="-woff 3970 $CFLAGS"
+    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="-woff 3970 $CXXFLAGS"
+    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
@@ -2040,6 +2178,8 @@ if test "$wxUSE_STL" = "yes"; then
      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 check for atomic operations builtins for wx/atomic.h:
  WX_ATOMIC_BUILTINS
  
@@ -2475,7 +2615,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
              AC_CHECK_HEADER(png.h,,, [ ])
  
              if test "$ac_cv_header_png_h" = "yes"; then
              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])
+                AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
              fi
  
              if test "x$PNG_LINK" = "x" ; then
              fi
  
              if test "x$PNG_LINK" = "x" ; then
@@ -2632,17 +2772,6 @@ dnl ------------------------------------------------------------------------
  dnl Check for expat libraries
  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)
  if test "$wxUSE_EXPAT" != "no"; then
      wxUSE_XML=yes
      AC_DEFINE(wxUSE_EXPAT)
@@ -2727,15 +2856,13 @@ if test "$USE_WIN32" = 1 ; then
      ],
      [ ])
  
      ],
      [ ])
  
-    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 -ladvapi32 -lwsock32 -lgdi32"
      case "${host}" in
      case "${host}" in
-       x86_64-*-mingw32* )
-            dnl --- For mingw-w64 lctl3d32's name has changed
-            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-        ;;
-        * )
-            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+        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
          ;;
      esac
      if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
@@ -2749,13 +2876,13 @@ if test "$USE_WIN32" = 1 ; then
      esac
  
      dnl This one is still used by some sample makefiles.
      esac
  
      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__"
+    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"
  
      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?)
      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__"
+    WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
  
      dnl install Win32-specific files in "make install"
      WIN32INSTALL=win32install
  
      dnl install Win32-specific files in "make install"
      WIN32INSTALL=win32install
@@ -2774,7 +2901,7 @@ if test "$wxUSE_GUI" = "yes"; then
      WXGTK2=
      WXGPE=
  
      WXGTK2=
      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
@@ -2835,13 +2962,8 @@ if test "$wxUSE_GUI" = "yes"; then
  
                      AM_PATH_GTK_2_0(2.4.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
  
  
                      AM_PATH_GTK_2_0(2.4.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
  
-                    dnl Solaris also requires -lX11 for static lib
-                    case "${host}" in
-                        *-*-solaris2* )
-                            if test "$wxUSE_SHARED" != "yes"; then
-                                GTK_LIBS="$GTK_LIBS -lX11"
-                            fi
-                    esac
+                    dnl we use symbols from X11 directly so we should link with it
+                    GTK_LIBS="$GTK_LIBS -lX11"
                  fi
  
                  dnl detect GTK1.x
                  fi
  
                  dnl detect GTK1.x
@@ -2862,7 +2984,7 @@ if test "$wxUSE_GUI" = "yes"; then
                      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
              ]
          )
@@ -2899,47 +3021,71 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
              CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
              LIBS="$LIBS $wx_cv_libs_gtk"
  
              CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
              LIBS="$LIBS $wx_cv_libs_gtk"
  
-            dnl test if we have at least GTK+ 2.10:
-            AC_MSG_CHECKING([if GTK+ is version >= 2.10])
+            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>
                             ],
                             [
-                            #if !GTK_CHECK_VERSION(2,10,0)
-                            Not GTK+ 2.10
+                            #if !GTK_CHECK_VERSION(2,18,0)
+                            Not GTK+ 2.18
                              #endif
                             ],
                             [
                              #endif
                             ],
                             [
+                            AC_DEFINE(__WXGTK218__)
                              AC_DEFINE(__WXGTK210__)
                              AC_DEFINE(__WXGTK26__)
                              AC_MSG_RESULT([yes])
                              AC_DEFINE(__WXGTK210__)
                              AC_DEFINE(__WXGTK26__)
                              AC_MSG_RESULT([yes])
-                            ac_wxgtk210=1
+                            ac_wxgtk218=1
                             ],
                             [
                              AC_MSG_RESULT([no])
                             ],
                             [
                              AC_MSG_RESULT([no])
-                            ac_wxgtk210=0
+                            ac_wxgtk218=0
                             ])
  
                             ])
  
-            if test "$ac_wxgtk210" = 0; then
-                dnl test if we have at least GTK+ 2.6:
-                AC_MSG_CHECKING([if GTK+ is version >= 2.6])
+            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>
                  AC_TRY_COMPILE([
                                  #include <gtk/gtk.h>
-                            ],
-                            [
-                                #if !GTK_CHECK_VERSION(2,6,0)
-                                Not GTK+ 2.6
+                               ],
+                               [
+                                #if !GTK_CHECK_VERSION(2,10,0)
+                                Not GTK+ 2.10
                                  #endif
                                  #endif
-                            ],
-                            [
+                               ],
+                               [
+                                AC_DEFINE(__WXGTK210__)
                                  AC_DEFINE(__WXGTK26__)
                                  AC_MSG_RESULT([yes])
                                  AC_DEFINE(__WXGTK26__)
                                  AC_MSG_RESULT([yes])
-                                ac_wxgtk26=1
-                            ],
-                            [
+                                ac_wxgtk210=1
+                               ],
+                               [
                                  AC_MSG_RESULT([no])
                                  AC_MSG_RESULT([no])
-                                ac_wxgtk26=0
-                            ])
+                                ac_wxgtk210=0
+                               ])
+
+                if test "$ac_wxgtk210" = 0; then
+                    dnl test if we have at least GTK+ 2.6:
+                    AC_MSG_CHECKING([if GTK+ is version >= 2.6])
+                    AC_TRY_COMPILE([
+                                    #include <gtk/gtk.h>
+                                ],
+                                [
+                                    #if !GTK_CHECK_VERSION(2,6,0)
+                                    Not GTK+ 2.6
+                                    #endif
+                                ],
+                                [
+                                    AC_DEFINE(__WXGTK26__)
+                                    AC_MSG_RESULT([yes])
+                                    ac_wxgtk26=1
+                                ],
+                                [
+                                    AC_MSG_RESULT([no])
+                                    ac_wxgtk26=0
+                                ])
+                fi
              fi
  
              CFLAGS="$save_CFLAGS"
              fi
  
              CFLAGS="$save_CFLAGS"
@@ -2963,6 +3109,9 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
          GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
  
          TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
          GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
  
+        dnl disable GTK runtime type checks
+        TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS"
+
          AFMINSTALL=afminstall
          TOOLKIT=GTK
          GUIDIST=GTK_DIST
          AFMINSTALL=afminstall
          TOOLKIT=GTK
          GUIDIST=GTK_DIST
@@ -3453,10 +3602,10 @@ 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_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon $CPPFLAGS"
+            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_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS_PASCAL -DTARGET_CARBON $CPPFLAGS"
          fi
  
          TOOLKIT=OSX_CARBON
          fi
  
          TOOLKIT=OSX_CARBON
@@ -3465,14 +3614,27 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          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
      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
@@ -3576,14 +3738,13 @@ fi
  
  
  dnl ---------------------------------------------------------------------------
  
  
  dnl ---------------------------------------------------------------------------
-dnl wxDisplay Sanity checks
+dnl wxDisplay checks
  dnl ---------------------------------------------------------------------------
  
  dnl ---------------------------------------------------------------------------
  
+USE_XINERAMA=0
  if test "$wxUSE_DISPLAY" = "yes"; then
  if test "$wxUSE_DISPLAY" = "yes"; then
-dnl ---------------------------------------------------------------------------
-dnl Xinerama (for unix ) - Brian Victor
-dnl ---------------------------------------------------------------------------
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+    dnl Xinerama is used for wxGTK1/wxX11/wxMotif only
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK1" = 1; then
          AC_MSG_CHECKING([for Xinerama])
          WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
          if test "$ac_find_libraries" != "" ; then
          AC_MSG_CHECKING([for Xinerama])
          WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
          if test "$ac_find_libraries" != "" ; then
@@ -3591,45 +3752,48 @@ dnl ---------------------------------------------------------------------------
              if test "$ac_path_to_link" != " -L/usr/lib" ; then
                  LDFLAGS="$LDFLAGS $ac_path_to_link"
              fi
              if test "$ac_path_to_link" != " -L/usr/lib" ; then
                  LDFLAGS="$LDFLAGS $ac_path_to_link"
              fi
+            USE_XINERAMA=1
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
              AC_MSG_RESULT([yes])
              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
-
          else
              AC_MSG_RESULT([no])
              AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
              wxUSE_DISPLAY="no"
          fi
      elif test "$wxUSE_MSW" = 1; then
          else
              AC_MSG_RESULT([no])
              AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
              wxUSE_DISPLAY="no"
          fi
      elif test "$wxUSE_MSW" = 1; then
-dnl ---------------------------------------------------------------------------
-dnl DirectDraw for MSW - optionally used by WxDisplay.
-dnl ---------------------------------------------------------------------------
+        dnl DirectDraw for MSW - optionally used by WxDisplay.
          AC_CHECK_HEADER([ddraw.h], [], [], [#include <windows.h>])
      fi
  fi
  
          AC_CHECK_HEADER([ddraw.h], [], [], [#include <windows.h>])
      fi
  fi
  
+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
+        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
+    fi
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl X11 session management
  dnl ---------------------------------------------------------------------------
  if test "$wxUSE_DETECT_SM" = "yes"; then
  dnl ---------------------------------------------------------------------------
  dnl X11 session management
  dnl ---------------------------------------------------------------------------
  if test "$wxUSE_DETECT_SM" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
          AC_MSG_CHECKING([for -lSM - X11 session management])
          WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM)
          if test "$ac_find_libraries" != "" ; then
          AC_MSG_CHECKING([for -lSM - X11 session management])
          WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM)
          if test "$ac_find_libraries" != "" ; then
@@ -3659,7 +3823,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
  
      dnl look in glcanvas.h for the list of platforms supported by wxGlCanvas:
  
  
      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_COCOA" = 1; then
+    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"
@@ -3843,16 +4007,16 @@ if test "$wxUSE_SHARED" = "yes"; then
              DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
              DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
-libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
+libnames=\`cd \${2} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
  for i in \${libnames} ; do
  for i in \${libnames} ; do
-    ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
+    ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
      for dep in \${libnames} ; do
      for dep in \${libnames} ; do
-        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
+        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
      done
  done
  EOF
              chmod +x change-install-names
      done
  done
  EOF
              chmod +x change-install-names
-            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
+            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
          fi
  
          dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
          fi
  
          dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
@@ -3920,7 +4084,7 @@ dnl library link name
  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 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.
  
-if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
+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}"
      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}"
@@ -3933,7 +4097,7 @@ 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
@@ -4084,54 +4248,47 @@ 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
-    fi
-
-    if test "$WCSLEN_FOUND" = 1; then
-        AC_DEFINE(HAVE_WCSLEN)
+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
  
  
-    AC_CHECK_FUNCS([wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp])
+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="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
-    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 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 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
@@ -4793,6 +4950,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
@@ -4801,10 +4964,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
@@ -4852,7 +5027,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])
@@ -4866,6 +5048,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*)
@@ -5221,6 +5404,8 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then
  fi
  
  if test "$wxUSE_DEBUG_FLAG" = "no" ; then
  fi
  
  if test "$wxUSE_DEBUG_FLAG" = "no" ; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0"
+
      if test "$wxUSE_GTK" = 1 ; then
          if test "x$wxGTK_VERSION" = "x1" ; then
              CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
      if test "$wxUSE_GTK" = 1 ; then
          if test "x$wxGTK_VERSION" = "x1" ; then
              CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
@@ -5247,7 +5432,10 @@ fi
  
  if test "$GCC" = "yes" ; then
      if test "$wxUSE_NO_RTTI" = "yes" ; then
  
  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"
@@ -5460,6 +5648,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 ---------------------------------------------------------------------------
@@ -5472,6 +5699,10 @@ if test "$wxUSE_EXTENDED_RTTI" = "yes"; then
    AC_DEFINE(wxUSE_EXTENDED_RTTI)
  fi
  
    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
@@ -5617,12 +5848,30 @@ if test "$WXGTK2" = 1; then
                  CFLAGS="$CFLAGS $HILDON_CFLAGS"
                  CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS"
                  AC_DEFINE(wxUSE_LIBHILDON)
                  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_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],
+                [
+                    EXTRALIBS_HILDON="$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
  
      fi
  fi
  
@@ -5673,6 +5922,10 @@ if test "$wxUSE_TARSTREAM" = "yes"; then
    fi
  fi
  
    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)
  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)
@@ -5731,6 +5984,10 @@ if test "$wxUSE_BUSYINFO" = "yes"; then
    AC_DEFINE(wxUSE_BUSYINFO)
  fi
  
    AC_DEFINE(wxUSE_BUSYINFO)
  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
@@ -5739,6 +5996,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
@@ -6504,6 +6765,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 ---------------------------------------------------------------------------
@@ -6513,6 +6783,10 @@ 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
  if test "$wxUSE_ACCEL" = "yes"; then
    AC_DEFINE(wxUSE_ACCEL)
    USES_CONTROLS=1
@@ -6562,6 +6836,11 @@ if test "$wxUSE_COMBOCTRL" = "yes"; then
    USES_CONTROLS=1
  fi
  
    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
@@ -6662,6 +6941,10 @@ if test "$wxUSE_IMAGLIST" = "yes"; then
      AC_DEFINE(wxUSE_IMAGLIST)
  fi
  
      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
@@ -6717,6 +7000,10 @@ if test "$wxUSE_REARRANGECTRL" = "yes"; then
      AC_DEFINE(wxUSE_REARRANGECTRL)
  fi
  
      AC_DEFINE(wxUSE_REARRANGECTRL)
  fi
  
+if test "$wxUSE_RICHMSGDLG" = "yes"; then
+    AC_DEFINE(wxUSE_RICHMSGDLG)
+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"
@@ -6794,7 +7081,7 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then
  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
@@ -6852,7 +7139,7 @@ if test "$wxUSE_TREECTRL" = "yes"; then
  fi
  
  if test "$wxUSE_POPUPWIN" = "yes"; then
  fi
  
  if test "$wxUSE_POPUPWIN" = "yes"; then
-    if test "$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
@@ -6867,7 +7154,7 @@ 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 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
          AC_MSG_WARN([Dialup manager not supported on this platform... disabled])
      else
          AC_DEFINE(wxUSE_DIALUP_MANAGER)
          AC_MSG_WARN([Dialup manager not supported on this platform... disabled])
      else
          AC_DEFINE(wxUSE_DIALUP_MANAGER)
@@ -6897,6 +7184,27 @@ if test "$wxUSE_ACCESSIBILITY" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
  fi
  
+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
      AC_DEFINE(wxUSE_DRAGIMAGE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
  if test "$wxUSE_DRAGIMAGE" = "yes"; then
      AC_DEFINE(wxUSE_DRAGIMAGE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
@@ -6935,7 +7243,7 @@ if test "$wxUSE_WEBKIT" = "yes"; then
                             #include <WebKit/WebKit.h>
                          ])
          CPPFLAGS="$old_CPPFLAGS"
                             #include <WebKit/WebKit.h>
                          ])
          CPPFLAGS="$old_CPPFLAGS"
-    elif test "$wxUSE_COCOA" = 1; then
+    elif test "$wxUSE_OLD_COCOA" = 1; then
          AC_DEFINE(wxUSE_WEBKIT)
      else
          wxUSE_WEBKIT=no
          AC_DEFINE(wxUSE_WEBKIT)
      else
          wxUSE_WEBKIT=no
@@ -6971,6 +7279,13 @@ if test "$wxUSE_PROPGRID" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
  fi
  
     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=0
  if test "$wxUSE_STC" = "yes"; then
     AC_DEFINE(wxUSE_STC)
@@ -7038,6 +7353,74 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
  fi
  
+USE_WEB=0
+if test "$wxUSE_WEB" = "yes"; then
+   AC_DEFINE(wxUSE_WEB)
+   USE_WEB=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web"
+
+   if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_GTK" = 1; then
+       AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
+       AC_MSG_CHECKING([for webkitgtk libraries])
+       WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],webkitgtk-1.0)
+       if test "$ac_find_libraries" != "" ; 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
+           GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
+           AC_MSG_RESULT([yes])
+       else
+           AC_MSG_RESULT([no])
+           AC_MSG_WARN([libwebkitgtk-1.0 not found; disabling webkit backend])
+           wxUSE_WEBVIEW_WEBKIT="no"
+       fi
+
+       AC_MSG_CHECKING(for webkitgtk includes)
+       WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/webkit-1.0], webkit/webkit.h)
+       if test "$ac_find_includes" != "" ; then
+           AC_MSG_RESULT(found in $ac_find_includes)
+           WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
+           CPPFLAGS="$ac_path_to_include $CPPFLAGS"
+       else
+           AC_MSG_RESULT([not found])
+       fi
+       dnl we also depend on libsoup
+       AC_MSG_CHECKING(for libsoup includes)
+       WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/libsoup-2.4], libsoup/soup.h)
+       if test "$ac_find_includes" != "" ; then
+           AC_MSG_RESULT(found in $ac_find_includes)
+           WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
+           CPPFLAGS="$ac_path_to_include $CPPFLAGS"
+       else
+           AC_MSG_RESULT([not found])
+       fi
+   fi
+
+    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+        old_CPPFLAGS="$CPPFLAGS"
+        CPPFLAGS="-x objective-c++ $CPPFLAGS"
+        AC_CHECK_HEADER([WebKit/HIWebView.h],
+                        [
+                           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
+                           WEBKIT_LINK="-framework WebKit"
+                        ],
+                        [
+                           AC_MSG_WARN([WebKit headers not found; disabling wxWebView WebKit])
+                           wxUSE_WEBVIEW_WEBKIT=no
+                        ],
+                        [
+                           #include <Carbon/Carbon.h>
+                           #include <WebKit/WebKit.h>
+                        ])
+        CPPFLAGS="$old_CPPFLAGS"
+    elif test "$wxUSE_OLD_COCOA" = 1; then
+        AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
+    else
+        wxUSE_WEBVIEW_WEBKIT=no
+    fi
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl wxImage options
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl wxImage options
  dnl ---------------------------------------------------------------------------
@@ -7195,23 +7578,73 @@ dnl ---------------------------------------------------------------------------
  dnl wxGraphicsContext
  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
  if test "$wxUSE_MAC" = 1; then
-       wxUSE_GRAPHICS_CONTEXT="yes"
+    wxUSE_GRAPHICS_CONTEXT="yes"
  fi
  
  if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
  fi
  
  if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
-   if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
-      AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
-   elif test "$wxUSE_GTK" != 1; then
-      dnl for other builds we'll just wing it for now...
-      AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
-   else
-      dnl ...but let's check for cairo availability for wxGTK builds
-      PKG_CHECK_MODULES(CAIRO, cairo,
-          [AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)],
-          [AC_MSG_WARN([Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT])]
-      )
-   fi
+    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 ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -7361,12 +7794,19 @@ if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_PROPGRID" = "yes" ; then
          BUILT_WX_LIBS="propgrid $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_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_WEB" = "yes" ; then
+        STD_GUI_LIBS="web $STD_GUI_LIBS"
+        BUILT_WX_LIBS="web $BUILT_WX_LIBS"
+    fi
      if test "$wxUSE_XRC" = "yes" ; then
          STD_GUI_LIBS="xrc $STD_GUI_LIBS"
          BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"
      if test "$wxUSE_XRC" = "yes" ; then
          STD_GUI_LIBS="xrc $STD_GUI_LIBS"
          BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"
@@ -7383,27 +7823,29 @@ dnl Output the makefiles and such from the results found above
  dnl ---------------------------------------------------------------------------
  
  dnl all additional libraries (except wxWidgets itself) we link with
  dnl ---------------------------------------------------------------------------
  
  dnl all additional libraries (except wxWidgets itself) we link with
-
+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"
-        fi
-    fi
      if test "$USE_DARWIN" = 1; then
      if test "$USE_DARWIN" = 1; then
-        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
+        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
+            EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime"
+        fi
      fi
  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
  
+LDFLAGS="$LDFLAGS $EXTRA_FRAMEWORKS"
+WXCONFIG_LDFLAGS="$WXCONFIG_LDFLAGS $EXTRA_FRAMEWORKS"
+
  LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
  
  if test "$wxUSE_GUI" = "yes"; then
  LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
  
  if test "$wxUSE_GUI" = "yes"; then
@@ -7422,7 +7864,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
@@ -7647,19 +8089,7 @@ AC_SUBST(EXTRALIBS_HILDON)
  AC_SUBST(UNICODE)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(DEBUG_FLAG)
  AC_SUBST(UNICODE)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(DEBUG_FLAG)
-TOOLKIT_LOWERCASE=xxx
-if test "$TOOLKIT" = "MAC"; then
-    TOOLKIT_LOWERCASE=osx_carbon
-fi
-if test "$TOOLKIT" = "OSX_CARBON"; then
-    TOOLKIT_LOWERCASE=osx_carbon
-fi
-if test "$TOOLKIT" = "OSX_COCOA"; then
-    TOOLKIT_LOWERCASE=osx_cocoa
-fi
-if test "$TOOLKIT_LOWERCASE" = "xxx"; then
-    TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'`
-fi
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'`
  AC_SUBST(TOOLKIT_LOWERCASE)
  AC_SUBST(TOOLKIT_VERSION)
  AC_SUBST(DYLIB_RPATH_INSTALL)
  AC_SUBST(TOOLKIT_LOWERCASE)
  AC_SUBST(TOOLKIT_VERSION)
  AC_SUBST(DYLIB_RPATH_INSTALL)
@@ -7687,6 +8117,9 @@ case "$TOOLKIT" in
              if test "$wxUSE_LIBHILDON" = "yes"; then
                  TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
              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 ' '`"
  
              if test "$TOOLKIT_EXTRA" != ""; then
                  TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`"
@@ -7777,7 +8210,7 @@ if test "$wxUSE_MSW" = 1 ; then
      RESCOMP="$WINDRES"
  fi
  
      RESCOMP="$WINDRES"
  fi
  
-if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
+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"
      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"
@@ -7972,6 +8405,7 @@ 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_RESFLAGS)
  
  AC_SUBST(WXCONFIG_LDFLAGS_GUI)
  AC_SUBST(WXCONFIG_RESFLAGS)