Mention wxOSX/Cocoa in the old wxCocoa docs.

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

index 887522ebb7f66ad811492454928705984db2a726..4a368c9b3fc007abddb47da63ef730104619b6db 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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.1], [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=1
  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,13 +103,14 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0
  dnl the list of all available toolkits
  dnl
  dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
  dnl the list of all available toolkits
  dnl
  dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
-ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA 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
  DEFAULT_wxUSE_COCOA=0
  DEFAULT_wxUSE_GTK=0
  
  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_GTK=0
-DEFAULT_wxUSE_MAC=0
+DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_wxUSE_OSX_COCOA=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
@@ -114,7 +124,8 @@ 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_GTK=0
  dnl toolkit to use by default for the target platform
  DEFAULT_DEFAULT_wxUSE_COCOA=0
  DEFAULT_DEFAULT_wxUSE_GTK=0
-DEFAULT_DEFAULT_wxUSE_MAC=0
+DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_DEFAULT_wxUSE_OSX_COCOA=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
@@ -124,9 +135,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
  
@@ -139,7 +150,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
@@ -243,12 +253,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__)
@@ -266,7 +270,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
    ;;
@@ -317,24 +320,10 @@ case "${host}" in
      dnl Darwin based distributions (including Mac OS X)
      USE_BSD=1
      USE_DARWIN=1
      dnl Darwin based distributions (including Mac OS X)
      USE_BSD=1
      USE_DARWIN=1
-    SO_SUFFIX=dylib
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(TARGET_CARBON)
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(TARGET_CARBON)
-    DEFAULT_DEFAULT_wxUSE_MAC=1
-    DEFAULT_STD_FLAG=no
-  ;;
-  powerpc-apple-macos* )
-    dnl Classic Mac OS (< X)
-    USE_UNIX=0
-    dnl For some reason the test that should be cross-compiler capable fails
-    dnl However, there is no doubt that MacOS PowerPC is big endian.
-    ac_cv_c_bigendian=yes
-    SO_SUFFIX=shlib
-    dnl AC_DEFINE(TARGET_CARBON)
-    dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS
-    DEFAULT_DEFAULT_wxUSE_MAC=1
-    DEFAULT_STD_FLAG=no
+    DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
    ;;
  
    *-*-beos* )
    ;;
  
    *-*-beos* )
@@ -376,17 +365,19 @@ DEFAULT_wxUSE_LIBGNOMEVFS=no
  DEFAULT_wxUSE_LIBHILDON=no
  DEFAULT_wxUSE_LIBMSPACK=no
  DEFAULT_wxUSE_LIBSDL=no
  DEFAULT_wxUSE_LIBHILDON=no
  DEFAULT_wxUSE_LIBMSPACK=no
  DEFAULT_wxUSE_LIBSDL=no
-DEFAULT_wxUSE_OPENGL=no
  
  dnl features disabled by default
  DEFAULT_wxUSE_ACCESSIBILITY=no
  DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
  DEFAULT_wxUSE_IPV6=no
  
  dnl features disabled by default
  DEFAULT_wxUSE_ACCESSIBILITY=no
  DEFAULT_wxUSE_GRAPHICS_CONTEXT=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_UNICODE_UTF8_LOCALE=no
  
  dnl Mac/Cocoa users need to enable building universal binaries explicitly
@@ -439,6 +430,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 ---------------------------------------------------------------------------
@@ -454,7 +453,9 @@ 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(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=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(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(cocoa,         [  --with-cocoa            use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(wine,          [  --with-wine             use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
  AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
@@ -473,6 +474,8 @@ dnl we have a default one
  
  AC_MSG_CHECKING(for toolkit)
  
  
  AC_MSG_CHECKING(for toolkit)
  
+
+
  # In Wine, we need to default to MSW, not GTK or MOTIF
  if test "$wxUSE_WINE" = "yes"; then
      DEFAULT_DEFAULT_wxUSE_GTK=0
  # In Wine, we need to default to MSW, not GTK or MOTIF
  if test "$wxUSE_WINE" = "yes"; then
      DEFAULT_DEFAULT_wxUSE_GTK=0
@@ -515,9 +518,9 @@ 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_MAC:-0} \
-                  + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \
-                  + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
+    NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+                  + ${wxUSE_OSX_COCOA:-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.
      case "${host}" in
  
      dnl Allow wxUSE_PM only for OS/2 with EMX.
      case "${host}" in
@@ -558,6 +561,11 @@ else
      fi
  fi
  
      fi
  fi
  
+wxUSE_MAC=0
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then
+    wxUSE_MAC=1
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl external libraries
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl external libraries
  dnl ---------------------------------------------------------------------------
@@ -602,7 +610,6 @@ dnl global compile options
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_DISABLE(shared,     [  --disable-shared        create static library instead of shared], wxUSE_SHARED)
  dnl ---------------------------------------------------------------------------
  
  WX_ARG_DISABLE(shared,     [  --disable-shared        create static library instead of shared], wxUSE_SHARED)
-WX_ARG_DISABLE(optimise,   [  --disable-optimise      create optimised code], wxUSE_OPTIMISE)
  WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
  WX_ARG_ENABLE(stl,         [  --enable-stl            use STL for containers], wxUSE_STL)
  WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
  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)
@@ -610,14 +617,14 @@ WX_ARG_ENABLE(std_string,    [  --enable-std_string     use standard C++ string
  WX_ARG_DISABLE(unicode,      [  --disable-unicode       compile without Unicode support], wxUSE_UNICODE)
  WX_ARG_ENABLE(mslu,          [  --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU)
  WX_ARG_ENABLE_PARAM(utf8,    [  --enable-utf8           use UTF-8 representation for strings (Unix only)], wxUSE_UNICODE_UTF8)
  WX_ARG_DISABLE(unicode,      [  --disable-unicode       compile without Unicode support], wxUSE_UNICODE)
  WX_ARG_ENABLE(mslu,          [  --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU)
  WX_ARG_ENABLE_PARAM(utf8,    [  --enable-utf8           use UTF-8 representation for strings (Unix only)], wxUSE_UNICODE_UTF8)
-WX_ARG_ENABLE(utf8only,      [  --enable-utf8only      only support UTF-8 locales in UTF-8 build (Unix only)], wxUSE_UNICODE_UTF8_LOCALE)
+WX_ARG_ENABLE(utf8only,      [  --enable-utf8only       only support UTF-8 locales in UTF-8 build (Unix only)], wxUSE_UNICODE_UTF8_LOCALE)
  WX_ARG_ENABLE(extended_rtti, [  --enable-extended_rtti  use extended RTTI (XTI)], wxUSE_EXTENDED_RTTI)
  if test "$USE_OS2" = 1; then
      DEFAULT_wxUSE_OMF=no
      WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
  fi
  
  WX_ARG_ENABLE(extended_rtti, [  --enable-extended_rtti  use extended RTTI (XTI)], wxUSE_EXTENDED_RTTI)
  if test "$USE_OS2" = 1; then
      DEFAULT_wxUSE_OMF=no
      WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
  fi
  
-dnl --enablle-debug is equivalent to both --enable-debug_flag and
+dnl --enable-debug is equivalent to both --enable-debug_flag and
  dnl --enable-debug_info
  if test "$wxUSE_DEBUG" = "yes"; then
      DEFAULT_wxUSE_DEBUG_FLAG=yes
  dnl --enable-debug_info
  if test "$wxUSE_DEBUG" = "yes"; then
      DEFAULT_wxUSE_DEBUG_FLAG=yes
@@ -639,6 +646,17 @@ if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
      BUILD=debug
  fi
  
      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_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(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)
@@ -658,6 +676,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
@@ -719,7 +738,6 @@ WX_ARG_FEATURE(textbuf,       [  --enable-textbuf        use wxTextBuffer class]
  WX_ARG_FEATURE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
  WX_ARG_FEATURE(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
  WX_ARG_FEATURE(variant,       [  --enable-variant        use wxVariant class], wxUSE_VARIANT)
  WX_ARG_FEATURE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
  WX_ARG_FEATURE(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
  WX_ARG_FEATURE(variant,       [  --enable-variant        use wxVariant class], wxUSE_VARIANT)
-WX_ARG_FEATURE(weakref,       [  --enable-weakref        make wxEvtHandler trackable with wxWeakRef<>], wxUSE_WEAKREF)
  WX_ARG_FEATURE(zipstream,     [  --enable-zipstream      use wxZip streams], wxUSE_ZIPSTREAM)
  
  dnl URL-related classes
  WX_ARG_FEATURE(zipstream,     [  --enable-zipstream      use wxZip streams], wxUSE_ZIPSTREAM)
  
  dnl URL-related classes
@@ -747,6 +765,7 @@ WX_ARG_FEATURE(html,        [  --enable-html           use wxHTML sub-library],
  WX_ARG_FEATURE(htmlhelp,    [  --enable-htmlhelp       use wxHTML-based help], wxUSE_WXHTML_HELP)
  WX_ARG_FEATURE(xrc,         [  --enable-xrc            use XRC resources sub-library], wxUSE_XRC)
  WX_ARG_FEATURE(aui,         [  --enable-aui            use AUI docking library], wxUSE_AUI)
  WX_ARG_FEATURE(htmlhelp,    [  --enable-htmlhelp       use wxHTML-based help], wxUSE_WXHTML_HELP)
  WX_ARG_FEATURE(xrc,         [  --enable-xrc            use XRC resources sub-library], wxUSE_XRC)
  WX_ARG_FEATURE(aui,         [  --enable-aui            use AUI docking library], wxUSE_AUI)
+WX_ARG_FEATURE(propgrid,    [  --enable-propgrid       use wxPropertyGrid library], wxUSE_PROPGRID)
  WX_ARG_FEATURE(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,124 +798,72 @@ 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_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_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)
@@ -907,17 +874,18 @@ 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(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(listbook,    [  --enable-listbook       use wxListbook class], wxUSE_LISTBOOK)
  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(listbook,    [  --enable-listbook       use wxListbook class], wxUSE_LISTBOOK)
@@ -926,8 +894,10 @@ WX_ARG_FEATURE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wx
  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(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(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)
@@ -940,17 +910,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
@@ -1038,7 +1006,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
  
@@ -1074,10 +1042,15 @@ 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
  
  dnl Support the old --enable-universal_binary in case anyone was using it.
  retest_macosx_linking=no
  
  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
@@ -1134,7 +1107,6 @@ 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
  
  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.
@@ -1195,9 +1167,42 @@ 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
+    OSX_VERSION=`sw_vers -productVersion | grep 10.[[0-9]]`
+    if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then
          # otherwise configure stops on leopard for universal_binary
          wxUSE_MACOSX_VERSION_MIN=10.4
          # otherwise configure stops on leopard for universal_binary
          wxUSE_MACOSX_VERSION_MIN=10.4
+    else
+        # for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard
+        wxUSE_MACOSX_VERSION_MIN=10.5
+    fi
+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
  
      fi
  fi
  
@@ -1224,6 +1229,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
  
@@ -1664,76 +1670,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
@@ -1773,7 +1782,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
@@ -1915,45 +1928,89 @@ if test "$wxUSE_STL" = "yes"; then
          AC_DEFINE(HAVE_STD_STRING_COMPARE)
      fi
  
          AC_DEFINE(HAVE_STD_STRING_COMPARE)
      fi
  
-    dnl check for hash_map and hash_set headers
-    AC_CHECK_HEADER([hash_map],
-        [AC_CACHE_CHECK([for standard hash_map and hash_set],
-            wx_cv_class_stdhashmapset,
-            [AC_TRY_COMPILE([#include <hash_map>
-                #include <hash_set>],
-                [std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
-                 std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;],
-                wx_cv_class_stdhashmapset=yes,
-                wx_cv_class_stdhashmapset=no)
-            ]
-        )],
-        [],
-        [ ]
-    )
-
-    if test "$wx_cv_class_stdhashmapset" = yes; then
-        AC_DEFINE(HAVE_HASH_MAP)
-        AC_DEFINE(HAVE_STD_HASH_MAP)
+    if test "$wx_cv_class_gnuhashmapset" = yes; then
+         AC_DEFINE(HAVE_EXT_HASH_MAP)
+         AC_DEFINE(HAVE_GNU_CXX_HASH_MAP)
      fi
  
      fi
  
-    AC_CHECK_HEADER([ext/hash_map],
-        [AC_CACHE_CHECK([for GNU hash_map and hash_set],
-            wx_cv_class_gnuhashmapset,
-            [AC_TRY_COMPILE([#include <ext/hash_map>
-                #include <ext/hash_set>],
-                [__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
-                 __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;],
-                wx_cv_class_gnuhashmapset=yes,
-                wx_cv_class_gnuhashmapset=no)
+    AC_CHECK_HEADER([unordered_map],
+        [AC_CACHE_CHECK([for unordered_map and unordered_set in std],
+            wx_cv_class_stdunorderedmapset,
+            [AC_TRY_COMPILE([#include <unordered_map>
+                #include <unordered_set>],
+                [std::unordered_map<double*, char*> test1;
+                 std::unordered_set<char*> test2;],
+                wx_cv_class_stdunorderedmapset=yes,
+                wx_cv_class_stdunorderedmapset=no)
              ]
          )],
          [],
          [ ]
      )
  
              ]
          )],
          [],
          [ ]
      )
  
-    if test "$wx_cv_class_gnuhashmapset" = yes; then
-         AC_DEFINE(HAVE_EXT_HASH_MAP)
-         AC_DEFINE(HAVE_GNU_CXX_HASH_MAP)
+    if test "$wx_cv_class_stdunorderedmapset" = yes; then
+         AC_DEFINE(HAVE_STD_UNORDERED_MAP)
+         AC_DEFINE(HAVE_STD_UNORDERED_SET)
+    else
+        AC_CHECK_HEADER([tr1/unordered_map],
+            [AC_CACHE_CHECK([for unordered_map and unordered_set in std::tr1],
+                wx_cv_class_tr1unorderedmapset,
+                [AC_TRY_COMPILE([#include <tr1/unordered_map>
+                    #include <tr1/unordered_set>],
+                    [std::tr1::unordered_map<double*, char*> test1;
+                     std::tr1::unordered_set<char*> test2;
+            #if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<2)
+            #error can't use unordered_{map,set} with gcc-4.[01]: http://gcc.gnu.org/PR24389
+            #endif],
+                    wx_cv_class_tr1unorderedmapset=yes,
+                    wx_cv_class_tr1unorderedmapset=no)
+                ]
+            )],
+            [],
+            [ ]
+        )
+
+        if test "$wx_cv_class_tr1unorderedmapset" = yes; then
+            AC_DEFINE(HAVE_TR1_UNORDERED_MAP)
+            AC_DEFINE(HAVE_TR1_UNORDERED_SET)
+        else
+            dnl check for hash_map and hash_set headers
+            AC_CHECK_HEADER([hash_map],
+                [AC_CACHE_CHECK([for std::hash_map and hash_set],
+                    wx_cv_class_stdhashmapset,
+                    [AC_TRY_COMPILE([#include <hash_map>
+                        #include <hash_set>],
+                        [std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
+                         std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;],
+                        wx_cv_class_stdhashmapset=yes,
+                        wx_cv_class_stdhashmapset=no)
+                    ]
+                )],
+                [],
+                [ ]
+            )
+
+            if test "$wx_cv_class_stdhashmapset" = yes; then
+                AC_DEFINE(HAVE_HASH_MAP)
+                AC_DEFINE(HAVE_STD_HASH_MAP)
+            fi
+
+            AC_CHECK_HEADER([ext/hash_map],
+                [AC_CACHE_CHECK([for GNU hash_map and hash_set],
+                    wx_cv_class_gnuhashmapset,
+                    [AC_TRY_COMPILE([#include <ext/hash_map>
+                        #include <ext/hash_set>],
+                        [__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
+                         __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;],
+                        wx_cv_class_gnuhashmapset=yes,
+                        wx_cv_class_gnuhashmapset=no)
+                    ]
+                )],
+                [],
+                [ ]
+            )
+
+        fi
      fi
  fi
  
      fi
  fi
  
@@ -1979,6 +2036,12 @@ dnl In the same vein. Motif 2.1 should be tried before Motif 1.2 for the
  dnl systems which have both (AIX 4.x does)
  SEARCH_INCLUDE="\
      /usr/local/include        \
  dnl systems which have both (AIX 4.x does)
  SEARCH_INCLUDE="\
      /usr/local/include        \
+    /usr/local/X11/include    \
+    /usr/local/include/X11    \
+    /usr/local/X11R7/include  \
+    /usr/local/X11R6/include  \
+    /usr/local/include/X11R7  \
+    /usr/local/include/X11R6  \
                                \
      /usr/Motif-2.1/include    \
      /usr/Motif-1.2/include    \
                                \
      /usr/Motif-2.1/include    \
      /usr/Motif-1.2/include    \
@@ -1989,31 +2052,29 @@ SEARCH_INCLUDE="\
                                \
      /usr/include/Xm           \
                                \
                                \
      /usr/include/Xm           \
                                \
+    /usr/X11R7/include        \
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
      /usr/X11R6/include        \
      /usr/X11R6.4/include      \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
                                \
                                \
+    /usr/include/X11R7        \
      /usr/include/X11R6        \
      /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
                                \
      /usr/X11/include          \
      /usr/include/X11          \
                                \
      /usr/X11/include          \
      /usr/include/X11          \
-    /usr/local/X11/include    \
-    /usr/local/include/X11    \
                                \
      /usr/XFree86/include/X11  \
      /usr/pkg/include          \
                                \
                                \
      /usr/XFree86/include/X11  \
      /usr/pkg/include          \
                                \
+    /usr/local/X1R5/include  \
+    /usr/local/include/X11R5  \
+    /usr/X11R5/include        \
+    /usr/include/X11R5        \
+                              \
+    /usr/local/X11R4/include  \
+    /usr/local/include/X11R4  \
+    /usr/X11R4/include        \
+    /usr/include/X11R4        \
+                              \
      /usr/openwin/share/include"
  
  dnl try to find out the standard lib locations for the systems with multiple
      /usr/openwin/share/include"
  
  dnl try to find out the standard lib locations for the systems with multiple
@@ -2642,8 +2703,15 @@ 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.
  
      dnl --- FIXME: This is still a somewhat random list of libs,
      dnl ---        some of them should probably be included conditionally.
-    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-
+    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"
+        ;;
+    esac
      if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
          LIBS="$LIBS -loleacc"
      fi
      if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
          LIBS="$LIBS -loleacc"
      fi
@@ -3346,7 +3414,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          fi
      fi
  
          fi
      fi
  
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_OSX_CARBON" = 1; then
          AC_MSG_CHECKING([for compiler syntax to enable Pascal strings])
          if test "$GCC" = yes; then
              AC_MSG_RESULT([gcc])
          AC_MSG_CHECKING([for compiler syntax to enable Pascal strings])
          if test "$GCC" = yes; then
              AC_MSG_RESULT([gcc])
@@ -3365,14 +3433,19 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
              CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
          fi
  
              CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
          fi
  
-        TOOLKIT=MAC
+        TOOLKIT=OSX_CARBON
          dnl we can't call this MAC_DIST or autoconf thinks its a macro
          dnl we can't call this MAC_DIST or autoconf thinks its a macro
-        GUIDIST=MACX_DIST
+        GUIDIST=OSX_CARBON_DIST
          dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin
          dnl are different, so they need different names:
          WXBASEPORT="_carbon"
      fi
  
          dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin
          dnl are different, so they need different names:
          WXBASEPORT="_carbon"
      fi
  
+    if test "$wxUSE_OSX_COCOA" = 1; then
+        TOOLKIT=OSX_COCOA
+        GUIDIST=OSX_COCOA_DIST
+    fi
+
      if test "$wxUSE_COCOA" = 1; then
          TOOLKIT=COCOA
          GUIDIST=COCOA_DIST
      if test "$wxUSE_COCOA" = 1; then
          TOOLKIT=COCOA
          GUIDIST=COCOA_DIST
@@ -3556,15 +3629,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_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
+if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
+
+    dnl look in glcanvas.h for the list of platforms supported by wxGlCanvas:
+
+    if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_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])
@@ -3631,11 +3705,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
@@ -3724,20 +3812,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* )
@@ -3757,7 +3853,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
  
@@ -3799,20 +3895,19 @@ fi
  
  WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[[a-z]]' '[[A-Z]]'`
  
  
  WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${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}"
-
-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}${lib_debug_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}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
  
  dnl library link name
  dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix.
  dnl If we ever need to do that, we won't need to keep these.
  
  dnl library link name
  dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix.
  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_COCOA" = 1; then
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+else
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+fi
  if test "${TOOLKIT_DIR}" = "os2"; then
      WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
  else
  if test "${TOOLKIT_DIR}" = "os2"; then
      WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
  else
@@ -3996,7 +4091,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
@@ -4182,8 +4277,9 @@ if test "$ac_cv_func_vsscanf" = "yes"; then
                      #endif
                  ],
                  [
                      #endif
                  ],
                  [
-                    char *buf, *parse;
-                    vsscanf(buf, "%s", parse);
+                    char *buf;
+                    va_list args;
+                    vsscanf(buf, "%s", args);
                  ],
                  wx_cv_func_vsscanf_decl=yes,
                  wx_cv_func_vsscanf_decl=no
                  ],
                  wx_cv_func_vsscanf_decl=yes,
                  wx_cv_func_vsscanf_decl=no
@@ -4924,12 +5020,68 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
            AC_MSG_WARN([wxMutex won't be recursive on this platform])
          fi
        fi
            AC_MSG_WARN([wxMutex won't be recursive on this platform])
          fi
        fi
+
+      if test "$wxUSE_COMPILER_TLS" = "auto"; then
+          if test "$USE_NETBSD" = 1; then
+              AC_MSG_WARN([Disabling TLS under NetBSD, please contact wx-dev if it works now])
+              wxUSE_COMPILER_TLS=no
+          else
+              wxUSE_COMPILER_TLS=yes
+          fi
+      fi
+
+      if test "$wxUSE_COMPILER_TLS" = "yes"; then
+          dnl test for compiler thread-specific variables support
+          AC_CACHE_CHECK([for __thread keyword],
+                         wx_cv_cc___thread,
+              [
+                  AC_TRY_COMPILE([#include <pthread.h>],
+                      [
+                          static __thread int n = 0;
+                          static __thread int *p = 0;
+                      ],
+                      wx_cv_cc___thread=yes,
+                      wx_cv_cc___thread=no
+                  )
+              ]
+          )
+
+          if test "$wx_cv_cc___thread" = "yes"; then
+              AX_GXX_VERSION
+              if test -n "$ax_cv_gxx_version"; then
+                  dnl g++ supports __thread since at least version 3.3 but its support
+                  dnl seems to be broken until 4.1, see
+                  dnl   http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/108388
+                  dnl
+                  dnl NB: we still need to test __thread support with
+                  dnl     AC_TRY_COMPILE above even for g++ 4 as it doesn't
+                  dnl     support it for all architectures (e.g. it doesn't
+                  dnl     work under OS X)
+                  AC_MSG_CHECKING([whether __thread support in g++ is usable])
+                  case "$ax_cv_gxx_version" in
+                    1.* | 2.* | 3.* )
+                        AC_MSG_RESULT([no, it's broken])
+                        wx_cv_cc___thread=no
+                        ;;
+                    *)
+                        AC_MSG_RESULT([yes, it works])
+                        ;;
+                  esac
+              fi
+          fi
+
+          if test "$wx_cv_cc___thread" = "yes"; then
+            AC_DEFINE(HAVE___THREAD_KEYWORD)
+          fi
+        fi
      fi
  
  dnl from if !MSW
  else
      if test "$wxUSE_THREADS" = "yes" ; then
        case "${host}" in
      fi
  
  dnl from if !MSW
  else
      if test "$wxUSE_THREADS" = "yes" ; then
        case "${host}" in
+        x86_64-*-mingw32* )
+        ;;
          *-*-mingw32* )
              dnl check if the compiler accepts -mthreads
              AC_CACHE_CHECK([if compiler supports -mthreads],
          *-*-mingw32* )
              dnl check if the compiler accepts -mthreads
              AC_CACHE_CHECK([if compiler supports -mthreads],
@@ -5034,9 +5186,14 @@ 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"
      DEBUG_CFLAGS="-g"
-    wxUSE_OPTIMISE=no
  fi
  
  if test "$wxUSE_DEBUG_GDB" = "yes" ; then
  fi
  
  if test "$wxUSE_DEBUG_GDB" = "yes" ; then
@@ -5108,29 +5265,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
  
@@ -5596,7 +5761,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>
@@ -5716,65 +5881,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>,
@@ -6098,10 +6204,6 @@ if test "$wxUSE_VARIANT" = "yes"; then
      AC_DEFINE(wxUSE_VARIANT)
  fi
  
      AC_DEFINE(wxUSE_VARIANT)
  fi
  
-if test "$wxUSE_WEAKREF" = "yes"; then
-    AC_DEFINE(wxUSE_WEAKREF)
-fi
-
  if test "$wxUSE_FS_INET" = "yes"; then
    AC_DEFINE(wxUSE_FS_INET)
  fi
  if test "$wxUSE_FS_INET" = "yes"; then
    AC_DEFINE(wxUSE_FS_INET)
  fi
@@ -6118,7 +6220,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
          wxUSE_JOYSTICK=yes
  
      dnl mac only available on darwin
          wxUSE_JOYSTICK=yes
  
      dnl mac only available on darwin
-    elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
+    elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
          if test "$USE_DARWIN" = 1; then
              dnl check for a bug in the headers, some have bad setEventCallout
              AC_MSG_CHECKING([headers have declarations needed for joystick support])
          if test "$USE_DARWIN" = 1; then
              dnl check for a bug in the headers, some have bad setEventCallout
              AC_MSG_CHECKING([headers have declarations needed for joystick support])
@@ -6217,9 +6319,6 @@ fi
  if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
      AC_DEFINE(wxUSE_DOC_VIEW_ARCHITECTURE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
  if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
      AC_DEFINE(wxUSE_DOC_VIEW_ARCHITECTURE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
-    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
-    fi
  fi
  
  if test "$wxUSE_HELP" = "yes"; then
  fi
  
  if test "$wxUSE_HELP" = "yes"; then
@@ -6243,11 +6342,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
  
@@ -6383,6 +6478,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
@@ -6524,6 +6623,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
@@ -6567,7 +6671,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
@@ -6596,6 +6699,10 @@ 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_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"
@@ -6604,7 +6711,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
@@ -6661,14 +6768,15 @@ 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
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
  if test "$wxUSE_TEXTCTRL" = "yes"; then
      AC_DEFINE(wxUSE_TEXTCTRL)
      USES_CONTROLS=1
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+
+    dnl we don't have special switches to disable wxUSE_RICHEDIT[2], it doesn't
+    dnl seem useful to allow disabling them
+    AC_DEFINE(wxUSE_RICHEDIT)
+    AC_DEFINE(wxUSE_RICHEDIT2)
  fi
  
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
  fi
  
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
@@ -6794,9 +6902,6 @@ if test "$wxUSE_HTML" = "yes"; then
      AC_DEFINE(wxUSE_HTML)
      USE_HTML=1
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
      AC_DEFINE(wxUSE_HTML)
      USE_HTML=1
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
-    if test "$wxUSE_MAC" = 1; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
-    fi
  fi
  if test "$wxUSE_WEBKIT" = "yes"; then
      if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
  fi
  if test "$wxUSE_WEBKIT" = "yes"; then
      if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
@@ -6821,6 +6926,9 @@ if test "$wxUSE_WEBKIT" = "yes"; then
      else
          wxUSE_WEBKIT=no
      fi
      else
          wxUSE_WEBKIT=no
      fi
+    if test "$wxUSE_WEBKIT" = "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
+    fi
  fi
  
  USE_XRC=0
  fi
  
  USE_XRC=0
@@ -6842,11 +6950,25 @@ if test "$wxUSE_AUI" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui"
  fi
  
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui"
  fi
  
+USE_PROPGRID=0
+if test "$wxUSE_PROPGRID" = "yes"; then
+   AC_DEFINE(wxUSE_PROPGRID)
+   USE_PROPGRID=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
+fi
+
  USE_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
@@ -6983,11 +7105,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
@@ -6996,11 +7114,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
@@ -7067,6 +7181,10 @@ dnl ---------------------------------------------------------------------------
  dnl wxGraphicsContext
  dnl ---------------------------------------------------------------------------
  
  dnl wxGraphicsContext
  dnl ---------------------------------------------------------------------------
  
+if test "$wxUSE_MAC" = 1; then
+       wxUSE_GRAPHICS_CONTEXT="yes"
+fi
+
  if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
        AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
  if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
     if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
        AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
@@ -7088,7 +7206,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 -----------------------------------------------------------------------
@@ -7149,6 +7267,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
  
@@ -7156,7 +7281,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
@@ -7219,6 +7344,12 @@ if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_AUI" = "yes" ; then
          BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
      fi
      if test "$wxUSE_AUI" = "yes" ; then
          BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
      fi
+    if test "$wxUSE_PROPGRID" = "yes" ; then
+        BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
+    fi
+    if test "$wxUSE_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
@@ -7243,14 +7374,10 @@ if test "$wxUSE_MAC" = 1 ; then
      if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
          if test "$USE_DARWIN" = 1; then
              LDFLAGS="$LDFLAGS -framework QuickTime"
      if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
          if test "$USE_DARWIN" = 1; then
              LDFLAGS="$LDFLAGS -framework QuickTime"
-        else
-            LDFLAGS="$LDFLAGS -lQuickTimeLib"
          fi
      fi
      if test "$USE_DARWIN" = 1; then
          fi
      fi
      if test "$USE_DARWIN" = 1; then
-        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System"
-    else
-        LDFLAGS="$LDFLAGS -lCarbonLib"
+        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
      fi
  fi
  if test "$wxUSE_COCOA" = 1 ; then
      fi
  fi
  if test "$wxUSE_COCOA" = 1 ; then
@@ -7272,9 +7399,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"
@@ -7305,14 +7431,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
@@ -7324,18 +7450,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
  
  
@@ -7499,11 +7634,25 @@ AC_SUBST(UNICODE)
  AC_SUBST(BUILD)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(DEBUG_FLAG)
  AC_SUBST(BUILD)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(DEBUG_FLAG)
-TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'`
+TOOLKIT_LOWERCASE=xxx
+if test "$TOOLKIT" = "MAC"; then
+    TOOLKIT_LOWERCASE=osx_carbon
+fi
+if test "$TOOLKIT" = "OSX_CARBON"; then
+    TOOLKIT_LOWERCASE=osx_carbon
+fi
+if test "$TOOLKIT" = "OSX_COCOA"; then
+    TOOLKIT_LOWERCASE=osx_cocoa
+fi
+if test "$TOOLKIT_LOWERCASE" = "xxx"; then
+    TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'`
+fi
  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)
@@ -7630,7 +7779,7 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
  
      dnl resources are bundled both with shared library and applications
      dnl since the carb resource *must* be included in the application
  
      dnl resources are bundled both with shared library and applications
      dnl since the carb resource *must* be included in the application
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_OSX_CARBON" = 1; then
          POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
          RESCOMP="$REZ"
          WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
          POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
          RESCOMP="$REZ"
          WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
@@ -7753,6 +7902,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
@@ -7855,10 +8006,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