Avoid using wx GDI classes from non-main thread in wxOSX/Cocoa.

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

index 342a8a1c0b6aa42dd60e7e2c637a5da89da6e989..1eae0beda81292f65673d36071eba6d5b16b82d2 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,16 +17,25 @@ dnl ---------------------------------------------------------------------------
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
-AC_INIT([wxWidgets], [2.9.0], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.9.2], [wx-dev@lists.wxwidgets.org])
  
  dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
  AC_CONFIG_SRCDIR([wx-config.in])
  
  
  dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
  AC_CONFIG_SRCDIR([wx-config.in])
  
-dnl sets build, host, target variables and the same with _alias
+dnl sets build, host variables and the same with _alias
  AC_CANONICAL_BUILD
  AC_CANONICAL_HOST
  AC_CANONICAL_BUILD
  AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
  
  
+dnl notice that if --host was given but --build was not, cross_compiling is
+dnl only set to "maybe" and not "yes" and will be either set to "yes" later or
+dnl configure will exit with error in AC_PROG_CC so don't test for = "yes" here
+if test "$cross_compiling" != "no"; then
+    HOST_PREFIX="${host_alias}-"
+    HOST_SUFFIX="-$host_alias"
+else
+    HOST_PREFIX=
+    HOST_SUFFIX=
+fi
  
  dnl When making releases do:
  dnl
  
  dnl When making releases do:
  dnl
@@ -34,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=0
+wx_release_number=2
  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
@@ -94,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
@@ -113,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
@@ -126,9 +137,9 @@ DEFAULT_DEFAULT_wxUSE_X11=0
  DEFAULT_DEFAULT_wxUSE_DFB=0
  
  PROGRAM_EXT=
  DEFAULT_DEFAULT_wxUSE_DFB=0
  
  PROGRAM_EXT=
-SO_SUFFIX=so
  SAMPLES_RPATH_FLAG=
  SAMPLES_RPATH_FLAG=
-SAMPLES_RPATH_POSTLINK=
+DYLIB_RPATH_INSTALL=
+DYLIB_RPATH_POSTLINK=
  
  DEFAULT_STD_FLAG=yes
  
  
  DEFAULT_STD_FLAG=yes
  
@@ -141,7 +152,6 @@ case "${host}" in
      USE_HPUX=1
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
      NEEDS_D_REENTRANT_FOR_R_FUNCS=1
      USE_HPUX=1
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
      NEEDS_D_REENTRANT_FOR_R_FUNCS=1
-    SO_SUFFIX=sl
      AC_DEFINE(__HPUX__)
  
      dnl many standard declarations in HP-UX headers are only included if either
      AC_DEFINE(__HPUX__)
  
      dnl many standard declarations in HP-UX headers are only included if either
@@ -174,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
@@ -245,12 +260,6 @@ case "${host}" in
      USE_AIX=1
      USE_SYSV=1
      USE_SVR4=1
      USE_AIX=1
      USE_SYSV=1
      USE_SVR4=1
-    dnl quoting from http://www-1.ibm.com/servers/esdd/articles/gnu.html:
-    dnl
-    dnl     Both archive libraries and shared libraries on AIX have an .a
-    dnl     extension. This will explain why you can't link with an .so and
-    dnl     why it works with the name changed to .a.
-    SO_SUFFIX=a
      AC_DEFINE(__AIX__)
      AC_DEFINE(__SYSV__)
      AC_DEFINE(__SVR4__)
      AC_DEFINE(__AIX__)
      AC_DEFINE(__SYSV__)
      AC_DEFINE(__SVR4__)
@@ -268,7 +277,6 @@ case "${host}" in
      dnl MBN: some of the defines have been moved after toolkit detection
      dnl      because for wxMotif/wxGTK/wxX11 to build on Cygwin
      dnl      USE_UNIX  must be set and not USE_WIN32
      dnl MBN: some of the defines have been moved after toolkit detection
      dnl      because for wxMotif/wxGTK/wxX11 to build on Cygwin
      dnl      USE_UNIX  must be set and not USE_WIN32
-    SO_SUFFIX=dll
      PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_MSW=1
    ;;
      PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_MSW=1
    ;;
@@ -315,28 +323,23 @@ case "${host}" in
      DEFAULT_STD_FLAG=no
    ;;
  
      DEFAULT_STD_FLAG=no
    ;;
  
+  arm-apple-darwin*)
+    dnl iPhone
+    USE_BSD=1
+    USE_DARWIN=1
+    AC_DEFINE(__BSD__)
+    AC_DEFINE(__DARWIN__)
+    DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=1
+  ;;
+
    *-*-darwin* )
      dnl Darwin based distributions (including Mac OS X)
      USE_BSD=1
      USE_DARWIN=1
    *-*-darwin* )
      dnl Darwin based distributions (including Mac OS X)
      USE_BSD=1
      USE_DARWIN=1
-    SO_SUFFIX=dylib
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(TARGET_CARBON)
      DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(TARGET_CARBON)
      DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
-    DEFAULT_STD_FLAG=no
-  ;;
-  powerpc-apple-macos* )
-    dnl Classic Mac OS (< X)
-    USE_UNIX=0
-    dnl For some reason the test that should be cross-compiler capable fails
-    dnl However, there is no doubt that MacOS PowerPC is big endian.
-    ac_cv_c_bigendian=yes
-    SO_SUFFIX=shlib
-    dnl AC_DEFINE(TARGET_CARBON)
-    dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS
-    DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
-    DEFAULT_STD_FLAG=no
    ;;
  
    *-*-beos* )
    ;;
  
    *-*-beos* )
@@ -376,23 +379,26 @@ 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
  DEFAULT_wxUSE_LIBMSPACK=no
  DEFAULT_wxUSE_LIBSDL=no
-DEFAULT_wxUSE_OPENGL=no
  
  dnl features disabled by default
  DEFAULT_wxUSE_ACCESSIBILITY=no
  
  dnl features disabled by default
  DEFAULT_wxUSE_ACCESSIBILITY=no
-DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
  DEFAULT_wxUSE_IPV6=no
  DEFAULT_wxUSE_IPV6=no
-DEFAULT_wxUSE_MEDIACTRL=no
-DEFAULT_wxUSE_TAB_DIALOG=no
  DEFAULT_wxUSE_GSTREAMER8=no
  
  DEFAULT_wxUSE_GSTREAMER8=no
  
+dnl automatic features
  DEFAULT_wxUSE_UNICODE_UTF8=auto
  DEFAULT_wxUSE_UNICODE_UTF8=auto
+DEFAULT_wxUSE_OPENGL=auto
+DEFAULT_wxUSE_MEDIACTRL=auto
+DEFAULT_wxUSE_COMPILER_TLS=auto
+
  DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
  
  dnl Mac/Cocoa users need to enable building universal binaries explicitly
  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
  DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=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
  
@@ -441,6 +447,14 @@ fi
  
  WX_ARG_DISABLE(all-features,[  --disable-all-features  disable all optional features to build minimal library], wxUSE_ALL_FEATURES)
  
  
  WX_ARG_DISABLE(all-features,[  --disable-all-features  disable all optional features to build minimal library], wxUSE_ALL_FEATURES)
  
+if test "$wxUSE_ALL_FEATURES" = "no"; then
+    dnl this is a bit ugly but currently we have no choice but to manually
+    dnl reset all the options with default value of auto if all features are to
+    dnl be disabled because we can't have an option with default value of
+    dnl "auto-or-no-if-wxUSE_ALL_FEATURES-is-disabled"
+    DEFAULT_wxUSE_MEDIACTRL=no
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl port selection
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl port selection
  dnl ---------------------------------------------------------------------------
@@ -456,10 +470,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])
@@ -521,8 +540,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.
@@ -544,8 +563,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
@@ -565,7 +586,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
  
@@ -582,7 +605,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
@@ -608,12 +631,72 @@ AC_ARG_WITH(macosx-version-min,    [  --with-macosx-version-min=VER   build bina
      ])
  AC_MSG_RESULT([$wxUSE_MACOSX_VERSION_MIN])
  
      ])
  AC_MSG_RESULT([$wxUSE_MACOSX_VERSION_MIN])
  
+dnl ---------------------------------------------------------------------------
+dnl debugging options
+dnl ---------------------------------------------------------------------------
+
+dnl don't use WX_ARG_ENABLE as it just gets in the way instead of helping with
+dnl this rather unusual option
+AC_MSG_CHECKING([for --enable-debug])
+AC_ARG_ENABLE(debug,       [  --enable-debug          build library for debugging],
+    [
+        if test "$enableval" = yes; then
+            wxUSE_DEBUG=yes
+        elif test "$enableval" = no; then
+            wxUSE_DEBUG=no
+        elif test "$enableval" = max; then
+            wxUSE_DEBUG=yes
+            WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=2"
+        else
+            AC_MSG_ERROR([Invalid --enable-debug value, must be yes, no or max])
+        fi
+    ],
+    wxUSE_DEBUG=default
+)
+
+case "$wxUSE_DEBUG" in
+    yes)
+        dnl build the library for debugging: enable debugging code and generate
+        dnl the debug information for the library itself
+        DEFAULT_wxUSE_DEBUG_FLAG=yes
+        DEFAULT_wxUSE_DEBUG_INFO=yes
+
+        dnl also disable optimizations by default if --enable-debug was used
+        dnl (this can still be overridden by an explicit --enable-optimise)
+        DEFAULT_wxUSE_OPTIMISE=no
+        ;;
+
+    no)
+        dnl --disable-debug is equivalent to both --disable-debug_flag and
+        dnl --disable-debug_info
+        DEFAULT_wxUSE_DEBUG_FLAG=no
+        DEFAULT_wxUSE_DEBUG_INFO=no
+        ;;
+
+    default)
+        dnl the library is built with debugging support by default but without
+        dnl debug information as this requires much, much more disk space
+        DEFAULT_wxUSE_DEBUG_FLAG=yes
+        DEFAULT_wxUSE_DEBUG_INFO=no
+        ;;
+esac
+
+WX_ARG_DISABLE(debug_flag,   [  --disable-debug_flag    disable all debugging support], wxUSE_DEBUG_FLAG)
+WX_ARG_ENABLE(debug_info,    [  --enable-debug_info     generate debug information], wxUSE_DEBUG_INFO)
+
+dnl enabled if just --enable-debug_{flag,info} was
+dnl
+dnl in any case, only set the default value and allow overriding it with an
+
+WX_ARG_ENABLE(debug_gdb,     [  --enable-debug_gdb      create code with extra GDB debugging information], wxUSE_DEBUG_GDB)
+WX_ARG_ENABLE(debug_cntxt,   [  --enable-debug_cntxt    obsolete, don't use: use wxDebugContext], wxUSE_DEBUG_CONTEXT)
+WX_ARG_ENABLE(mem_tracing,   [  --enable-mem_tracing    obsolete, don't use: create code with memory tracing], wxUSE_MEM_TRACING)
+
  dnl ---------------------------------------------------------------------------
  dnl global compile options
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_DISABLE(shared,     [  --disable-shared        create static library instead of shared], wxUSE_SHARED)
  dnl ---------------------------------------------------------------------------
  dnl global compile options
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_DISABLE(shared,     [  --disable-shared        create static library instead of shared], wxUSE_SHARED)
-WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
  WX_ARG_ENABLE(stl,         [  --enable-stl            use STL for containers], wxUSE_STL)
  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(stl,         [  --enable-stl            use STL for containers], wxUSE_STL)
  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)
@@ -627,49 +710,17 @@ if test "$USE_OS2" = 1; then
      WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
  fi
  
      WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
  fi
  
-dnl --enablle-debug is equivalent to both --enable-debug_flag and
-dnl --enable-debug_info
-if test "$wxUSE_DEBUG" = "yes"; then
-    DEFAULT_wxUSE_DEBUG_FLAG=yes
-    DEFAULT_wxUSE_DEBUG_INFO=yes
-    BUILD=debug
-elif test "$wxUSE_DEBUG" = "no"; then
-    DEFAULT_wxUSE_DEBUG_FLAG=no
-    DEFAULT_wxUSE_DEBUG_INFO=no
-    BUILD=release
-fi
-
-WX_ARG_ENABLE(debug_flag,    [  --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)], wxUSE_DEBUG_FLAG)
-WX_ARG_ENABLE(debug_info,    [  --enable-debug_info     create code with debugging information], wxUSE_DEBUG_INFO)
-
-dnl it's important to also do it in the other direction to get the correct
-dnl output in the configure summary (which uses wxUSE_DEBUG)
-if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
-    wxUSE_DEBUG=yes
-    BUILD=debug
-fi
-
-dnl disable optimizations by default if --enable-debug was used but leave them
-dnl enabled if just --enable-debug_{flag,info} was
-dnl
-dnl in any case, only set the default value and allow overriding it with an
-dnl explicit --enable-optimise
-if test "$wxUSE_DEBUG" = "yes"; then
-    DEFAULT_wxUSE_OPTIMISE=no
-fi
-
  WX_ARG_DISABLE(optimise,   [  --disable-optimise      compile without optimisations], wxUSE_OPTIMISE)
  
  WX_ARG_DISABLE(optimise,   [  --disable-optimise      compile without optimisations], wxUSE_OPTIMISE)
  
-WX_ARG_ENABLE(debug_gdb,     [  --enable-debug_gdb      create code with extra GDB debugging information], wxUSE_DEBUG_GDB)
-WX_ARG_ENABLE(debug_cntxt,   [  --enable-debug_cntxt    use wxDebugContext], wxUSE_DEBUG_CONTEXT)
-WX_ARG_ENABLE(mem_tracing,   [  --enable-mem_tracing    create code with memory tracing], wxUSE_MEM_TRACING)
  WX_ARG_ENABLE(profile,       [  --enable-profile        create code with profiling information], wxUSE_PROFILE)
  WX_ARG_ENABLE(no_rtti,       [  --enable-no_rtti        create code without RTTI information], wxUSE_NO_RTTI)
  WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without C++ exceptions handling], wxUSE_NO_EXCEPTIONS)
  WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
  WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
  WX_ARG_DISABLE(vararg_macros,[  --disable-vararg_macros don't use vararg macros, even if they are supported], wxUSE_VARARG_MACROS)
  WX_ARG_ENABLE(profile,       [  --enable-profile        create code with profiling information], wxUSE_PROFILE)
  WX_ARG_ENABLE(no_rtti,       [  --enable-no_rtti        create code without RTTI information], wxUSE_NO_RTTI)
  WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without C++ exceptions handling], wxUSE_NO_EXCEPTIONS)
  WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
  WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
  WX_ARG_DISABLE(vararg_macros,[  --disable-vararg_macros don't use vararg macros, even if they are supported], wxUSE_VARARG_MACROS)
-WX_ARG_ENABLE_PARAM(universal_binary, [[  --enable-universal_binary  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)
@@ -679,6 +730,7 @@ WX_ARG_DISABLE(rpath,        [  --disable-rpath         disable use of rpath for
  WX_ARG_ENABLE(objc_uniquifying,[  --enable-objc_uniquifying enable Objective-C class name uniquifying], wxUSE_OBJC_UNIQUIFYING)
  
  WX_ARG_DISABLE(visibility,   [  --disable-visibility    disable use of ELF symbols visibility even if supported], wxUSE_VISIBILITY)
  WX_ARG_ENABLE(objc_uniquifying,[  --enable-objc_uniquifying enable Objective-C class name uniquifying], wxUSE_OBJC_UNIQUIFYING)
  
  WX_ARG_DISABLE(visibility,   [  --disable-visibility    disable use of ELF symbols visibility even if supported], wxUSE_VISIBILITY)
+WX_ARG_DISABLE(tls,          [  --disable-tls           disable use of compiler TLS support], wxUSE_COMPILER_TLS)
  
  dnl ---------------------------------------------------------------------------
  dnl optional non GUI features
  
  dnl ---------------------------------------------------------------------------
  dnl optional non GUI features
@@ -704,6 +756,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)
@@ -718,12 +771,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)
@@ -734,7 +789,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)
@@ -768,6 +823,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)
@@ -779,11 +835,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)
  
+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 ---------------------------------------------------------------------------
  dnl IPC &c
  dnl ---------------------------------------------------------------------------
@@ -800,124 +861,74 @@ dnl don't set DEFAULT_wxUSE_XXX below if the option is not specified
  DEFAULT_wxUSE_CONTROLS=none
  WX_ARG_DISABLE(controls,    [  --disable-controls      disable compilation of all standard controls], wxUSE_CONTROLS)
  
  DEFAULT_wxUSE_CONTROLS=none
  WX_ARG_DISABLE(controls,    [  --disable-controls      disable compilation of all standard controls], wxUSE_CONTROLS)
  
-dnl even with --enable-controls, some may be disabled by giving
-dnl --disable-<control> later on the command line - but by default all will be
-dnl used (and vice versa)
-if test "$wxUSE_CONTROLS" = "yes"; then
-  DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_ANIMATIONCTRL=yes
-  DEFAULT_wxUSE_BMPBUTTON=yes
-  DEFAULT_wxUSE_BUTTON=yes
-  DEFAULT_wxUSE_CALCTRL=yes
-  DEFAULT_wxUSE_CARET=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_CHECKBOX=yes
-  DEFAULT_wxUSE_CHECKLISTBOX=yes
-  DEFAULT_wxUSE_CHOICE=yes
-  DEFAULT_wxUSE_CHOICEBOOK=yes
-  DEFAULT_wxUSE_COLLPANE=yes
-  DEFAULT_wxUSE_COLOURPICKERCTRL=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_DATEPICKCTRL=yes
-  DEFAULT_wxUSE_DISPLAY=yes
-  DEFAULT_wxUSE_DETECT_SM=yes
-  DEFAULT_wxUSE_DIRPICKERCTRL=yes
-  DEFAULT_wxUSE_FILECTRL=yes
-  DEFAULT_wxUSE_FILEPICKERCTRL=yes
-  DEFAULT_wxUSE_FONTPICKERCTRL=yes
-  DEFAULT_wxUSE_GAUGE=yes
-  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_HYPERLINKCTRL=yes
-  DEFAULT_wxUSE_DATAVIEWCTRL=yes
-  DEFAULT_wxUSE_IMAGLIST=yes
-  DEFAULT_wxUSE_LISTBOOK=yes
-  DEFAULT_wxUSE_LISTBOX=yes
-  DEFAULT_wxUSE_LISTCTRL=yes
-  DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_RADIOBOX=yes
-  DEFAULT_wxUSE_RADIOBTN=yes
-  DEFAULT_wxUSE_SASH=yes
-  DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SEARCHCTRL=yes
-  DEFAULT_wxUSE_SLIDER=yes
-  DEFAULT_wxUSE_SPINBTN=yes
-  DEFAULT_wxUSE_SPINCTRL=yes
-  DEFAULT_wxUSE_SPLITTER=yes
-  DEFAULT_wxUSE_STATBMP=yes
-  DEFAULT_wxUSE_STATBOX=yes
-  DEFAULT_wxUSE_STATLINE=yes
-  DEFAULT_wxUSE_STATUSBAR=yes
-  DEFAULT_wxUSE_TAB_DIALOG=yes
-  DEFAULT_wxUSE_TOGGLEBTN=yes
-  DEFAULT_wxUSE_TOOLBAR=yes
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
-  DEFAULT_wxUSE_TOOLTIPS=yes
-  DEFAULT_wxUSE_TREEBOOK=yes
-  DEFAULT_wxUSE_TOOLBOOK=yes
-  DEFAULT_wxUSE_TREECTRL=yes
-  DEFAULT_wxUSE_POPUPWIN=yes
-  DEFAULT_wxUSE_TIPWINDOW=yes
-elif test "$wxUSE_CONTROLS" = "no"; then
-  DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_ANIMATIONCTRL=no
-  DEFAULT_wxUSE_BMPBUTTON=no
-  DEFAULT_wxUSE_BUTTON=no
-  DEFAULT_wxUSE_CALCTRL=no
-  DEFAULT_wxUSE_CARET=no
-  DEFAULT_wxUSE_COLLPANE=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_CHECKBOX=no
-  DEFAULT_wxUSE_CHECKLISTBOX=no
-  DEFAULT_wxUSE_CHOICE=no
-  DEFAULT_wxUSE_CHOICEBOOK=no
-  DEFAULT_wxUSE_COLOURPICKERCTRL=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_DATEPICKCTRL=no
-  DEFAULT_wxUSE_DISPLAY=no
-  DEFAULT_wxUSE_DETECT_SM=no
-  DEFAULT_wxUSE_DIRPICKERCTRL=no
-  DEFAULT_wxUSE_FILECTRL=no
-  DEFAULT_wxUSE_FILEPICKERCTRL=no
-  DEFAULT_wxUSE_FONTPICKERCTRL=no
-  DEFAULT_wxUSE_GAUGE=no
-  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_HYPERLINKCTRL=no
-  DEFAULT_wxUSE_DATAVIEWCTRL=no
-  DEFAULT_wxUSE_IMAGLIST=no
-  DEFAULT_wxUSE_LISTBOOK=no
-  DEFAULT_wxUSE_LISTBOX=no
-  DEFAULT_wxUSE_LISTCTRL=no
-  DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_RADIOBOX=no
-  DEFAULT_wxUSE_RADIOBTN=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SEARCHCTRL=no
-  DEFAULT_wxUSE_SLIDER=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPINCTRL=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STATBMP=no
-  DEFAULT_wxUSE_STATBOX=no
-  DEFAULT_wxUSE_STATLINE=no
-  DEFAULT_wxUSE_STATUSBAR=no
-  DEFAULT_wxUSE_TAB_DIALOG=no
-  DEFAULT_wxUSE_TOGGLEBTN=no
-  DEFAULT_wxUSE_TOOLBAR=no
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
-  DEFAULT_wxUSE_TOOLTIPS=no
-  DEFAULT_wxUSE_TREEBOOK=no
-  DEFAULT_wxUSE_TOOLBOOK=no
-  DEFAULT_wxUSE_TREECTRL=no
-  DEFAULT_wxUSE_POPUPWIN=no
-  DEFAULT_wxUSE_TIPWINDOW=no
+dnl even with --disable-controls, some may be enabled by an explicit
+dnl --enable-<control> later on the command line -- but by default all will be
+dnl disabled
+if test "$wxUSE_CONTROLS" = "no"; then
+    DEFAULT_wxUSE_ACCEL=no
+    DEFAULT_wxUSE_ANIMATIONCTRL=no
+    DEFAULT_wxUSE_BMPBUTTON=no
+    DEFAULT_wxUSE_BUTTON=no
+    DEFAULT_wxUSE_CALCTRL=no
+    DEFAULT_wxUSE_CARET=no
+    DEFAULT_wxUSE_CHECKBOX=no
+    DEFAULT_wxUSE_CHECKLISTBOX=no
+    DEFAULT_wxUSE_CHOICE=no
+    DEFAULT_wxUSE_CHOICEBOOK=no
+    DEFAULT_wxUSE_COLLPANE=no
+    DEFAULT_wxUSE_COLOURPICKERCTRL=no
+    DEFAULT_wxUSE_COMBOBOX=no
+    DEFAULT_wxUSE_COMBOBOX=no
+    DEFAULT_wxUSE_COMMANDLINKBUTTON=no
+    DEFAULT_wxUSE_DATAVIEWCTRL=no
+    DEFAULT_wxUSE_DATEPICKCTRL=no
+    DEFAULT_wxUSE_DETECT_SM=no
+    DEFAULT_wxUSE_DIRPICKERCTRL=no
+    DEFAULT_wxUSE_DISPLAY=no
+    DEFAULT_wxUSE_FILECTRL=no
+    DEFAULT_wxUSE_FILEPICKERCTRL=no
+    DEFAULT_wxUSE_FONTPICKERCTRL=no
+    DEFAULT_wxUSE_GAUGE=no
+    DEFAULT_wxUSE_GRID=no
+    DEFAULT_wxUSE_HEADERCTRL=no
+    DEFAULT_wxUSE_HYPERLINKCTRL=no
+    DEFAULT_wxUSE_IMAGLIST=no
+    DEFAULT_wxUSE_LISTBOOK=no
+    DEFAULT_wxUSE_LISTBOX=no
+    DEFAULT_wxUSE_LISTCTRL=no
+    DEFAULT_wxUSE_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_SEARCHCTRL=no
+    DEFAULT_wxUSE_SLIDER=no
+    DEFAULT_wxUSE_SPINBTN=no
+    DEFAULT_wxUSE_SPINCTRL=no
+    DEFAULT_wxUSE_SPLITTER=no
+    DEFAULT_wxUSE_STATBMP=no
+    DEFAULT_wxUSE_STATBOX=no
+    DEFAULT_wxUSE_STATLINE=no
+    DEFAULT_wxUSE_STATUSBAR=no
+    DEFAULT_wxUSE_TIPWINDOW=no
+    DEFAULT_wxUSE_TOGGLEBTN=no
+    DEFAULT_wxUSE_TOOLBAR=no
+    DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+    DEFAULT_wxUSE_TOOLBOOK=no
+    DEFAULT_wxUSE_TOOLTIPS=no
+    DEFAULT_wxUSE_TREEBOOK=no
+    DEFAULT_wxUSE_TREECTRL=no
  fi
  
  fi
  
+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(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
  WX_ARG_FEATURE(animatectrl, [  --enable-animatectrl    use wxAnimationCtrl class], wxUSE_ANIMATIONCTRL)
-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(bmpbutton,   [  --enable-bmpbutton      use wxBitmapButton class], wxUSE_BMPBUTTON)
  WX_ARG_FEATURE(bmpcombobox, [  --enable-bmpcombobox    use wxBitmapComboBox class], wxUSE_BITMAPCOMBOBOX)
+WX_ARG_FEATURE(button,      [  --enable-button         use wxButton class], wxUSE_BUTTON)
  WX_ARG_FEATURE(calendar,    [  --enable-calendar       use wxCalendarCtrl class], wxUSE_CALCTRL)
  WX_ARG_FEATURE(caret,       [  --enable-caret          use wxCaret class], wxUSE_CARET)
  WX_ARG_FEATURE(checkbox,    [  --enable-checkbox       use wxCheckBox class], wxUSE_CHECKBOX)
  WX_ARG_FEATURE(calendar,    [  --enable-calendar       use wxCalendarCtrl class], wxUSE_CALCTRL)
  WX_ARG_FEATURE(caret,       [  --enable-caret          use wxCaret class], wxUSE_CARET)
  WX_ARG_FEATURE(checkbox,    [  --enable-checkbox       use wxCheckBox class], wxUSE_CHECKBOX)
@@ -928,27 +939,33 @@ 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(datepick,    [  --enable-datepick       use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL)
+WX_ARG_FEATURE(detect_sm,   [  --enable-detect_sm      use code to detect X11 session manager], wxUSE_DETECT_SM)
  WX_ARG_FEATURE(dirpicker,   [  --enable-dirpicker      use wxDirPickerCtrl class], wxUSE_DIRPICKERCTRL)
  WX_ARG_FEATURE(display,     [  --enable-display        use wxDisplay class], wxUSE_DISPLAY)
  WX_ARG_FEATURE(dirpicker,   [  --enable-dirpicker      use wxDirPickerCtrl class], wxUSE_DIRPICKERCTRL)
  WX_ARG_FEATURE(display,     [  --enable-display        use wxDisplay class], wxUSE_DISPLAY)
-WX_ARG_FEATURE(detect_sm,   [  --enable-detect_sm      use code to detect X11 session manager], wxUSE_DETECT_SM)
  WX_ARG_FEATURE(editablebox, [  --enable-editablebox    use wxEditableListBox class], wxUSE_EDITABLELISTBOX)
  WX_ARG_FEATURE(editablebox, [  --enable-editablebox    use wxEditableListBox class], wxUSE_EDITABLELISTBOX)
-WX_ARG_FEATURE(filepicker,  [  --enable-filepicker     use wxFilePickerCtrl class], wxUSE_FILEPICKERCTRL)
  WX_ARG_FEATURE(filectrl,    [  --enable-filectrl       use wxFileCtrl class], wxUSE_FILECTRL)
  WX_ARG_FEATURE(filectrl,    [  --enable-filectrl       use wxFileCtrl class], wxUSE_FILECTRL)
+WX_ARG_FEATURE(filepicker,  [  --enable-filepicker     use wxFilePickerCtrl class], wxUSE_FILEPICKERCTRL)
  WX_ARG_FEATURE(fontpicker,  [  --enable-fontpicker     use wxFontPickerCtrl class], wxUSE_FONTPICKERCTRL)
  WX_ARG_FEATURE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
  WX_ARG_FEATURE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
  WX_ARG_FEATURE(fontpicker,  [  --enable-fontpicker     use wxFontPickerCtrl class], wxUSE_FONTPICKERCTRL)
  WX_ARG_FEATURE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
  WX_ARG_FEATURE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
-WX_ARG_FEATURE(dataviewctrl,[  --enable-dataviewctrl   use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL)
+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(hyperlink,   [  --enable-hyperlink      use wxHyperlinkCtrl class], wxUSE_HYPERLINKCTRL)
  WX_ARG_FEATURE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
+WX_ARG_FEATURE(infobar,     [  --enable-infobar        use wxInfoBar class], wxUSE_INFOBAR)
  WX_ARG_FEATURE(listbook,    [  --enable-listbook       use wxListbook class], wxUSE_LISTBOOK)
  WX_ARG_FEATURE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
  WX_ARG_FEATURE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
  WX_ARG_FEATURE(notebook,    [  --enable-notebook       use wxNotebook class], wxUSE_NOTEBOOK)
  WX_ARG_FEATURE(notifmsg,    [  --enable-notifmsg       use wxNotificationMessage class], wxUSE_NOTIFICATION_MESSAGE)
  WX_ARG_FEATURE(odcombobox,  [  --enable-odcombobox     use wxOwnerDrawnComboBox class], wxUSE_ODCOMBOBOX)
  WX_ARG_FEATURE(listbook,    [  --enable-listbook       use wxListbook class], wxUSE_LISTBOOK)
  WX_ARG_FEATURE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
  WX_ARG_FEATURE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
  WX_ARG_FEATURE(notebook,    [  --enable-notebook       use wxNotebook class], wxUSE_NOTEBOOK)
  WX_ARG_FEATURE(notifmsg,    [  --enable-notifmsg       use wxNotificationMessage class], wxUSE_NOTIFICATION_MESSAGE)
  WX_ARG_FEATURE(odcombobox,  [  --enable-odcombobox     use wxOwnerDrawnComboBox class], wxUSE_ODCOMBOBOX)
+WX_ARG_FEATURE(popupwin,    [  --enable-popupwin       use wxPopUpWindow class], wxUSE_POPUPWIN)
  WX_ARG_FEATURE(radiobox,    [  --enable-radiobox       use wxRadioBox class], wxUSE_RADIOBOX)
  WX_ARG_FEATURE(radiobtn,    [  --enable-radiobtn       use wxRadioButton class], wxUSE_RADIOBTN)
  WX_ARG_FEATURE(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(searchctrl,  [  --enable-searchctrl     use wxSearchCtrl class], wxUSE_SEARCHCTRL)
  WX_ARG_FEATURE(sash,        [  --enable-sash           use wxSashWindow class], wxUSE_SASH)
  WX_ARG_FEATURE(scrollbar,   [  --enable-scrollbar      use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR)
  WX_ARG_FEATURE(searchctrl,  [  --enable-searchctrl     use wxSearchCtrl class], wxUSE_SEARCHCTRL)
@@ -961,17 +978,15 @@ WX_ARG_FEATURE(statbox,     [  --enable-statbox        use wxStaticBox class], w
  WX_ARG_FEATURE(statline,    [  --enable-statline       use wxStaticLine class], wxUSE_STATLINE)
  WX_ARG_FEATURE(stattext,    [  --enable-stattext       use wxStaticText class], wxUSE_STATTEXT)
  WX_ARG_FEATURE(statusbar,   [  --enable-statusbar      use wxStatusBar class], wxUSE_STATUSBAR)
  WX_ARG_FEATURE(statline,    [  --enable-statline       use wxStaticLine class], wxUSE_STATLINE)
  WX_ARG_FEATURE(stattext,    [  --enable-stattext       use wxStaticText class], wxUSE_STATTEXT)
  WX_ARG_FEATURE(statusbar,   [  --enable-statusbar      use wxStatusBar class], wxUSE_STATUSBAR)
-WX_ARG_FEATURE(tabdialog,   [  --enable-tabdialog      use wxTabControl class], wxUSE_TAB_DIALOG)
  WX_ARG_FEATURE(taskbaricon, [  --enable-taskbaricon    use wxTaskBarIcon class], wxUSE_TASKBARICON)
  WX_ARG_FEATURE(taskbaricon, [  --enable-taskbaricon    use wxTaskBarIcon class], wxUSE_TASKBARICON)
+WX_ARG_FEATURE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
  WX_ARG_FEATURE(textctrl,    [  --enable-textctrl       use wxTextCtrl class], wxUSE_TEXTCTRL)
  WX_ARG_FEATURE(textctrl,    [  --enable-textctrl       use wxTextCtrl class], wxUSE_TEXTCTRL)
+WX_ARG_FEATURE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)
  WX_ARG_FEATURE(togglebtn,   [  --enable-togglebtn      use wxToggleButton class], wxUSE_TOGGLEBTN)
  WX_ARG_FEATURE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUSE_TOOLBAR)
  WX_ARG_FEATURE(togglebtn,   [  --enable-togglebtn      use wxToggleButton class], wxUSE_TOGGLEBTN)
  WX_ARG_FEATURE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUSE_TOOLBAR)
-WX_ARG_FEATURE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
-WX_ARG_FEATURE(treebook,    [  --enable-treebook       use wxTreebook class], wxUSE_TREEBOOK)
  WX_ARG_FEATURE(toolbook,    [  --enable-toolbook       use wxToolbook class], wxUSE_TOOLBOOK)
  WX_ARG_FEATURE(toolbook,    [  --enable-toolbook       use wxToolbook class], wxUSE_TOOLBOOK)
+WX_ARG_FEATURE(treebook,    [  --enable-treebook       use wxTreebook class], wxUSE_TREEBOOK)
  WX_ARG_FEATURE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)
  WX_ARG_FEATURE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)
-WX_ARG_FEATURE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)
-WX_ARG_FEATURE(popupwin,    [  --enable-popupwin       use wxPopUpWindow class], wxUSE_POPUPWIN)
  
  dnl ---------------------------------------------------------------------------
  dnl common dialogs
  
  dnl ---------------------------------------------------------------------------
  dnl common dialogs
@@ -1008,6 +1023,7 @@ 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)
  
  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
@@ -1059,7 +1075,7 @@ dnl   defines CFLAGS
  dnl
  dnl this magic incantation is needed to prevent AC_PROG_CC from setting the
  dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add
  dnl
  dnl this magic incantation is needed to prevent AC_PROG_CC from setting the
  dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add
-dnl -g and -O flags ourselves below
+dnl (if not already present in C*FLAGS) the -g and -O flags ourselves below
  CFLAGS=${CFLAGS:=}
  AC_BAKEFILE_PROG_CC
  
  CFLAGS=${CFLAGS:=}
  AC_BAKEFILE_PROG_CC
  
@@ -1095,10 +1111,20 @@ if test "x$SUNCXX" != xyes; then
      fi
  fi
  
      fi
  fi
  
+dnl ---------------------------------------------------------------------------
+dnl Mac-specific SDK/architectures checks
+dnl ---------------------------------------------------------------------------
+
+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.
  dnl Support the old --enable-universal_binary in case anyone was using it.
-#if test "$wxUSE_MAC" = 1; then
      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" != xno ; then
          dnl --enable-universal_binary uses a default SDK (currently 10.4u)
          dnl --enable-universal_binary=SDK names a path to an SDK
@@ -1127,12 +1153,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
@@ -1155,7 +1182,12 @@ dnl Support the old --enable-universal_binary in case anyone was using it.
          AC_MSG_WARN([Disabling precompiled headers due to universal binary build.])
          bk_use_pch=no
      fi
          AC_MSG_WARN([Disabling precompiled headers due to universal binary build.])
          bk_use_pch=no
      fi
-#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 Set up the Mac OS X SDK.  We do this early so configure tests will occur
  dnl with the SDK in place.
@@ -1216,14 +1248,68 @@ 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
-    if test "$wxUSE_MAC" = 1; 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
+        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
+
+    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"
+if test "x$wxUSE_MACOSX_VERSION_MIN" == "x10.4"; then
+    NEEDS_GCC40="yes"
+fi
+
+if test "$wxUSE_OSX_CARBON" = 1; then
+    NEEDS_GCC40="yes"
+fi
+
+if test "x$NEEDS_GCC40" == "xyes"; then
+    # gcc 4.2 cannot compile 10.4 compatible code, so if the user is using it
+    # and wants 10.4 compatible code, then 'downgrade' to 4.0
+    # This is also the simplest way to get 32-bit binaries on Snow Leopard.
+    if test "x$CC" = "xgcc"; 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."
+            CC="/usr/bin/gcc-4.0"
+        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"
+        fi
      fi
  fi
  
  if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
      fi
  fi
  
  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\""
@@ -1245,6 +1331,7 @@ if test "x$retest_macosx_linking" = "xyes"; then
      AC_LANG_POP()
  fi
  
      AC_LANG_POP()
  fi
  
+fi dnl wxUSE_MAC
  
  case "${host}" in
  
  
  case "${host}" in
  
@@ -1685,76 +1772,79 @@ fi
  
  fi dnl wxUSE_VARARG_MACROS == yes
  
  
  fi dnl wxUSE_VARARG_MACROS == yes
  
+
  dnl check for large file support
  dnl check for large file support
+LARGEFILE_CPPFLAGS=
  AC_SYS_LARGEFILE
  AC_SYS_LARGEFILE
+if test "$ac_cv_sys_file_offset_bits" = "64"; then
+    LARGEFILE_CPPFLAGS="-D_FILE_OFFSET_BITS=64"
+elif test "$ac_cv_sys_large_files" = 1; then
+    LARGEFILE_CPPFLAGS="-D_LARGE_FILES"
+fi
  
  dnl we need to define _FILE_OFFSET_BITS or _LARGE_FILES on the compiler command
  dnl line because otherwise the system headers risk being included before
  dnl wx/defs.h which defines these constants leading to inconsistent
  dnl sizeof(off_t) in different source files of the same program and linking
  dnl problems
  
  dnl we need to define _FILE_OFFSET_BITS or _LARGE_FILES on the compiler command
  dnl line because otherwise the system headers risk being included before
  dnl wx/defs.h which defines these constants leading to inconsistent
  dnl sizeof(off_t) in different source files of the same program and linking
  dnl problems
-if test "x$wx_largefile" = "xyes"; then
-    if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
-
-        dnl We get "Large Files (ILP32) not supported in strict ANSI mode."
-        dnl #error from HP standard headers unless __STDC_EXT__ is defined.
-        dnl The compiler should define it automatically, but some old g++
-        dnl versions don't define it, so test and add it if necessary. AFAIK
-        dnl the problem only affects the C++ compiler so it is added to
-        dnl CXXFLAGS only.
-        if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
-            AC_CACHE_CHECK(
-                [if -D__STDC_EXT__ is required],
-                wx_cv_STDC_EXT_required,
-                [
-                    AC_LANG_PUSH(C++)
-                    AC_TRY_COMPILE(
-                        [],
-                        [
-                            #ifndef __STDC_EXT__
-                                choke me
-                            #endif
-                        ],
-                        wx_cv_STDC_EXT_required=no,
-                        wx_cv_STDC_EXT_required=yes
-                    )
-                    AC_LANG_POP()
-                ]
-            )
-            if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
-                WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
-            fi
+if test -n "$LARGEFILE_CPPFLAGS"; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $LARGEFILE_CPPFLAGS"
+
+    dnl We get "Large Files (ILP32) not supported in strict ANSI mode."
+    dnl #error from HP standard headers unless __STDC_EXT__ is defined.
+    dnl The compiler should define it automatically, but some old g++
+    dnl versions don't define it, so test and add it if necessary. AFAIK
+    dnl the problem only affects the C++ compiler so it is added to
+    dnl CXXFLAGS only.
+    if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
+        AC_CACHE_CHECK(
+            [if -D__STDC_EXT__ is required],
+            wx_cv_STDC_EXT_required,
+            [
+                AC_LANG_PUSH(C++)
+                AC_TRY_COMPILE(
+                    [],
+                    [
+                        #ifndef __STDC_EXT__
+                            choke me
+                        #endif
+                    ],
+                    wx_cv_STDC_EXT_required=no,
+                    wx_cv_STDC_EXT_required=yes
+                )
+                AC_LANG_POP()
+            ]
+        )
+        if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
+            WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
          fi
          fi
-    else
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGE_FILES"
-    fi
-    dnl AC_FUNC_FSEEKO sets HAVE_FSEEKO and $ac_cv_sys_largefile_source
-    AC_FUNC_FSEEKO
-    if test "$ac_cv_sys_largefile_source" != no; then
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
      fi
  fi
  
      fi
  fi
  
+dnl AC_FUNC_FSEEKO sets HAVE_FSEEKO and $ac_cv_sys_largefile_source
+dnl
+dnl it may be affected by large file flags (this happens under HP-UX 11 for
+dnl example) so set them before using it and also use C++ to ensure that we get
+dnl errors, not warnings, about the missing functions
+AC_LANG_PUSH(C++)
+old_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LARGEFILE_CPPFLAGS"
+AC_FUNC_FSEEKO
+CPPFLAGS="$old_CPPFLAGS"
+AC_LANG_POP()
+if test "$ac_cv_sys_largefile_source" != no; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
+fi
+
  dnl check for bytesex stuff (don't use AC_C_BIGENDIAN to allow cross-compiling)
  WX_C_BIGENDIAN
  
  dnl check for iostream (as opposed to iostream.h) standard header
  WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH))
  
  dnl check for bytesex stuff (don't use AC_C_BIGENDIAN to allow cross-compiling)
  WX_C_BIGENDIAN
  
  dnl check for iostream (as opposed to iostream.h) standard header
  WX_CPP_NEW_HEADERS(, AC_DEFINE(wxUSE_IOSTREAMH))
  
-dnl check whether C++ compiler supports bool built-in type
-WX_CPP_BOOL
-
  dnl check whether C++ compiler supports explicit keyword
  WX_CPP_EXPLICIT
  
  dnl check whether C++ compiler supports explicit keyword
  WX_CPP_EXPLICIT
  
-dnl check whether C++ compiler supports C++ casts
-AC_CXX_CONST_CAST
-AC_CXX_REINTERPRET_CAST
-AC_CXX_STATIC_CAST
-dnl we don't use HAVE_DYNAMIC_CAST anywhere right now...
-dnl AC_CXX_DYNAMIC_CAST
-
  dnl With Sun CC, temporaries have block scope by default. This flag is needed
  dnl to get the expression scope behaviour that conforms to the standard.
  if test "x$SUNCXX" = xyes; then
  dnl With Sun CC, temporaries have block scope by default. This flag is needed
  dnl to get the expression scope behaviour that conforms to the standard.
  if test "x$SUNCXX" = xyes; then
@@ -1769,18 +1859,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
@@ -1794,7 +1923,11 @@ fi
  if test "x$HPCXX" = "xyes"; then
      dnl 2340: "value copied to temporary, reference to temporary used": very
      dnl       painful as triggered by any occurrence of user-defined conversion
  if test "x$HPCXX" = "xyes"; then
      dnl 2340: "value copied to temporary, reference to temporary used": very
      dnl       painful as triggered by any occurrence of user-defined conversion
-    CXXFLAGS="+W 2340 $CXXFLAGS"
+    dnl 4232: "conversion from 'Foo *' to a more strictly aligned type 'Bar *'
+    dnl       may cause misaligned access": this might indicate a real problem
+    dnl       but any use of GTK+ cast macros results in it so it's unusable
+    dnl       for wxGTK code
+    CXXFLAGS="+W 2340,4232 $CXXFLAGS"
  fi
  
  dnl DEC/Compaq/HP cxx warnings
  fi
  
  dnl DEC/Compaq/HP cxx warnings
@@ -2022,6 +2155,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
  
@@ -2046,7 +2181,9 @@ SEARCH_INCLUDE="\
      /usr/local/include        \
      /usr/local/X11/include    \
      /usr/local/include/X11    \
      /usr/local/include        \
      /usr/local/X11/include    \
      /usr/local/include/X11    \
+    /usr/local/X11R7/include  \
      /usr/local/X11R6/include  \
      /usr/local/X11R6/include  \
+    /usr/local/include/X11R7  \
      /usr/local/include/X11R6  \
                                \
      /usr/Motif-2.1/include    \
      /usr/local/include/X11R6  \
                                \
      /usr/Motif-2.1/include    \
@@ -2058,9 +2195,11 @@ SEARCH_INCLUDE="\
                                \
      /usr/include/Xm           \
                                \
                                \
      /usr/include/Xm           \
                                \
+    /usr/X11R7/include        \
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
                                \
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
                                \
+    /usr/include/X11R7        \
      /usr/include/X11R6        \
                                \
      /usr/X11/include          \
      /usr/include/X11R6        \
                                \
      /usr/X11/include          \
@@ -2453,7 +2592,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
@@ -2705,15 +2844,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
@@ -2752,7 +2889,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
@@ -2840,7 +2977,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
              ]
          )
@@ -2877,47 +3014,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"
@@ -2941,6 +3102,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
@@ -3431,10 +3595,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
@@ -3443,14 +3607,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
@@ -3554,14 +3731,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
@@ -3569,45 +3745,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
@@ -3633,15 +3812,16 @@ dnl OpenGL libraries
  dnl ---------------------------------------------------------------------------
  
  USE_OPENGL=0
  dnl ---------------------------------------------------------------------------
  
  USE_OPENGL=0
-if test "$wxUSE_OPENGL" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
-        wxUSE_OPENGL="no"
-    elif test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
+if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
+
+    dnl look in glcanvas.h for the list of platforms supported by wxGlCanvas:
+
+    if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
          OPENGL_LIBS="-framework OpenGL -framework AGL"
      elif test "$wxUSE_MSW" = 1; then
          OPENGL_LIBS="-lopengl32 -lglu32"
          OPENGL_LIBS="-framework OpenGL -framework AGL"
      elif test "$wxUSE_MSW" = 1; then
          OPENGL_LIBS="-lopengl32 -lglu32"
-    else
+    elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then
+
          dnl adjust CPPFLAGS to include GL/gl.h location if necessary
          dnl (/opt/graphics/OpenGL is for HP-UX systems, bug 925307)
          AC_MSG_CHECKING([for OpenGL headers])
          dnl adjust CPPFLAGS to include GL/gl.h location if necessary
          dnl (/opt/graphics/OpenGL is for HP-UX systems, bug 925307)
          AC_MSG_CHECKING([for OpenGL headers])
@@ -3708,11 +3888,25 @@ if test "$wxUSE_OPENGL" = "yes"; then
          [ ])
  
          if test "x$OPENGL_LIBS" = "x"; then
          [ ])
  
          if test "x$OPENGL_LIBS" = "x"; then
-            dnl it should be an error and not a warning because OpenGL is not on
-            dnl by default and so if it had been explicitly requested, we
-            dnl shouldn't just fall back to compiling the library without it
-            AC_MSG_ERROR(OpenGL libraries not available)
+            if test "$wxUSE_OPENGL" = "yes"; then
+                AC_MSG_ERROR([OpenGL libraries not available])
+            else
+                dnl case wxUSE_OPENGL=auto
+                AC_MSG_WARN([OpenGL libraries not available, disabling support for OpenGL])
+                wxUSE_OPENGL=no
+                USE_OPENGL=0
+            fi
          fi
          fi
+    else
+        AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
+        wxUSE_OPENGL="no"
+    fi
+
+    if test "$wxUSE_OPENGL" = "auto"; then
+        dnl if the OpenGL libraries were unavailable, this would have been
+        dnl changed to "no" above, if it wasn't, change it to "yes" as we've
+        dnl verified that we can indeed use OpenGL
+        wxUSE_OPENGL=yes
      fi
  
      if test "$wxUSE_OPENGL" = "yes"; then
      fi
  
      if test "$wxUSE_OPENGL" = "yes"; then
@@ -3801,20 +3995,28 @@ if test "$wxUSE_SHARED" = "yes"; then
        ;;
  
        *-*-darwin* )
        ;;
  
        *-*-darwin* )
-        install_name_tool=`which install_name_tool`
+        install_name_tool=`which ${HOST_PREFIX}install_name_tool`
          if test "$install_name_tool" -a -x "$install_name_tool"; then
          if test "$install_name_tool" -a -x "$install_name_tool"; then
-            SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+            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\$'\`
              cat <<EOF >change-install-names
  #!/bin/sh
  libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
-inst_cmd="install_name_tool "
  for i in \${libnames} ; do
  for i in \${libnames} ; do
-    inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+    ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
+    for dep in \${libnames} ; do
+        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
+    done
  done
  done
-\${inst_cmd} \${3}
  EOF
              chmod +x change-install-names
  EOF
              chmod +x change-install-names
+            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
          fi
          fi
+
+        dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
+        dnl "install_name_tool: changing install names can't be redone for: the_exe_name
+        dnl (for architecture ppc) because larger updated load commands do not fit
+        dnl (the program must be relinked)"
+        HEADER_PAD_OPTION="-headerpad_max_install_names"
        ;;
  
        *-*-cygwin* | *-*-mingw32* )
        ;;
  
        *-*-cygwin* | *-*-mingw32* )
@@ -3834,7 +4036,7 @@ EOF
  
      if test $wxUSE_RPATH = "no"; then
          SAMPLES_RPATH_FLAG=''
  
      if test $wxUSE_RPATH = "no"; then
          SAMPLES_RPATH_FLAG=''
-        SAMPLES_RPATH_POSTLINK=''
+        DYLIB_PATH_POSTLINK=''
          WXCONFIG_RPATH=''
      fi
  
          WXCONFIG_RPATH=''
      fi
  
@@ -3857,15 +4059,6 @@ if test "$wxUSE_UNICODE" = "yes"; then
      UNICODE=1
  fi
  
      UNICODE=1
  fi
  
-lib_debug_suffix=
-WX_DEBUGTYPE="release"
-DEBUG_FLAG=0
-if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-    lib_debug_suffix=d
-    WX_DEBUGTYPE="debug"
-    DEBUG_FLAG=1
-fi
-
  WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
  WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
  
  WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
  WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
  
@@ -3874,31 +4067,30 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then
      DEBUG_INFO=1
  fi
  
      DEBUG_INFO=1
  fi
  
-WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'`
-
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'`
  
  
-TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
  
  
-if test "$cross_compiling" = "yes"; then
-    HOST_SUFFIX="-$host_alias"
-    TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX"
-    TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME"
-fi
+TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
  
  dnl library link name
  
  dnl library link name
-dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix.
+dnl These just save us from exporting lib_{unicode,flavour}_suffix.
  dnl If we ever need to do that, we won't need to keep these.
  dnl If we ever need to do that, we won't need to keep these.
-WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
+else
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
+fi
  if test "${TOOLKIT_DIR}" = "os2"; then
  if test "${TOOLKIT_DIR}" = "os2"; then
-    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
  else
  else
-    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
  fi
  
  
  
  fi
  
  
  
-if test "$wxUSE_COCOA" = 1; then
+if test "$wxUSE_OLD_COCOA" = 1; then
      AC_LANG_SAVE
      AC_WX_LANG_OBJECTIVEC
  dnl Recent AppKit/NSEvent.h include parts of IOKit which eventually
      AC_LANG_SAVE
      AC_WX_LANG_OBJECTIVEC
  dnl Recent AppKit/NSEvent.h include parts of IOKit which eventually
@@ -4073,7 +4265,7 @@ if test "$wxUSE_WCHAR_T" = "yes"; then
          AC_DEFINE(HAVE_WCSLEN)
      fi
  
          AC_DEFINE(HAVE_WCSLEN)
      fi
  
-    AC_CHECK_FUNCS([wcsdup])
+    AC_CHECK_FUNCS([wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp])
  
      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 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
@@ -4758,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
@@ -4766,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
@@ -4817,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])
@@ -4831,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*)
@@ -5003,23 +5221,59 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
          fi
        fi
  
          fi
        fi
  
-      dnl test for compiler thread-specific variables support
-      AC_CACHE_CHECK([for __thread keyword],
-                     wx_cv_cc___thread,
-      [
-          AC_TRY_COMPILE([#include <pthread.h>],
+      if test "$wxUSE_COMPILER_TLS" = "auto"; then
+          if test "$USE_NETBSD" = 1; then
+              AC_MSG_WARN([Disabling TLS under NetBSD, please contact wx-dev if it works now])
+              wxUSE_COMPILER_TLS=no
+          else
+              wxUSE_COMPILER_TLS=yes
+          fi
+      fi
+
+      if test "$wxUSE_COMPILER_TLS" = "yes"; then
+          dnl test for compiler thread-specific variables support
+          AC_CACHE_CHECK([for __thread keyword],
+                         wx_cv_cc___thread,
                [
                [
-                  static __thread int n = 0;
-                  static __thread int *p = 0;
-              ],
-              wx_cv_cc___thread=yes,
-              wx_cv_cc___thread=no
+                  AC_TRY_COMPILE([#include <pthread.h>],
+                      [
+                          static __thread int n = 0;
+                          static __thread int *p = 0;
+                      ],
+                      wx_cv_cc___thread=yes,
+                      wx_cv_cc___thread=no
+                  )
+              ]
            )
            )
-      ])
  
  
-      if test "$wx_cv_cc___thread" = "yes"; then
-        AC_DEFINE(HAVE___THREAD_KEYWORD)
-      fi
+          if test "$wx_cv_cc___thread" = "yes"; then
+              AX_GXX_VERSION
+              if test -n "$ax_cv_gxx_version"; then
+                  dnl g++ supports __thread since at least version 3.3 but its support
+                  dnl seems to be broken until 4.1, see
+                  dnl   http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/108388
+                  dnl
+                  dnl NB: we still need to test __thread support with
+                  dnl     AC_TRY_COMPILE above even for g++ 4 as it doesn't
+                  dnl     support it for all architectures (e.g. it doesn't
+                  dnl     work under OS X)
+                  AC_MSG_CHECKING([whether __thread support in g++ is usable])
+                  case "$ax_cv_gxx_version" in
+                    1.* | 2.* | 3.* )
+                        AC_MSG_RESULT([no, it's broken])
+                        wx_cv_cc___thread=no
+                        ;;
+                    *)
+                        AC_MSG_RESULT([yes, it works])
+                        ;;
+                  esac
+              fi
+          fi
+
+          if test "$wx_cv_cc___thread" = "yes"; then
+            AC_DEFINE(HAVE___THREAD_KEYWORD)
+          fi
+        fi
      fi
  
  dnl from if !MSW
      fi
  
  dnl from if !MSW
@@ -5132,7 +5386,13 @@ fi
  dnl DEBUG_CFLAGS contains debugging options (supposed to be the same for C and C++
  dnl compilers: we'd need a separate DEBUG_CXXFLAGS if this is ever not the case)
  DEBUG_CFLAGS=
  dnl DEBUG_CFLAGS contains debugging options (supposed to be the same for C and C++
  dnl compilers: we'd need a separate DEBUG_CXXFLAGS if this is ever not the case)
  DEBUG_CFLAGS=
-if test "$wxUSE_DEBUG_INFO" = "yes" ; then
+if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then
+    dnl the CXXFLAGS or the CFLAGS variable already contains the -g flag
+    dnl (e.g. it was specified by the user before running configure); since
+    dnl later they will be merged with DEBUG_CFLAGS, don't set the -g option
+    dnl in DEBUG_CFLAGS to avoid (possibly different) flag duplicates
+    AC_MSG_WARN([CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option])
+elif test "$wxUSE_DEBUG_INFO" = "yes" ; then
      DEBUG_CFLAGS="-g"
  fi
  
      DEBUG_CFLAGS="-g"
  fi
  
@@ -5143,10 +5403,9 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then
      fi
  fi
  
      fi
  fi
  
-if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
-    AC_DEFINE(WXDEBUG)
-    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__"
-else
+if test "$wxUSE_DEBUG_FLAG" = "no" ; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0"
+
      if test "$wxUSE_GTK" = 1 ; then
          if test "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"
@@ -5173,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"
@@ -5205,29 +5467,37 @@ fi
  
  dnl C/C++ compiler option for optimization (supposed to be the same for both)
  OPTIMISE_CFLAGS=
  
  dnl C/C++ compiler option for optimization (supposed to be the same for both)
  OPTIMISE_CFLAGS=
-if test "$wxUSE_OPTIMISE" = "no" ; then
-    if test "$GCC" = yes ; then
-        dnl use -O0 because compiling with it is faster than compiling with no
-        dnl optimization options at all (at least with g++ 3.2)
-        OPTIMISE_CFLAGS="-O0"
-    fi
+if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then
+    dnl the CXXFLAGS or the CFLAGS variable already contains -O optimization flag
+    dnl (e.g. it was specified by the user before running configure); since
+    dnl later they will be merged with OPTIMISE_CFLAGS, don't set the -O option
+    dnl in OPTIMISE_CFLAGS to avoid (possibly different) flag duplicates
+    AC_MSG_WARN([CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option])
  else
  else
-    if test "$GCC" = yes ; then
-        case "${host}" in
-            *-pc-os2_emx | *-pc-os2-emx )
-                dnl Not all of the supported gcc versions understand
-                dnl -fstrict-aliasing and none actually needs it (yet).
-                OPTIMISE_CFLAGS="-O2"
-            ;;
-            *)
-                dnl Switch on optimisation but keep strict-aliasing off for
-                dnl now (see -fstrict-aliasing in the gcc manual). When it is
-                dnl switched back on consider using -Wstrict-aliasing=2.
-                OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
-            ;;
-        esac
+    if test "$wxUSE_OPTIMISE" = "no" ; then
+        if test "$GCC" = yes ; then
+            dnl use -O0 because compiling with it is faster than compiling with no
+            dnl optimization options at all (at least with g++ 3.2)
+            OPTIMISE_CFLAGS="-O0"
+        fi
      else
      else
-        OPTIMISE_CFLAGS="-O"
+        if test "$GCC" = yes ; then
+            case "${host}" in
+                *-pc-os2_emx | *-pc-os2-emx )
+                    dnl Not all of the supported gcc versions understand
+                    dnl -fstrict-aliasing and none actually needs it (yet).
+                    OPTIMISE_CFLAGS="-O2"
+                ;;
+                *)
+                    dnl Switch on optimisation but keep strict-aliasing off for
+                    dnl now (see -fstrict-aliasing in the gcc manual). When it is
+                    dnl switched back on consider using -Wstrict-aliasing=2.
+                    OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
+                ;;
+            esac
+        else
+            OPTIMISE_CFLAGS="-O"
+        fi
      fi
  fi
  
      fi
  fi
  
@@ -5378,6 +5648,40 @@ 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
+    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 ---------------------------------------------------------------------------
@@ -5390,6 +5694,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
@@ -5535,12 +5843,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
  
@@ -5591,6 +5917,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)
@@ -5693,7 +6023,7 @@ if test "$wxUSE_INTL" = "yes" ; then
    fi
  fi
  
    fi
  fi
  
-if test "$wxUSE_XLOCALE" == "yes" ; then
+if test "$wxUSE_XLOCALE" = "yes" ; then
      AC_DEFINE(wxUSE_XLOCALE)
      AC_CHECK_TYPES(locale_t,,,
                     [#include <xlocale.h>
      AC_DEFINE(wxUSE_XLOCALE)
      AC_CHECK_TYPES(locale_t,,,
                     [#include <xlocale.h>
@@ -5813,65 +6143,6 @@ if test "$ac_cv_func_gettimeofday" = "yes"; then
  fi
  
  if test "$wxUSE_DATETIME" = "yes"; then
  fi
  
  if test "$wxUSE_DATETIME" = "yes"; then
-    dnl check for strptime and for its declaration as some systems lack it
-    AC_CHECK_FUNC(strptime)
-    if test "$ac_cv_func_strptime" = "yes"; then
-        AC_CACHE_CHECK([for strptime declaration], wx_cv_func_strptime_decl,
-            [
-                AC_LANG_PUSH(C++)
-                AC_TRY_COMPILE(
-                    [
-                        #include <time.h>
-                    ],
-                    [
-                        struct tm t;
-                        strptime("foo", "bar", &t);
-                    ],
-                    wx_cv_func_strptime_decl=yes,
-                    wx_cv_func_strptime_decl=no
-                )
-                AC_LANG_POP()
-            ]
-        )
-    fi
-    if test "$wx_cv_func_strptime_decl" = "yes"; then
-        AC_DEFINE(HAVE_STRPTIME_DECL)
-    else
-        wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
-    fi
-    if test "$ac_cv_func_strptime" = "yes"; then
-        dnl strptime() behaviour doesn't conform to POSIX under Mac OS X <
-        dnl 10.5 and possibly other BSD variants, check that strptime() we
-        dnl have fails to parse format when the string doesn't match it instea
-        dnl of just stopping immediately and returning non-NULL
-        AC_CACHE_CHECK([whether strptime() fails on invalid strings],
-            wx_cv_func_strptime_ok,
-            [AC_RUN_IFELSE(
-                [
-                    #include <stdlib.h>
-                    #include <time.h>
-                    #include "confdefs.h"
-
-                    $wx_strptime_decl
-
-                    int main()
-                    {
-                        struct tm t;
-                        return !!strptime("", "%x", &t);
-                    }
-                ],
-                wx_cv_func_strptime_ok=yes,
-                wx_cv_func_strptime_ok=no,
-                dnl be pessimistic when cross-compiling
-                wx_cv_func_strptime_ok=no
-            )]
-        )
-
-        if test "$wx_cv_func_strptime_ok" = "yes"; then
-            AC_DEFINE(HAVE_STRPTIME)
-        fi
-    fi
-
      dnl check for timezone variable
      dnl   doesn't exist under Darwin / Mac OS X which uses tm_gmtoff instead
      AC_CACHE_CHECK(for timezone variable in <time.h>,
      dnl check for timezone variable
      dnl   doesn't exist under Darwin / Mac OS X which uses tm_gmtoff instead
      AC_CACHE_CHECK(for timezone variable in <time.h>,
@@ -6333,11 +6604,7 @@ if test "$wxUSE_HELP" = "yes"; then
  fi
  
  if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
  fi
  
  if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-        AC_MSG_WARN(Printing support cannot be used without constraints so it won't be compiled without it)
-    else
-        AC_DEFINE(wxUSE_PRINTING_ARCHITECTURE)
-    fi
+    AC_DEFINE(wxUSE_PRINTING_ARCHITECTURE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
  fi
  
@@ -6473,6 +6740,10 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" -o "$wxUSE_CLIPBOARD" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
  fi
  
+if test "$wxUSE_CLIPBOARD" = "yes"; then
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS clipboard"
+fi
+
  if test "$wxUSE_SPLINES" = "yes" ; then
    AC_DEFINE(wxUSE_SPLINES)
  fi
  if test "$wxUSE_SPLINES" = "yes" ; then
    AC_DEFINE(wxUSE_SPLINES)
  fi
@@ -6481,6 +6752,11 @@ 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
+
  dnl ---------------------------------------------------------------------------
  dnl GUI controls
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl GUI controls
  dnl ---------------------------------------------------------------------------
@@ -6539,6 +6815,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
@@ -6614,6 +6895,11 @@ if test "$wxUSE_GRID" = "yes"; then
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
  fi
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
  fi
  
+if test "$wxUSE_HEADERCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_HEADERCTRL)
+  USES_CONTROLS=1
+fi
+
  if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
    AC_DEFINE(wxUSE_HYPERLINKCTRL)
    USES_CONTROLS=1
  if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
    AC_DEFINE(wxUSE_HYPERLINKCTRL)
    USES_CONTROLS=1
@@ -6634,6 +6920,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
@@ -6657,7 +6947,6 @@ fi
  if test "$wxUSE_EDITABLELISTBOX" = "yes"; then
      AC_DEFINE(wxUSE_EDITABLELISTBOX)
      USES_CONTROLS=1
  if test "$wxUSE_EDITABLELISTBOX" = "yes"; then
      AC_DEFINE(wxUSE_EDITABLELISTBOX)
      USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox"
  fi
  
  if test "$wxUSE_NOTEBOOK" = "yes"; then
  fi
  
  if test "$wxUSE_NOTEBOOK" = "yes"; then
@@ -6686,6 +6975,14 @@ if test "$wxUSE_RADIOBTN" = "yes"; then
      USES_CONTROLS=1
  fi
  
      USES_CONTROLS=1
  fi
  
+if test "$wxUSE_REARRANGECTRL" = "yes"; then
+    AC_DEFINE(wxUSE_REARRANGECTRL)
+fi
+
+if test "$wxUSE_RICHMSGDLG" = "yes"; then
+    AC_DEFINE(wxUSE_RICHMSGDLG)
+fi
+
  if test "$wxUSE_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"
@@ -6694,7 +6991,7 @@ fi
  if test "$wxUSE_SCROLLBAR" = "yes"; then
      AC_DEFINE(wxUSE_SCROLLBAR)
      USES_CONTROLS=1
  if test "$wxUSE_SCROLLBAR" = "yes"; then
      AC_DEFINE(wxUSE_SCROLLBAR)
      USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll"
  fi
  
  if test "$wxUSE_SEARCHCTRL" = "yes"; then
  fi
  
  if test "$wxUSE_SEARCHCTRL" = "yes"; then
@@ -6751,10 +7048,6 @@ if test "$wxUSE_STATUSBAR" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
  fi
  
-if test "$wxUSE_TAB_DIALOG" = "yes"; then
-    AC_DEFINE(wxUSE_TAB_DIALOG)
-fi
-
  if test "$wxUSE_TEXTCTRL" = "yes"; then
      AC_DEFINE(wxUSE_TEXTCTRL)
      USES_CONTROLS=1
  if test "$wxUSE_TEXTCTRL" = "yes"; then
      AC_DEFINE(wxUSE_TEXTCTRL)
      USES_CONTROLS=1
@@ -6767,7 +7060,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
@@ -6825,7 +7118,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
@@ -6840,7 +7133,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)
@@ -6908,7 +7201,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
@@ -6944,11 +7237,25 @@ 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=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
  USE_STC=0
  if test "$wxUSE_STC" = "yes"; then
     AC_DEFINE(wxUSE_STC)
     USE_STC=1
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
+
+   dnl python is used to update src/stc.h (see build/bakefiles/scintilla.bkl)
+   AC_PATH_PROG(PYTHON, python)
+   if test "x$PYTHON" = "x"; then
+     COND_PYTHON="#"
+   fi
+   AC_SUBST(COND_PYTHON)
  fi
  
  if test "$wxUSE_MENUS" = "yes"; then
  fi
  
  if test "$wxUSE_MENUS" = "yes"; then
@@ -7085,11 +7392,7 @@ if test "$wxUSE_NUMBERDLG" = "yes"; then
  fi
  
  if test "$wxUSE_PROGRESSDLG" = "yes"; then
  fi
  
  if test "$wxUSE_PROGRESSDLG" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       AC_MSG_WARN(wxProgressDialog requires constraints so it won't be compiled without them)
-    else
-        AC_DEFINE(wxUSE_PROGRESSDLG)
-    fi
+    AC_DEFINE(wxUSE_PROGRESSDLG)
  fi
  
  if test "$wxUSE_SPLASH" = "yes"; then
  fi
  
  if test "$wxUSE_SPLASH" = "yes"; then
@@ -7098,11 +7401,7 @@ if test "$wxUSE_SPLASH" = "yes"; then
  fi
  
  if test "$wxUSE_STARTUP_TIPS" = "yes"; then
  fi
  
  if test "$wxUSE_STARTUP_TIPS" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       AC_MSG_WARN(Startup tips requires constraints and won't be compiled without them)
-    else
-        AC_DEFINE(wxUSE_STARTUP_TIPS)
-    fi
+    AC_DEFINE(wxUSE_STARTUP_TIPS)
  fi
  
  if test "$wxUSE_TEXTDLG" = "yes"; then
  fi
  
  if test "$wxUSE_TEXTDLG" = "yes"; then
@@ -7169,23 +7468,51 @@ 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; then
+        PKG_CHECK_MODULES(CAIRO, cairo,
+            [wx_has_graphics=1],
+            [AC_MSG_WARN([Cairo library not found])]
+        )
+    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 ---------------------------------------------------------------------------
@@ -7194,7 +7521,7 @@ dnl ---------------------------------------------------------------------------
  
  USE_MEDIA=0
  
  
  USE_MEDIA=0
  
-if test "$wxUSE_MEDIACTRL" = "yes"; then
+if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
      USE_MEDIA=1
  
      dnl -----------------------------------------------------------------------
      USE_MEDIA=1
  
      dnl -----------------------------------------------------------------------
@@ -7255,6 +7582,13 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then
      if test $USE_MEDIA = 1; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
          AC_DEFINE(wxUSE_MEDIACTRL)
      if test $USE_MEDIA = 1; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
          AC_DEFINE(wxUSE_MEDIACTRL)
+    else
+        if test "$wxUSE_MEDIACTRL" = "yes"; then
+            AC_MSG_ERROR([GStreamer not available])
+        else
+            dnl was set to 'auto'
+            AC_MSG_WARN([GStreamer not available... disabling wxMediaCtrl])
+        fi
      fi
  fi
  
      fi
  fi
  
@@ -7262,7 +7596,7 @@ dnl ---------------------------------------------------------------------------
  dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
  dnl ---------------------------------------------------------------------------
  
  dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
  dnl ---------------------------------------------------------------------------
  
-if test "$cross_compiling" = "yes"; then
+if test "$cross_compiling" != "no"; then
      dnl Use best guess from host as we can't use uname when cross compiling
      OSINFO="\"$host\""
  else
      dnl Use best guess from host as we can't use uname when cross compiling
      OSINFO="\"$host\""
  else
@@ -7328,6 +7662,12 @@ 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_STC" = "yes" ; then
          BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
      fi
@@ -7347,27 +7687,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
@@ -7377,9 +7719,8 @@ if test "$wxUSE_GUI" = "yes"; then
  
      dnl TODO some samples are never built so far: mfc (requires VC++)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
  
      dnl TODO some samples are never built so far: mfc (requires VC++)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
-                     erase event exec font image minimal mobile \
-                     mobile/wxedit mobile/styles render \
-                     shaped svg taborder vscroll widgets"
+                     erase event exec font image minimal render \
+                     shaped svg taborder vscroll widgets wrapsizer"
  
      if test "$wxUSE_MONOLITHIC" != "yes"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
  
      if test "$wxUSE_MONOLITHIC" != "yes"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
@@ -7387,7 +7728,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
@@ -7410,14 +7751,14 @@ dnl check for icc before gcc as icc is also recognized as gcc
  if test "x$INTELCC" = "xyes" ; then
      dnl Warnings which can't be easily suppressed in C code are disabled:
      dnl
  if test "x$INTELCC" = "xyes" ; then
      dnl Warnings which can't be easily suppressed in C code are disabled:
      dnl
-    dnl     remark #810: conversion from "x" to "y" may lose significant bits
-    dnl     remark #869: parameter "foo" was never referenced
-    dnl     remark #1572: floating-point equality and inequality comparisons
-    dnl                   are unreliable
-    dnl     remark #1684: conversion from pointer to same-sized integral type
-    dnl
-    dnl (for others see below)
-    CWARNINGS="-Wall -wd810,869,981,1418,1572,1684"
+    dnl     #810: conversion from "x" to "y" may lose significant bits
+    dnl     #869: parameter "foo" was never referenced
+    dnl     #1572: floating-point equality and inequality comparisons
+    dnl            are unreliable
+    dnl     #1684: conversion from pointer to same-sized integral type
+    dnl     #2259: non-pointer conversion from "x" to "y" may lose significant
+    dnl            bits
+    CWARNINGS="-Wall -wd810,869,981,1418,1572,1684,2259"
  elif test "$GCC" = yes ; then
      CWARNINGS="-Wall -Wundef"
  fi
  elif test "$GCC" = yes ; then
      CWARNINGS="-Wall -Wundef"
  fi
@@ -7429,18 +7770,27 @@ if test "x$INTELCXX" = "xyes" ; then
      dnl (279) are generated for standard macros and so there is nothing we can
      dnl do about them
      dnl
      dnl (279) are generated for standard macros and so there is nothing we can
      dnl do about them
      dnl
-    dnl     remark #279: controlling expression is constant
-    dnl     remark #383: value copied to temporary, reference to temporary used
-    dnl     remark #444: destructor for base class "xxx" is not virtual
-    dnl     remark #810: conversion from "x" to "y" may lose significant bits
-    dnl     remark #869: parameter "foo" was never referenced
-    dnl     remark #981: operands are evaluated in unspecified order
-    dnl     remark #1418: external definition with no prior declaration
-    dnl     remark #1419: external declaration in primary source file
-    CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
+    dnl     #279: controlling expression is constant
+    dnl     #383: value copied to temporary, reference to temporary used
+    dnl     #444: destructor for base class "xxx" is not virtual
+    dnl     #981: operands are evaluated in unspecified order
+    dnl     #1418: external definition with no prior declaration
+    dnl     #1419: external declaration in primary source file
+    dnl     #1881: argument must be a constant null pointer value
+    dnl
+    dnl (for others see CWARNINGS above)
+    CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419,1881,2259"
  elif test "$GXX" = yes ; then
  elif test "$GXX" = yes ; then
-    dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
      CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
      CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
+    AX_CXXFLAGS_GCC_OPTION(-Woverloaded-virtual, CXXWARNINGS)
+
+    dnl when building under Mac we currently get hundreds of deprecation
+    dnl warnings for Carbon symbols from the standard headers -- disable them
+    dnl as we already know that they're deprecated and nothing else can be seen
+    dnl with these warnings on
+    if test "$wxUSE_MAC" = 1 ; then
+        CXXWARNINGS="$CXXWARNINGS -Wno-deprecated-declarations"
+    fi
  fi
  
  
  fi
  
  
@@ -7492,7 +7842,7 @@ EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
  EXTRALIBS_XML="$EXPAT_LINK"
  EXTRALIBS_HTML="$MSPACK_LINK"
  EXTRALIBS_MEDIA="$GST_LIBS"
  EXTRALIBS_XML="$EXPAT_LINK"
  EXTRALIBS_HTML="$MSPACK_LINK"
  EXTRALIBS_MEDIA="$GST_LIBS"
-EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
+EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
  if test "$wxUSE_GUI" = "yes"; then
      EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
  fi
  if test "$wxUSE_GUI" = "yes"; then
      EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
  fi
@@ -7525,7 +7875,7 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
  fi
  
  for i in $wxconfig_3rdparty ; do
  fi
  
  for i in $wxconfig_3rdparty ; do
-    WXCONFIG_LIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
+    WXCONFIG_LIBS="-lwx${i}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
  done
  
  
  done
  
  
@@ -7601,18 +7951,15 @@ AC_SUBST(EXTRALIBS_GNOMEPRINT)
  AC_SUBST(EXTRALIBS_GNOMEVFS)
  AC_SUBST(EXTRALIBS_HILDON)
  AC_SUBST(UNICODE)
  AC_SUBST(EXTRALIBS_GNOMEVFS)
  AC_SUBST(EXTRALIBS_HILDON)
  AC_SUBST(UNICODE)
-AC_SUBST(BUILD)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(DEBUG_FLAG)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(DEBUG_FLAG)
-if test "$TOOLKIT" = "MAC"; then
-    TOOLKIT_LOWERCASE=osx
-else
-    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(TOOLKIT_LOWERCASE)
  AC_SUBST(TOOLKIT_VERSION)
+AC_SUBST(DYLIB_RPATH_INSTALL)
+AC_SUBST(DYLIB_RPATH_POSTLINK)
  AC_SUBST(SAMPLES_RPATH_FLAG)
  AC_SUBST(SAMPLES_RPATH_FLAG)
-AC_SUBST(SAMPLES_RPATH_POSTLINK)
+AC_SUBST(HEADER_PAD_OPTION)
  AC_SUBST(HOST_SUFFIX)
  AC_SUBST(CPPUNIT_CFLAGS)
  AC_SUBST(CPPUNIT_LIBS)
  AC_SUBST(HOST_SUFFIX)
  AC_SUBST(CPPUNIT_CFLAGS)
  AC_SUBST(CPPUNIT_LIBS)
@@ -7634,6 +7981,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 ' '`"
@@ -7721,10 +8071,10 @@ if test "$wxUSE_MSW" = 1 ; then
          AC_MSG_ERROR([Required windres program not found])
      fi
  
          AC_MSG_ERROR([Required windres program not found])
      fi
  
-    RESCOMP="$WINDRES"
+    RESCOMP="$WINDRES $WINDRES_CPU_DEFINE"
  fi
  
  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"
@@ -7862,6 +8212,8 @@ dnl Add visibility support flags to CFLAGS/CXXFLAGS - do it this late so that
  dnl it doesn't affect compilation checks above
  CFLAGS="$CFLAGS $CFLAGS_VISIBILITY"
  CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
  dnl it doesn't affect compilation checks above
  CFLAGS="$CFLAGS $CFLAGS_VISIBILITY"
  CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+OBJCFLAGS="$OBJCFLAGS $CFLAGS_VISIBILITY"
+OBJCXXFLAGS="$OBJCXXFLAGS $CXXFLAGS_VISIBILITY"
  
  dnl for convenience, sort the samples in alphabetical order
  dnl
  
  dnl for convenience, sort the samples in alphabetical order
  dnl
@@ -7900,7 +8252,6 @@ AC_SUBST(WX_RELEASE)
  AC_SUBST(WX_VERSION)
  AC_SUBST(WX_SUBVERSION)
  AC_SUBST(WX_CHARTYPE)
  AC_SUBST(WX_VERSION)
  AC_SUBST(WX_SUBVERSION)
  AC_SUBST(WX_CHARTYPE)
-AC_SUBST(WX_DEBUGTYPE)
  
  dnl note that in addition to the usual CPP/C/CXXFLAGS which are used for
  dnl building the library itself, we also have WXCONFIG_-prefixed variants which
  
  dnl note that in addition to the usual CPP/C/CXXFLAGS which are used for
  dnl building the library itself, we also have WXCONFIG_-prefixed variants which
@@ -7918,6 +8269,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)
  
@@ -7964,10 +8316,7 @@ AC_PROG_MAKE_SET
  AC_CONFIG_HEADERS([lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in])
  
  if test "$USE_WIN32" = 1; then
  AC_CONFIG_HEADERS([lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in])
  
  if test "$USE_WIN32" = 1; then
-    AC_CONFIG_COMMANDS(
-        [
-            rcdefs.h
-        ],
+    AC_CONFIG_COMMANDS([rcdefs.h],
          [
              mkdir -p $outdir &&
              $CPP $infile | sed 's/^# *[1-9].*//;s/^ *//;/./,/^$/!d' > $outdir/rcdefs.h
          [
              mkdir -p $outdir &&
              $CPP $infile | sed 's/^# *[1-9].*//;s/^ *//;/./,/^$/!d' > $outdir/rcdefs.h
@@ -8087,8 +8436,6 @@ echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
  echo ""
  echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_DESC}"
  echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
  echo ""
  echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_DESC}"
  echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
-
-echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
  echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
  echo $ECHO_N "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}$ECHO_C"
  if test "$wxUSE_UNICODE" = "yes"; then
  echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
  echo $ECHO_N "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}$ECHO_C"
  if test "$wxUSE_UNICODE" = "yes"; then