Remove wxUniversal configuration from the MSVC 10 project files.

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

index 6013fb588bcff3f81d452ddbc4d83ff08b07abab..b49988536d0064662d30aa70d7e15f5eea886443 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
-AC_INIT([wxWidgets], [2.9.3], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.9.5], [wx-dev@lists.wxwidgets.org])
  
  dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
  AC_CONFIG_SRCDIR([wx-config.in])
  
  dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
  AC_CONFIG_SRCDIR([wx-config.in])
@@ -43,7 +43,7 @@ dnl wx_release_number += 1
  
  wx_major_version_number=2
  wx_minor_version_number=9
  
  wx_major_version_number=2
  wx_minor_version_number=9
-wx_release_number=3
+wx_release_number=5
  wx_subrelease_number=0
  
  WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
  wx_subrelease_number=0
  
  WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
@@ -103,7 +103,7 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0
  dnl the list of all available toolkits
  dnl
  dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
  dnl the list of all available toolkits
  dnl
  dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
-ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MICROWIN MOTIF MSW PM X11 DFB"
  
  dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
  dnl     which are either yes or no
  
  dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
  dnl     which are either yes or no
@@ -112,7 +112,6 @@ DEFAULT_wxUSE_GTK=0
  DEFAULT_wxUSE_OSX_CARBON=0
  DEFAULT_wxUSE_OSX_COCOA=0
  DEFAULT_wxUSE_OSX_IPHONE=0
  DEFAULT_wxUSE_OSX_CARBON=0
  DEFAULT_wxUSE_OSX_COCOA=0
  DEFAULT_wxUSE_OSX_IPHONE=0
-DEFAULT_wxUSE_MGL=0
  DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_wxUSE_MOTIF=0
  DEFAULT_wxUSE_MSW=0
  DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_wxUSE_MOTIF=0
  DEFAULT_wxUSE_MSW=0
@@ -128,7 +127,6 @@ DEFAULT_DEFAULT_wxUSE_GTK=0
  DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
  DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
  DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
  DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
  DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
  DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
-DEFAULT_DEFAULT_wxUSE_MGL=0
  DEFAULT_DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_DEFAULT_wxUSE_MOTIF=0
  DEFAULT_DEFAULT_wxUSE_MSW=0
  DEFAULT_DEFAULT_wxUSE_MICROWIN=0
  DEFAULT_DEFAULT_wxUSE_MOTIF=0
  DEFAULT_DEFAULT_wxUSE_MSW=0
@@ -286,7 +284,6 @@ case "${host}" in
      USE_DOS=1
      AC_DEFINE(__DOS__)
      PROGRAM_EXT=".exe"
      USE_DOS=1
      AC_DEFINE(__DOS__)
      PROGRAM_EXT=".exe"
-    DEFAULT_DEFAULT_wxUSE_MGL=1
    ;;
  
    *-pc-os2_emx | *-pc-os2-emx )
    ;;
  
    *-pc-os2_emx | *-pc-os2-emx )
@@ -339,7 +336,7 @@ case "${host}" in
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(TARGET_CARBON)
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(TARGET_CARBON)
-    DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
+    DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1
    ;;
  
    *-*-beos* )
    ;;
  
    *-*-beos* )
@@ -388,27 +385,23 @@ dnl features disabled by default
  DEFAULT_wxUSE_ACCESSIBILITY=no
  DEFAULT_wxUSE_IPV6=no
  DEFAULT_wxUSE_GSTREAMER8=no
  DEFAULT_wxUSE_ACCESSIBILITY=no
  DEFAULT_wxUSE_IPV6=no
  DEFAULT_wxUSE_GSTREAMER8=no
+DEFAULT_wxUSE_UNICODE_UTF8=no
+DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
  
  dnl automatic features
  DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto
  
  dnl automatic features
  DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto
-DEFAULT_wxUSE_UNICODE_UTF8=auto
  DEFAULT_wxUSE_OPENGL=auto
  DEFAULT_wxUSE_MEDIACTRL=auto
  DEFAULT_wxUSE_COMPILER_TLS=auto
  DEFAULT_wxUSE_HOTKEY=auto
  DEFAULT_wxUSE_METAFILE=auto
  
  DEFAULT_wxUSE_OPENGL=auto
  DEFAULT_wxUSE_MEDIACTRL=auto
  DEFAULT_wxUSE_COMPILER_TLS=auto
  DEFAULT_wxUSE_HOTKEY=auto
  DEFAULT_wxUSE_METAFILE=auto
  
-DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
-
  dnl Mac/Cocoa users need to enable building universal binaries explicitly
  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
  DEFAULT_wxUSE_MAC_ARCH=no
  
  DEFAULT_wxUSE_OFFICIAL_BUILD=no
  
  dnl Mac/Cocoa users need to enable building universal binaries explicitly
  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
  DEFAULT_wxUSE_MAC_ARCH=no
  
  DEFAULT_wxUSE_OFFICIAL_BUILD=no
  
-dnl Applicable only when --with-gtk was used:
-DEFAULT_wxUSE_GTK2=yes
-
  dnl Always default to no. Only special cases require this.
  DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
  
  dnl Always default to no. Only special cases require this.
  DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
  
@@ -473,7 +466,7 @@ fi
  
  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
  
  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(gtk,          [[  --with-gtk[=VERSION]    use GTK+, VERSION can be 3, 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(osx_carbon,    [  --with-osx_carbon       use Mac OS X (Carbon)], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(osx_cocoa,     [  --with-osx_cocoa        use Mac OS X (Cocoa)], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(osx_carbon,    [  --with-osx_carbon       use Mac OS X (Carbon)], [wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(osx_cocoa,     [  --with-osx_cocoa        use Mac OS X (Cocoa)], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1])
@@ -487,13 +480,10 @@ AC_ARG_WITH(old_cocoa,     [  --with-old_cocoa        use old, deprecated, Cocoa
  AC_ARG_WITH(wine,          [  --with-wine             use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
  AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(wine,          [  --with-wine             use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
  AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(directfb,      [  --with-directfb         use DirectFB], [wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
  WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
  AC_ARG_WITH(directfb,      [  --with-directfb         use DirectFB], [wxUSE_DFB="$withval" wxUSE_UNIVERSAL="yes" CACHE_DFB=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_MICROWIN="$withval" CACHE_MICROWIN=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
  WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
-
-AC_ARG_ENABLE(gtk2,        [  --disable-gtk2          use GTK+ 1.2 instead of 2.0], [wxUSE_GTK2="$enableval"])
  WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)
  
  dnl check that no more than one toolkit is given and that if none are given that
  WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)
  
  dnl check that no more than one toolkit is given and that if none are given that
@@ -546,7 +536,7 @@ 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)
      NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
      dnl we suppose that expr is available (maybe there is a better way to do
      dnl this? what about using ALL_TOOLKITS? TODO)
      NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
-                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
                    + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
  
      dnl Allow wxUSE_PM only for OS/2 with EMX.
                    + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
  
      dnl Allow wxUSE_PM only for OS/2 with EMX.
@@ -565,15 +555,6 @@ if test "$wxUSE_GUI" = "yes"; then
          AC_MSG_ERROR(Please specify at most one toolkit)
      esac
  
          AC_MSG_ERROR(Please specify at most one toolkit)
      esac
  
-    # to be removed when --disable-gtk2 isn't needed
-    if test "x$wxUSE_GTK2" = "xyes"; then
-        wxGTK_VERSION=2
-        wxUSE_GTK1=0
-    elif test "x$wxUSE_GTK2" = "xno"; then
-        wxGTK_VERSION=1
-        wxUSE_GTK1=1
-    fi
-
      for toolkit in $ALL_TOOLKITS; do
          var=wxUSE_$toolkit
          eval "value=\$${var}"
      for toolkit in $ALL_TOOLKITS; do
          var=wxUSE_$toolkit
          eval "value=\$${var}"
@@ -604,12 +585,15 @@ dnl ---------------------------------------------------------------------------
  WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
  WX_ARG_SYS_WITH(libjpeg,   [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
  WX_ARG_SYS_WITH(libtiff,   [  --with-libtiff          use libtiff (TIFF file format)], wxUSE_LIBTIFF)
  WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
  WX_ARG_SYS_WITH(libjpeg,   [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
  WX_ARG_SYS_WITH(libtiff,   [  --with-libtiff          use libtiff (TIFF file format)], wxUSE_LIBTIFF)
+WX_ARG_WITHOUT(libjbig,    [  --without-libjbig       don't use libjbig in libtiff even if available)], wxUSE_LIBJBIG)
+WX_ARG_WITHOUT(liblzma,    [  --without-liblzma       don't use liblzma in libtiff even if available)], wxUSE_LIBLZMA)
  WX_ARG_SYS_WITH(libxpm,    [  --with-libxpm           use libxpm (XPM file format)], wxUSE_LIBXPM)
  WX_ARG_WITH(libiconv,      [  --with-libiconv         use libiconv (character conversion)], wxUSE_LIBICONV)
  WX_ARG_WITH(libmspack,     [  --with-libmspack        use libmspack (CHM help files loading)], wxUSE_LIBMSPACK)
  WX_ARG_WITHOUT(gtkprint,   [  --without-gtkprint      don't use GTK printing support], wxUSE_GTKPRINT)
  WX_ARG_WITHOUT(gnomeprint, [  --without-gnomeprint    don't use GNOME printing libraries], wxUSE_LIBGNOMEPRINT)
  WX_ARG_WITH(gnomevfs,      [  --with-gnomevfs         use GNOME VFS for associating MIME types], wxUSE_LIBGNOMEVFS)
  WX_ARG_SYS_WITH(libxpm,    [  --with-libxpm           use libxpm (XPM file format)], wxUSE_LIBXPM)
  WX_ARG_WITH(libiconv,      [  --with-libiconv         use libiconv (character conversion)], wxUSE_LIBICONV)
  WX_ARG_WITH(libmspack,     [  --with-libmspack        use libmspack (CHM help files loading)], wxUSE_LIBMSPACK)
  WX_ARG_WITHOUT(gtkprint,   [  --without-gtkprint      don't use GTK printing support], wxUSE_GTKPRINT)
  WX_ARG_WITHOUT(gnomeprint, [  --without-gnomeprint    don't use GNOME printing libraries], wxUSE_LIBGNOMEPRINT)
  WX_ARG_WITH(gnomevfs,      [  --with-gnomevfs         use GNOME VFS for associating MIME types], wxUSE_LIBGNOMEVFS)
+WX_ARG_WITH(libnotify,     [  --with-libnotify        use libnotify for notifications], wxUSE_LIBNOTIFY)
  WX_ARG_WITH(hildon,        [  --with-hildon           use Hildon framework for Nokia 770/800/810], wxUSE_LIBHILDON)
  WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
  
  WX_ARG_WITH(hildon,        [  --with-hildon           use Hildon framework for Nokia 770/800/810], wxUSE_LIBHILDON)
  WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
  
@@ -658,6 +642,7 @@ AC_ARG_ENABLE(debug,       [  --enable-debug          build library for debuggin
      ],
      wxUSE_DEBUG=default
  )
      ],
      wxUSE_DEBUG=default
  )
+AC_MSG_RESULT([${enable_debug-default}])
  
  case "$wxUSE_DEBUG" in
      yes)
  
  case "$wxUSE_DEBUG" in
      yes)
@@ -731,7 +716,7 @@ WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregardin
  WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
  WX_ARG_DISABLE(vararg_macros,[  --disable-vararg_macros don't use vararg macros, even if they are supported], wxUSE_VARARG_MACROS)
  
  WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
  WX_ARG_DISABLE(vararg_macros,[  --disable-vararg_macros don't use vararg macros, even if they are supported], wxUSE_VARARG_MACROS)
  
-WX_ARG_ENABLE_PARAM(universal_binary, [[  --enable-universal_binary  create universal binary with Mac PPC and i386 (and x86_64 if using Cocoa) architectures ]], wxUSE_UNIVERSAL_BINARY)
+WX_ARG_ENABLE_PARAM(universal_binary, [[  --enable-universal_binary=archs create universal binary for the specified (or all supported) architectures]], wxUSE_UNIVERSAL_BINARY)
  WX_ARG_ENABLE_PARAM(macosx_arch,      [[  --enable-macosx_arch=ARCH  build for just the specified architecture]], wxUSE_MAC_ARCH)
  
  WX_ARG_ENABLE(compat26,      [  --enable-compat26       enable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6)
  WX_ARG_ENABLE_PARAM(macosx_arch,      [[  --enable-macosx_arch=ARCH  build for just the specified architecture]], wxUSE_MAC_ARCH)
  
  WX_ARG_ENABLE(compat26,      [  --enable-compat26       enable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6)
@@ -790,6 +775,7 @@ WX_ARG_FEATURE(fontmap,       [  --enable-fontmap        use font encodings conv
  WX_ARG_FEATURE(fs_archive,    [  --enable-fs_archive     use virtual archive filesystems], wxUSE_FS_ARCHIVE)
  WX_ARG_FEATURE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
  WX_ARG_FEATURE(fs_zip,        [  --enable-fs_zip         now replaced by fs_archive], wxUSE_FS_ZIP)
  WX_ARG_FEATURE(fs_archive,    [  --enable-fs_archive     use virtual archive filesystems], wxUSE_FS_ARCHIVE)
  WX_ARG_FEATURE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
  WX_ARG_FEATURE(fs_zip,        [  --enable-fs_zip         now replaced by fs_archive], wxUSE_FS_ZIP)
+WX_ARG_FEATURE(fsvolume,      [  --enable-fsvolume       use wxFSVolume class], wxUSE_FSVOLUME)
  WX_ARG_FEATURE(fswatcher,     [  --enable-fswatcher      use wxFileSystemWatcher class], wxUSE_FSWATCHER)
  WX_ARG_FEATURE(geometry,      [  --enable-geometry       use geometry class], wxUSE_GEOMETRY)
  WX_ARG_FEATURE(log,           [  --enable-log            use logging system], wxUSE_LOG)
  WX_ARG_FEATURE(fswatcher,     [  --enable-fswatcher      use wxFileSystemWatcher class], wxUSE_FSWATCHER)
  WX_ARG_FEATURE(geometry,      [  --enable-geometry       use geometry class], wxUSE_GEOMETRY)
  WX_ARG_FEATURE(log,           [  --enable-log            use logging system], wxUSE_LOG)
@@ -845,11 +831,11 @@ WX_ARG_FEATURE(mdi,         [  --enable-mdi            use multiple document int
  WX_ARG_FEATURE(mdidoc,      [  --enable-mdidoc         use docview architecture with MDI], wxUSE_MDI_ARCHITECTURE)
  WX_ARG_FEATURE(mediactrl,   [  --enable-mediactrl      use wxMediaCtrl class], wxUSE_MEDIACTRL)
  WX_ARG_FEATURE(gstreamer8,  [  --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix], wxUSE_GSTREAMER8)
  WX_ARG_FEATURE(mdidoc,      [  --enable-mdidoc         use docview architecture with MDI], wxUSE_MDI_ARCHITECTURE)
  WX_ARG_FEATURE(mediactrl,   [  --enable-mediactrl      use wxMediaCtrl class], wxUSE_MEDIACTRL)
  WX_ARG_FEATURE(gstreamer8,  [  --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix], wxUSE_GSTREAMER8)
-WX_ARG_FEATURE(webkit,      [  --enable-webkit         use wxWebKitCtrl (Mac)], wxUSE_WEBKIT)
  WX_ARG_FEATURE(richtext,    [  --enable-richtext       use wxRichTextCtrl], wxUSE_RICHTEXT)
  WX_ARG_FEATURE(postscript,  [  --enable-postscript     use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
  WX_ARG_FEATURE(printarch,   [  --enable-printarch      use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
  WX_ARG_FEATURE(svg,         [  --enable-svg            use wxSVGFileDC device context], wxUSE_SVG)
  WX_ARG_FEATURE(richtext,    [  --enable-richtext       use wxRichTextCtrl], wxUSE_RICHTEXT)
  WX_ARG_FEATURE(postscript,  [  --enable-postscript     use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
  WX_ARG_FEATURE(printarch,   [  --enable-printarch      use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
  WX_ARG_FEATURE(svg,         [  --enable-svg            use wxSVGFileDC device context], wxUSE_SVG)
+WX_ARG_FEATURE(webkit,      [  --enable-webkit         use wxWebKitCtrl (Mac-only, use wxWebView instead)], wxUSE_WEBKIT)
  WX_ARG_FEATURE(webview,     [  --enable-webview        use wxWebView library], wxUSE_WEBVIEW)
  
  dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter
  WX_ARG_FEATURE(webview,     [  --enable-webview        use wxWebView library], wxUSE_WEBVIEW)
  
  dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter
@@ -915,6 +901,7 @@ if test "$wxUSE_CONTROLS" = "no"; then
      DEFAULT_wxUSE_RADIOBOX=no
      DEFAULT_wxUSE_RADIOBTN=no
      DEFAULT_wxUSE_RICHMSGDLG=no
      DEFAULT_wxUSE_RADIOBOX=no
      DEFAULT_wxUSE_RADIOBTN=no
      DEFAULT_wxUSE_RICHMSGDLG=no
+    DEFAULT_wxUSE_RICHTOOLTIP=no
      DEFAULT_wxUSE_REARRANGECTRL=no
      DEFAULT_wxUSE_SASH=no
      DEFAULT_wxUSE_SCROLLBAR=no
      DEFAULT_wxUSE_REARRANGECTRL=no
      DEFAULT_wxUSE_SASH=no
      DEFAULT_wxUSE_SCROLLBAR=no
@@ -927,6 +914,7 @@ if test "$wxUSE_CONTROLS" = "no"; then
      DEFAULT_wxUSE_STATBOX=no
      DEFAULT_wxUSE_STATLINE=no
      DEFAULT_wxUSE_STATUSBAR=no
      DEFAULT_wxUSE_STATBOX=no
      DEFAULT_wxUSE_STATLINE=no
      DEFAULT_wxUSE_STATUSBAR=no
+    DEFAULT_wxUSE_TIMEPICKCTRL=no
      DEFAULT_wxUSE_TIPWINDOW=no
      DEFAULT_wxUSE_TOGGLEBTN=no
      DEFAULT_wxUSE_TOOLBAR=no
      DEFAULT_wxUSE_TIPWINDOW=no
      DEFAULT_wxUSE_TOGGLEBTN=no
      DEFAULT_wxUSE_TOOLBAR=no
@@ -983,9 +971,11 @@ WX_ARG_FEATURE(notebook,    [  --enable-notebook       use wxNotebook class], wx
  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(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(prefseditor, [  --enable-prefseditor    use wxPreferencesEditor class], wxUSE_PREFERENCES_EDITOR)
  WX_ARG_FEATURE(radiobox,    [  --enable-radiobox       use wxRadioBox class], wxUSE_RADIOBOX)
  WX_ARG_FEATURE(radiobtn,    [  --enable-radiobtn       use wxRadioButton class], wxUSE_RADIOBTN)
  WX_ARG_FEATURE(richmsgdlg,  [  --enable-richmsgdlg     use wxRichMessageDialog class], wxUSE_RICHMSGDLG)
  WX_ARG_FEATURE(radiobox,    [  --enable-radiobox       use wxRadioBox class], wxUSE_RADIOBOX)
  WX_ARG_FEATURE(radiobtn,    [  --enable-radiobtn       use wxRadioButton class], wxUSE_RADIOBTN)
  WX_ARG_FEATURE(richmsgdlg,  [  --enable-richmsgdlg     use wxRichMessageDialog class], wxUSE_RICHMSGDLG)
+WX_ARG_FEATURE(richtooltip, [  --enable-richtooltip    use wxRichToolTip class], wxUSE_RICHTOOLTIP)
  WX_ARG_FEATURE(rearrangectrl,[  --enable-rearrangectrl  use wxRearrangeList/Ctrl/Dialog], wxUSE_REARRANGECTRL)
  WX_ARG_FEATURE(sash,        [  --enable-sash           use wxSashWindow class], wxUSE_SASH)
  WX_ARG_FEATURE(scrollbar,   [  --enable-scrollbar      use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR)
  WX_ARG_FEATURE(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)
@@ -1002,6 +992,7 @@ WX_ARG_FEATURE(statusbar,   [  --enable-statusbar      use wxStatusBar class], w
  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(taskbaricon, [  --enable-taskbaricon    use wxTaskBarIcon class], wxUSE_TASKBARICON)
  WX_ARG_FEATURE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
  WX_ARG_FEATURE(textctrl,    [  --enable-textctrl       use wxTextCtrl class], wxUSE_TEXTCTRL)
+WX_ARG_FEATURE(datepick,    [  --enable-timepick       use wxTimePickerCtrl class], wxUSE_TIMEPICKCTRL)
  WX_ARG_FEATURE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)
  WX_ARG_FEATURE(togglebtn,   [  --enable-togglebtn      use wxToggleButton class], wxUSE_TOGGLEBTN)
  WX_ARG_FEATURE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUSE_TOOLBAR)
  WX_ARG_FEATURE(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)
@@ -1048,7 +1039,7 @@ WX_ARG_FEATURE(dragimage,   [  --enable-dragimage      use wxDragImage], wxUSE_D
  WX_ARG_FEATURE(accessibility,[  --enable-accessibility  enable accessibility support], wxUSE_ACCESSIBILITY)
  WX_ARG_FEATURE(uiactionsim,  [  --enable-uiactionsim    use wxUIActionSimulator (experimental)], wxUSE_UIACTIONSIMULATOR)
  WX_ARG_FEATURE(dctransform,  [  --enable-dctransform    use wxDC::SetTransformMatrix and related], wxUSE_DC_TRANSFORM_MATRIX)
  WX_ARG_FEATURE(accessibility,[  --enable-accessibility  enable accessibility support], wxUSE_ACCESSIBILITY)
  WX_ARG_FEATURE(uiactionsim,  [  --enable-uiactionsim    use wxUIActionSimulator (experimental)], wxUSE_UIACTIONSIMULATOR)
  WX_ARG_FEATURE(dctransform,  [  --enable-dctransform    use wxDC::SetTransformMatrix and related], wxUSE_DC_TRANSFORM_MATRIX)
-WX_ARG_FEATURE(webviewwebkit,[  --enable-webview-webkit use wxWebView WebKit backend], wxUSE_WEBVIEW_WEBKIT)
+WX_ARG_FEATURE(webviewwebkit,[  --enable-webviewwebkit  use wxWebView WebKit backend], wxUSE_WEBVIEW_WEBKIT)
  
  dnl ---------------------------------------------------------------------------
  dnl support for image formats that do not rely on external library
  
  dnl ---------------------------------------------------------------------------
  dnl support for image formats that do not rely on external library
@@ -1073,7 +1064,7 @@ WX_ARG_FEATURE(ps-in-msw,   [  --enable-ps-in-msw      use PS printing in wxMSW
  WX_ARG_FEATURE(ownerdrawn,  [  --enable-ownerdrawn     use owner drawn controls (Win32 and OS/2 only)], wxUSE_OWNER_DRAWN)
  WX_ARG_FEATURE(uxtheme,     [  --enable-uxtheme        enable support for Windows XP themed look (Win32 only)], wxUSE_UXTHEME)
  WX_ARG_FEATURE(wxdib,       [  --enable-wxdib          use wxDIB class (Win32 only)], wxUSE_DIB)
  WX_ARG_FEATURE(ownerdrawn,  [  --enable-ownerdrawn     use owner drawn controls (Win32 and OS/2 only)], wxUSE_OWNER_DRAWN)
  WX_ARG_FEATURE(uxtheme,     [  --enable-uxtheme        enable support for Windows XP themed look (Win32 only)], wxUSE_UXTHEME)
  WX_ARG_FEATURE(wxdib,       [  --enable-wxdib          use wxDIB class (Win32 only)], wxUSE_DIB)
-WX_ARG_FEATURE(webviewie,   [  --enable-webview-ie     use wxWebView IE backend (Win32 only)], wxUSE_WEBVIEW_IE)
+WX_ARG_FEATURE(webviewie,   [  --enable-webviewie      use wxWebView IE backend (Win32 only)], wxUSE_WEBVIEW_IE)
  
  dnl this one is not really MSW-specific but it exists mainly to be turned off
  dnl under MSW, it should be off by default on the other platforms
  
  dnl this one is not really MSW-specific but it exists mainly to be turned off
  dnl under MSW, it should be off by default on the other platforms
@@ -1146,60 +1137,53 @@ if test "$wxUSE_MAC" = 1; then
  retest_macosx_linking=no
  
  OSX_ARCH_OPTS=""
  retest_macosx_linking=no
  
  OSX_ARCH_OPTS=""
-if test "x$wxUSE_MAC_ARCH" != xno; then
-    OSX_ARCH_OPTS="-arch $wxUSE_MAC_ARCH"
-fi
-
-dnl Support the old --enable-universal_binary in case anyone was using it.
-    if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
-        dnl --enable-universal_binary uses a default SDK (currently 10.4u)
-        dnl --enable-universal_binary=SDK names a path to an SDK
-        if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
-            # Implicitly turn on the new --with-macosx-sdk using the default
-            # SDK which provides the behaviour this option has always had.
-            if test "x$wxUSE_MACOSX_SDK" = "x"; then
-                AC_MSG_WARN([Enabling default SDK due to --enable-universal_binary.])
-                AC_MSG_WARN([If you don't want this, specify --without-macosx-sdk])
-                wxUSE_MACOSX_SDK=yes
-            fi
-        else
-            # Complain to user if he specified an argument to --enable-universal_binary
-            # and also 1) specified --with-macosx-sdk using the default (yes) or
-            # 2) specified --with-macosx-sdk using a path or 3) specified
-            # --without-macosx-sdk (no).
-            if test "x$wxUSE_MACOSX_SDK" != "x" ; then
-                AC_MSG_FAILURE([Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary])
-            else
-                # Put the SDK path into the wxUSE_MACOSX_SDK.  We don't have to
-                # special-case the empty string because the below test simply
-                # converts "no" to the empty string anyway.
-                wxUSE_MACOSX_SDK="$wxUSE_UNIVERSAL_BINARY"
-                dnl Warn about deprecated usage.
-                AC_MSG_WARN([Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument])
-            fi
-        fi
-        dnl FIXME: I think it would be better to put this into CC, CXX, and LD rather than the flags.
-        OSX_ARCH_OPTS="-arch ppc -arch i386"
-       if test "$wxUSE_OSX_COCOA" = 1; then
-            OSX_ARCH_OPTS="$OSX_ARCH_OPTS -arch x86_64"
+
+dnl Deal with architecture selection. By default, we compile for the current
+dnl architecture, whatever it is. With --enable-universal_binary the list of
+dnl architectures can be explicitly specified. If it isn't, we compile for all
+dnl supported ones.
+if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
+    if test "x$wxUSE_MAC_ARCH" != xno; then
+        AC_MSG_WARN([--enable-macosx_arch is ignored when --enable-universal_binary is used.])
+    fi
+
+    if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
+        OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY
+    else dnl Use all architectures supported
+        OSX_ARCH_OPTS="ppc,i386"
+        if test "$wxUSE_OSX_COCOA" = 1; then
+            OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
          fi
          fi
-        AC_MSG_CHECKING([for universal binary architectures])
-       AC_MSG_RESULT([$OSX_ARCH_OPTS])
-
-        dnl NOTE: Only the compiler driver needs arch flags.  The link editor
-        dnl is incapable of using them but the compiler driver (which we use
-        dnl as LD when building dynamic libraries) uses them to invoke the
-        dnl real ld multiple times.  If we moved to libtool -dynamic we would
-        dnl need no arch flags because libtool automatically invokes ld for
-        dnl every architecture found in the fat input files.
-        dnl
-        dnl For static library builds, AR/RANLIB automatically create proper
-        dnl fat archives although AR is unable to update them once RANLIB has
-        dnl made them into proper fat archives.  Fortunately, our link process
-        dnl simply removes the .a file before using ar to create a new one.
-        dnl If we did move to libtool -static we still wouldn't need arch flags
-        dnl because libtool automatically figures it out based on input.
-        retest_macosx_linking=yes
+    fi
+
+    AC_MSG_CHECKING([for architectures to use in universal binary])
+    AC_MSG_RESULT([$OSX_ARCH_OPTS])
+
+    dnl NOTE: Only the compiler driver needs arch flags.  The link editor
+    dnl is incapable of using them but the compiler driver (which we use
+    dnl as LD when building dynamic libraries) uses them to invoke the
+    dnl real ld multiple times.  If we moved to libtool -dynamic we would
+    dnl need no arch flags because libtool automatically invokes ld for
+    dnl every architecture found in the fat input files.
+    dnl
+    dnl For static library builds, AR/RANLIB automatically create proper
+    dnl fat archives although AR is unable to update them once RANLIB has
+    dnl made them into proper fat archives.  Fortunately, our link process
+    dnl simply removes the .a file before using ar to create a new one.
+    dnl If we did move to libtool -static we still wouldn't need arch flags
+    dnl because libtool automatically figures it out based on input.
+    retest_macosx_linking=yes
+else
+    if test "x$wxUSE_MAC_ARCH" != xno; then
+        OSX_ARCH_OPTS=$wxUSE_MAC_ARCH
+    fi
+fi
+
+if test "x$OSX_ARCH_OPTS" != "x"; then
+    dnl Check if there is more than one architecture
+    if echo $OSX_ARCH_OPTS | grep -q ","; then
+        AC_MSG_WARN([Disabling dependency tracking due to universal binary build.])
+        disable_macosx_deps=yes
  
          dnl HACK: PCH could be made to work by precompiling for each architecture into separate directories
          dnl and including all architecture directories with each compiler invocation.
  
          dnl HACK: PCH could be made to work by precompiling for each architecture into separate directories
          dnl and including all architecture directories with each compiler invocation.
@@ -1209,11 +1193,14 @@ dnl Support the old --enable-universal_binary in case anyone was using it.
          bk_use_pch=no
      fi
  
          bk_use_pch=no
      fi
  
-CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
-CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
-OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
-OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS"
-LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
+    OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'`
+
+    CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
+    CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
+    OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
+    OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS"
+    LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
+fi
  
  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.
@@ -1272,66 +1259,14 @@ 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
-    AC_CHECK_PROGS(OSX_SW_VERS, sw_vers)
-    if test "$OSX_SW_VERS" != ""; then
-        OSX_VERSION=`sw_vers -productVersion | grep 10.[[0-9]]`
-    else
-        dnl can't determine it (happens e.g. when cross-compiling) so use a
-        dnl conservative default
-        AC_MSG_WARN([Assuming OS X 10.4, use --with-macosx-version-min to override.])
-        OSX_VERSION="10.4"
-    fi
-
-    case "$OSX_VERSION" in
-        10.4* )
-            wxUSE_MACOSX_VERSION_MIN=10.4
-            ;;
-
-        * )
-            if test "$wxUSE_OSX_CARBON" = 1; then
-                # otherwise configure stops on leopard for universal_binary
-                wxUSE_MACOSX_VERSION_MIN=10.4
-            else
-                # for Cocoa, use 10.5 to be able to compile it in 64 bits too
-                wxUSE_MACOSX_VERSION_MIN=10.5
-            fi
-            ;;
-    esac
-fi
-
-NEEDS_GCC40="no"
-if test "x$wxUSE_MACOSX_VERSION_MIN" == "x10.4"; then
-    NEEDS_GCC40="yes"
-fi
-
-if test "$wxUSE_OSX_CARBON" = 1; then
-    NEEDS_GCC40="yes"
-fi
-
-if test "x$NEEDS_GCC40" == "xyes"; then
-    # gcc 4.2 cannot compile 10.4 compatible code, so if the user is using it
-    # and wants 10.4 compatible code, then 'downgrade' to 4.0
-    # This is also the simplest way to get 32-bit binaries on Snow Leopard.
-    if test "x$CC" = "xgcc"; then
-        CCVERSION=`$CC --version | grep 4.[[2-9]].`
-        if test "x$CCVERSION" != "x"; then
-            echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead."
-            CC="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="g++-4.0"
-        fi
-    fi
+    wxUSE_MACOSX_VERSION_MIN=10.5
  fi
  
  if test "x$MACOSX_SDK_OPTS" != "x"; then 
      eval "CC=\"$CC $MACOSX_SDK_OPTS\""
      eval "CXX=\"$CXX $MACOSX_SDK_OPTS\""
      eval "LD=\"$LD $MACOSX_SDK_OPTS\""
  fi
  
  if test "x$MACOSX_SDK_OPTS" != "x"; then 
      eval "CC=\"$CC $MACOSX_SDK_OPTS\""
      eval "CXX=\"$CXX $MACOSX_SDK_OPTS\""
      eval "LD=\"$LD $MACOSX_SDK_OPTS\""
+    retest_macosx_linking=yes
  fi
  
  if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
  fi
  
  if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
@@ -1351,12 +1286,12 @@ dnl still compile and link both C and C++.  If we didn't do this, then most
  dnl of the remaining tests would fail.
  if test "x$retest_macosx_linking" = "xyes"; then
      AC_LANG_PUSH(C)
  dnl of the remaining tests would fail.
  if test "x$retest_macosx_linking" = "xyes"; then
      AC_LANG_PUSH(C)
-    AC_MSG_CHECKING([if C compiler works with SDK/version options])
+    AC_MSG_CHECKING([if C compiler ($CC) works with SDK/version options])
      AC_TRY_LINK([],[],[AC_MSG_RESULT([yes])],[AC_MSG_FAILURE([no.  Try a different SDK]); exit 1])
      AC_LANG_POP()
  
      AC_LANG_PUSH(C++)
      AC_TRY_LINK([],[],[AC_MSG_RESULT([yes])],[AC_MSG_FAILURE([no.  Try a different SDK]); exit 1])
      AC_LANG_POP()
  
      AC_LANG_PUSH(C++)
-    AC_MSG_CHECKING([if C++ compiler works with SDK/version options])
+    AC_MSG_CHECKING([if C++ compiler ($CXX) works with SDK/version options])
      AC_TRY_LINK([],[],[AC_MSG_RESULT([yes])],[AC_MSG_FAILURE([no.  Try a different SDK]); exit 1])
      AC_LANG_POP()
  fi
      AC_TRY_LINK([],[],[AC_MSG_RESULT([yes])],[AC_MSG_FAILURE([no.  Try a different SDK]); exit 1])
      AC_LANG_POP()
  fi
@@ -1380,10 +1315,34 @@ dnl ------------------------------------------------------------------------
  dnl Platform specific tests
  dnl ------------------------------------------------------------------------
  
  dnl Platform specific tests
  dnl ------------------------------------------------------------------------
  
-dnl xlC needs -qunique under AIX so that one source file can be
-dnl compiled to multiple object files and safely linked together.
-if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
-    CXXFLAGS="-qunique $CXXFLAGS"
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
+    dnl While g++ predefines _GNU_SOURCE by default, gcc does not, so do it
+    dnl explicitly to ensure that the tests done below using C compiler
+    dnl succeed, otherwise things like pthread_mutexattr_settype() (and many
+    dnl others) wouldn't be detected.
+    AC_DEFINE(_GNU_SOURCE)
+
+    dnl For non-g++ compilers (including gcc, as mentioned above) we need to
+    dnl add this flag explicitly when building our own code later too.
+    GNU_SOURCE_FLAG="-D_GNU_SOURCE"
+    CFLAGS="$GNU_SOURCE_FLAG $CFLAGS"
+fi
+
+if test "x$USE_AIX" = "x1"; then
+    dnl xlC needs -qunique under AIX so that one source file can be
+    dnl compiled to multiple object files and safely linked together.
+    if test "x$XLCXX" = "xyes"; then
+        CXXFLAGS="-qunique $CXXFLAGS"
+    fi
+
+    dnl AIX sys/timer.h header #defines func_data as t_union.data breaking the
+    dnl compilation of GTK+ headers that use func_data as parameter name in
+    dnl several places. We could work around this by inserting "#undef
+    dnl func_data" in the code but IBM provides a possibility to disable this
+    dnl #define by pre-defining the symbol below and this seems to be simpler.
+    dnl And if we have any problems because of it we can always remove it and
+    dnl use the #undef approach.
+    CPPFLAGS="-D_LINUX_SOURCE_COMPAT $CPPFLAGS"
  fi
  
  dnl This case is for PowerPC OS X vs. everything else
  fi
  
  dnl This case is for PowerPC OS X vs. everything else
@@ -1476,7 +1435,6 @@ if test "$wants_win32" = 1 ; then
      USE_UNIX=0
      USE_WIN32=1
      AC_DEFINE(__WIN32__)
      USE_UNIX=0
      USE_WIN32=1
      AC_DEFINE(__WIN32__)
-    AC_DEFINE(__WIN95__)
      AC_DEFINE(__WINDOWS__)
      AC_DEFINE(__GNUWIN32__)
      AC_DEFINE(STRICT)
      AC_DEFINE(__WINDOWS__)
      AC_DEFINE(__GNUWIN32__)
      AC_DEFINE(STRICT)
@@ -1507,9 +1465,6 @@ case "${host}" in
            dnl More complete Unix emulation for unix-like ports
            dnl by linking in POSIX/2's cExt (if available).
            AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt")
            dnl More complete Unix emulation for unix-like ports
            dnl by linking in POSIX/2's cExt (if available).
            AC_CHECK_LIB(cExt, drand48, LIBS="$LIBS -lcExt")
-      else
-          dnl Include resources for the "native" port (wxPM).
-          RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
        fi
        dnl Check for the gcc version (and thereby for the C runtime library).
        dnl wx_cv_gccversion = EMX2 -> Standard EMX environment
        fi
        dnl Check for the gcc version (and thereby for the C runtime library).
        dnl wx_cv_gccversion = EMX2 -> Standard EMX environment
@@ -1564,50 +1519,6 @@ case "${host}" in
        fi
        dnl (end of OS/2-only piece)
    ;;
        fi
        dnl (end of OS/2-only piece)
    ;;
-  *)
-      dnl ---------------------------------------------------------------------
-      dnl look for strcasecmp() in string.h and then strings.h if it's not
-      dnl there. Don't do this on OS/2, where "stricmp" is the function to be
-      dnl used.
-      dnl ---------------------------------------------------------------------
-      dnl (non-OS/2-only piece)
-
-      AC_CACHE_CHECK([for strcasecmp() in string.h], ac_cv_string_strcasecmp, [
-          AC_TRY_LINK([
-              #include <string.h>
-              ],
-              [
-                  strcasecmp("foo", "bar");
-              ],
-              ac_cv_string_strcasecmp=yes,
-              ac_cv_string_strcasecmp=no
-          )
-      ])
-
-      if test x"$ac_cv_string_strcasecmp" = "xyes"; then
-          AC_DEFINE(HAVE_STRCASECMP_IN_STRING_H)
-      else
-          AC_CACHE_CHECK([for strcasecmp() in strings.h], ac_cv_strings_strcasecmp, [
-              AC_TRY_LINK([
-                  #include <strings.h>
-                  ],
-                  [
-                      strcasecmp("foo", "bar");
-                  ],
-                  ac_cv_strings_strcasecmp=yes,
-                  ac_cv_strings_strcasecmp=no
-              )
-          ])
-
-          if test x"$ac_cv_strings_strcasecmp" = "xyes"; then
-              AC_DEFINE(HAVE_STRCASECMP_IN_STRINGS_H)
-          else
-              AC_MSG_ERROR([No case-insensitive string comparison function found.])
-          fi
-      fi
-
-      dnl (end of non-OS/2-only piece)
-  ;;
  esac
  
  dnl ------------------------------------------------------------------------
  esac
  
  dnl ------------------------------------------------------------------------
@@ -1636,9 +1547,15 @@ case "${host}" in
    ;;
  esac
  
    ;;
  esac
  
-dnl POSIX needs this for select(), but old systems don't have it
  if test "$USE_UNIX" = 1 ; then
  if test "$USE_UNIX" = 1 ; then
+    dnl POSIX needs this for select(), but old systems don't have it
      AC_CHECK_HEADERS([sys/select.h],,, [AC_INCLUDES_DEFAULT()])
      AC_CHECK_HEADERS([sys/select.h],,, [AC_INCLUDES_DEFAULT()])
+
+    dnl Header defining C++ ABI is currently only available with g++ but test
+    dnl for it unconditionally in case it becomes supported by other compilers.
+    AC_LANG_PUSH(C++)
+    AC_CHECK_HEADERS([cxxabi.h],,, [AC_INCLUDES_DEFAULT()])
+    AC_LANG_POP()
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -1705,20 +1622,22 @@ AC_CACHE_CHECK([for va_copy],
      [
          AC_LANG_PUSH(C++)
          AC_LINK_IFELSE([
      [
          AC_LANG_PUSH(C++)
          AC_LINK_IFELSE([
-            #include <stdarg.h>
-            void foo(char *f, ...)
-            {
-                va_list ap1, ap2;
-                va_start(ap1, f);
-                va_copy(ap2, ap1);
-                va_end(ap2);
-                va_end(ap1);
-            }
-            int main()
-            {
-                foo("hi", 17);
-                return 0;
-            }],
+            AC_LANG_SOURCE([
+                #include <stdarg.h>
+                void foo(char *f, ...)
+                {
+                    va_list ap1, ap2;
+                    va_start(ap1, f);
+                    va_copy(ap2, ap1);
+                    va_end(ap2);
+                    va_end(ap1);
+                }
+                int main()
+                {
+                    foo("hi", 17);
+                    return 0;
+                }])
+            ],
              wx_cv_func_va_copy=yes,
              wx_cv_func_va_copy=no
          )
              wx_cv_func_va_copy=yes,
              wx_cv_func_va_copy=no
          )
@@ -1734,22 +1653,24 @@ else
          wx_cv_type_va_list_lvalue,
          [
              AC_RUN_IFELSE([
          wx_cv_type_va_list_lvalue,
          [
              AC_RUN_IFELSE([
-                #include <stdarg.h>
-                int foo(char *f, ...)
-                {
-                    va_list ap1, ap2;
-                    va_start(ap1, f);
-                    ap2 = ap1;
-                    if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 )
-                        return 1;
-                    va_end(ap2);
-                    va_end(ap1);
-                    return 0;
-                }
-                int main()
-                {
-                    return foo("hi", 17);
-                }],
+                AC_LANG_SOURCE([
+                    #include <stdarg.h>
+                    int foo(char *f, ...)
+                    {
+                        va_list ap1, ap2;
+                        va_start(ap1, f);
+                        ap2 = ap1;
+                        if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 )
+                            return 1;
+                        va_end(ap2);
+                        va_end(ap1);
+                        return 0;
+                    }
+                    int main()
+                    {
+                        return foo("hi", 17);
+                    }])
+                ],
                  wx_cv_type_va_list_lvalue=yes,
                  wx_cv_type_va_list_lvalue=no,
                  dnl assume most common case for cross-compiling...
                  wx_cv_type_va_list_lvalue=yes,
                  wx_cv_type_va_list_lvalue=no,
                  dnl assume most common case for cross-compiling...
@@ -1778,7 +1699,7 @@ AC_CACHE_CHECK(
          dnl C compiler might support variadic macros when C++ one doesn't
          dnl (happens with gcc/g++ 2.95.4), so must use C++ one explicitly
          AC_LANG_PUSH(C++)
          dnl C compiler might support variadic macros when C++ one doesn't
          dnl (happens with gcc/g++ 2.95.4), so must use C++ one explicitly
          AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE(
+        AC_COMPILE_IFELSE([
              AC_LANG_PROGRAM(
                  [
                      #include <stdio.h>
              AC_LANG_PROGRAM(
                  [
                      #include <stdio.h>
@@ -1787,7 +1708,7 @@ AC_CACHE_CHECK(
                  [
                      test("%s %d %p", "test", 1, 0);
                  ]
                  [
                      test("%s %d %p", "test", 1, 0);
                  ]
-            ),
+            )],
              [wx_cv_have_variadic_macros=yes],
              [wx_cv_have_variadic_macros=no]
              )
              [wx_cv_have_variadic_macros=yes],
              [wx_cv_have_variadic_macros=no]
              )
@@ -1799,6 +1720,8 @@ if test $wx_cv_have_variadic_macros = "yes"; then
      AC_DEFINE(HAVE_VARIADIC_MACROS)
  fi
  
      AC_DEFINE(HAVE_VARIADIC_MACROS)
  fi
  
+else
+    AC_DEFINE(wxNO_VARIADIC_MACROS)
  fi dnl wxUSE_VARARG_MACROS == yes
  
  
  fi dnl wxUSE_VARARG_MACROS == yes
  
  
@@ -1877,7 +1800,7 @@ WX_CPP_EXPLICIT
  dnl With Sun CC, temporaries have block scope by default. This flag is needed
  dnl to get the expression scope behaviour that conforms to the standard.
  if test "x$SUNCXX" = xyes; then
  dnl With Sun CC, temporaries have block scope by default. This flag is needed
  dnl to get the expression scope behaviour that conforms to the standard.
  if test "x$SUNCXX" = xyes; then
-    CXXFLAGS="-features=tmplife $CXXFLAGS"
+    CXXFLAGS="-features=tmplife $GNU_SOURCE_FLAG $CXXFLAGS"
  fi
  
  dnl Sun X11 headers are (still, in 2005!) non-ANSI and the best they could do
  fi
  
  dnl Sun X11 headers are (still, in 2005!) non-ANSI and the best they could do
@@ -2251,7 +2174,7 @@ SEARCH_INCLUDE="\
  
  dnl try to find out the standard lib locations for the systems with multiple
  dnl ABIs
  
  dnl try to find out the standard lib locations for the systems with multiple
  dnl ABIs
-AC_MSG_CHECKING([for libraries directory])
+AC_MSG_CHECKING([for libraries directories])
  
  case "${host}" in
      *-*-irix6* )
  
  case "${host}" in
      *-*-irix6* )
@@ -2264,7 +2187,9 @@ case "${host}" in
                          if test -f $libc; then
                              save_LIBS="$LIBS"
                              LIBS="$libc"
                          if test -f $libc; then
                              save_LIBS="$LIBS"
                              LIBS="$libc"
-                            AC_LINK_IFELSE([int main() { return 0; }],
+                            AC_LINK_IFELSE([
+                                    AC_LANG_SOURCE([int main() { return 0; }])
+                                ],
                                  wx_cv_std_libpath=`echo $d | sed s@/usr/@@`)
                              LIBS="$save_LIBS"
                              if test "x$wx_cv_std_libpath" != "x"; then
                                  wx_cv_std_libpath=`echo $d | sed s@/usr/@@`)
                              LIBS="$save_LIBS"
                              if test "x$wx_cv_std_libpath" != "x"; then
@@ -2273,9 +2198,6 @@ case "${host}" in
                          fi
                      done
                  done
                          fi
                      done
                  done
-                if test "x$wx_cv_std_libpath" = "x"; then
-                    wx_cv_std_libpath="lib"
-                fi
              ]
          )
          ;;
              ]
          )
          ;;
@@ -2284,29 +2206,50 @@ case "${host}" in
          dnl use ../lib or ../lib/64 depending on the size of void*
          if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
              wx_cv_std_libpath="lib/64"
          dnl use ../lib or ../lib/64 depending on the size of void*
          if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
              wx_cv_std_libpath="lib/64"
-        else
-            wx_cv_std_libpath="lib"
          fi
          ;;
  
      *-*-linux* )
          fi
          ;;
  
      *-*-linux* )
-        dnl use ../lib or ../lib64 depending on the size of void*
-        if test "$ac_cv_sizeof_void_p" = 8 -a \
-                -d "/usr/lib64" -a ! -h "/usr/lib64"; then
-            wx_cv_std_libpath="lib64"
+        dnl Recent Debian versions (as of 2011) use new approach to multiarch
+        dnl and put the libraries under /usr/lib/arch-linux-gnu. Annoyingly,
+        dnl "arch" here is not `uname -m` because it is "i386" even when uname
+        dnl returns e.g. "i686". So we need to test for it explicitly.
+        if test "$ac_cv_sizeof_void_p" = 8; then
+            if test -d "/usr/lib/`uname -m`-linux-gnu"; then
+                wx_cv_std_libfullpath="/usr/lib/`uname -m`-linux-gnu"
+            elif test -d "/usr/lib64" -a ! -h "/usr/lib64"; then
+                wx_cv_std_libpath="lib64"
+            fi
          else
          else
-            wx_cv_std_libpath="lib"
+            case "${host}" in
+                i*86-*-linux* )
+                    if test -d '/usr/lib/i386-linux-gnu'; then
+                        wx_cv_std_libfullpath='/usr/lib/i386-linux-gnu'
+                    fi
+            esac
          fi
          fi
-        ;;
  
  
-    *)
-        wx_cv_std_libpath="lib";
+        dnl And on top of all this, some packages haven't been updated for
+        dnl full multiarch support yet so we still need to look in /usr/lib
+        dnl too as well.
+        if test -n "$wx_cv_std_libfullpath" -a -d "/usr/lib"; then
+            wx_cv_std_libfullpath="$wx_cv_std_libfullpath /usr/lib"
+        fi
          ;;
  esac
  
          ;;
  esac
  
-AC_MSG_RESULT($wx_cv_std_libpath)
+if test -z "$wx_cv_std_libpath"; then
+    wx_cv_std_libpath="lib"
+fi
+
+if test -z "$wx_cv_std_libfullpath"; then
+    wx_cv_std_libfullpath="/usr/$wx_cv_std_libpath"
+fi
+
  
  
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
+AC_MSG_RESULT($wx_cv_std_libfullpath)
+
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath"
  
  dnl Cross compiling with gcc?
  if test "$build" != "$host" -a "$GCC" = yes; then
  
  dnl Cross compiling with gcc?
  if test "$build" != "$host" -a "$GCC" = yes; then
@@ -2338,7 +2281,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then
              x_includes=$ac_find_includes
          fi
          if test -z "$x_libraries" -o "$x_libraries" = NONE; then
              x_includes=$ac_find_includes
          fi
          if test -z "$x_libraries" -o "$x_libraries" = NONE; then
-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt)
+            WX_PATH_FIND_LIBRARIES(Xt)
              x_libraries=$ac_find_libraries
          fi
      fi
              x_libraries=$ac_find_libraries
          fi
      fi
@@ -2351,45 +2294,6 @@ dnl ------------------------------------------------------------------------
  dnl flush the cache because checking for libraries below might abort
  AC_CACHE_SAVE
  
  dnl flush the cache because checking for libraries below might abort
  AC_CACHE_SAVE
  
-dnl check for glibc version
-dnl
-dnl VZ: I have no idea why had this check been there originally, but now
-dnl     we could probably do without it by just always adding _GNU_SOURCE
-if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
-    AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
-        AC_TRY_COMPILE([#include <features.h>],
-            [
-                #if (__GLIBC__ < 2) || (__GLIBC_MINOR__ < 1)
-                not glibc 2.1
-                #endif
-            ],
-            [
-                wx_cv_lib_glibc21=yes
-            ],
-            [
-                wx_cv_lib_glibc21=no
-            ]
-        )
-    ])
-    if test "$wx_cv_lib_glibc21" = "yes"; then
-        AC_DEFINE(wxHAVE_GLIBC2)
-    fi
-fi
-
-dnl we may need _GNU_SOURCE for 2 things:
-dnl
-dnl  1. to get PTHREAD_MUTEX_RECURSIVE with glibc 2.1+ (strictly speaking we
-dnl  only need _XOPEN_SOURCE=500 but just defining this disables _BSD_SOURCE
-dnl  which breaks libtiff compilation, so it is simpler to just define
-dnl  _GNU_SOURCE to get everything)
-dnl
-dnl  2. for Unicode functions
-if test "x$wx_cv_lib_glibc21" = "xyes"; then
-    if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then
-        AC_DEFINE(_GNU_SOURCE)
-    fi
-fi
-
  dnl Only add the -lm library if floating point functions cannot be used
  dnl without it.  This check is important on cygwin because of the bizarre
  dnl way that they have organized functions into libraries.  On cygwin, both
  dnl Only add the -lm library if floating point functions cannot be used
  dnl without it.  This check is important on cygwin because of the bizarre
  dnl way that they have organized functions into libraries.  On cygwin, both
@@ -2578,63 +2482,54 @@ PNG_LINK=
  if test "$wxUSE_LIBPNG" != "no" ; then
      AC_DEFINE(wxUSE_LIBPNG)
  
  if test "$wxUSE_LIBPNG" != "no" ; then
      AC_DEFINE(wxUSE_LIBPNG)
  
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
-        AC_MSG_WARN([wxMGL doesn't work with builtin png library, will use MGL one instead])
-        wxUSE_LIBPNG=sys
-    fi
-
      dnl for the check below to have a chance to succeed, we must already have
      dnl for the check below to have a chance to succeed, we must already have
-    dnl libz somewhere (don't do this when bulding wxMGL since its libpng
-    dnl doesn't depend on zlib)
-    if test "$wxUSE_MGL" != 1 -a "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+    dnl libz somewhere
+    if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
          AC_MSG_WARN([system png library doesn't work without system zlib, will use built-in instead])
          wxUSE_LIBPNG=builtin
      fi
  
          AC_MSG_WARN([system png library doesn't work without system zlib, will use built-in instead])
          wxUSE_LIBPNG=builtin
      fi
  
-    if test "$wxUSE_MGL" != 1 ; then
-        dnl Don't check for libpng when building wxMGL, libmgl contains it
-        if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
-            dnl libpng version 0.9 is known to not work, if an even newer
-            dnl version is required, just bump it up in the test below
-            AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
-                [AC_TRY_RUN(
-                    dnl png.h defines PNG_LIBPNG_VER=number
-                    [
-                        #include <png.h>
-                        #include <stdio.h>
+    if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+        dnl libpng version 0.9 is known to not work, if an even newer
+        dnl version is required, just bump it up in the test below
+        AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
+            [AC_TRY_RUN(
+                dnl png.h defines PNG_LIBPNG_VER=number
+                [
+                    #include <png.h>
+                    #include <stdio.h>
  
  
-                        int main()
-                        {
-                            FILE *f=fopen("conftestval", "w");
-                            if (!f) exit(1);
-                            fprintf(f, "%s",
-                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
-                            exit(0);
-                        }
-                    ],
-                    ac_cv_header_png_h=`cat conftestval`,
-                    ac_cv_header_png_h=no,
-                    dnl cross-compiling: test (later) if we have any png.h
-                    unset ac_cv_header_png_h
-                )]
-            )
-            AC_CHECK_HEADER(png.h,,, [ ])
+                    int main()
+                    {
+                        FILE *f=fopen("conftestval", "w");
+                        if (!f) exit(1);
+                        fprintf(f, "%s",
+                                 PNG_LIBPNG_VER > 90 ? "yes" : "no");
+                        exit(0);
+                    }
+                ],
+                ac_cv_header_png_h=`cat conftestval`,
+                ac_cv_header_png_h=no,
+                dnl cross-compiling: test (later) if we have any png.h
+                unset ac_cv_header_png_h
+            )]
+        )
+        AC_CHECK_HEADER(png.h,,, [ ])
  
  
-            if test "$ac_cv_header_png_h" = "yes"; then
-                AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
-            fi
+        if test "$ac_cv_header_png_h" = "yes"; then
+            AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
+        fi
  
  
-            if test "x$PNG_LINK" = "x" ; then
-                if test "$wxUSE_LIBPNG" = "sys" ; then
-                    AC_MSG_ERROR([system png library not found or too old! Use --with-libpng=builtin to use built-in version])
-                else
-                    AC_MSG_WARN([system png library not found or too old, will use built-in instead])
-                    wxUSE_LIBPNG=builtin
-                fi
+        if test "x$PNG_LINK" = "x" ; then
+            if test "$wxUSE_LIBPNG" = "sys" ; then
+                AC_MSG_ERROR([system png library not found or too old! Use --with-libpng=builtin to use built-in version])
              else
              else
-                dnl we are using the system library
-                wxUSE_LIBPNG=sys
+                AC_MSG_WARN([system png library not found or too old, will use built-in instead])
+                wxUSE_LIBPNG=builtin
              fi
              fi
+        else
+            dnl we are using the system library
+            wxUSE_LIBPNG=sys
          fi
      fi
  fi
          fi
      fi
  fi
@@ -2649,71 +2544,63 @@ JPEG_LINK=
  if test "$wxUSE_LIBJPEG" != "no" ; then
      AC_DEFINE(wxUSE_LIBJPEG)
  
  if test "$wxUSE_LIBJPEG" != "no" ; then
      AC_DEFINE(wxUSE_LIBJPEG)
  
-    if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then
-        AC_MSG_WARN([wxMGL doesn't work with builtin jpeg library, will use MGL one instead])
-        wxUSE_LIBJPEG=sys
-    fi
-
-    if test "$wxUSE_MGL" != 1 ; then
-        dnl Don't check for libjpeg when building wxMGL, libmgl contains it
-        if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
-            dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
-            dnl HAVE_STDLIB_H which are already defined and this provokes
-            dnl a compiler warning which configure considers as an error...
-            AC_MSG_CHECKING(for jpeglib.h)
-            AC_CACHE_VAL(ac_cv_header_jpeglib_h,
-                AC_TRY_COMPILE(
-                    [
-                        #undef HAVE_STDLIB_H
-                        #include <stdio.h>
-                        #include <jpeglib.h>
-                    ],
-                    [
-                    ],
-                    ac_cv_header_jpeglib_h=yes,
-                    ac_cv_header_jpeglib_h=no
-                )
+    if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
+        dnl can't use AC_CHECK_HEADER as jconfig.h defines things like
+        dnl HAVE_STDLIB_H which are already defined and this provokes
+        dnl a compiler warning which configure considers as an error...
+        AC_MSG_CHECKING(for jpeglib.h)
+        AC_CACHE_VAL(ac_cv_header_jpeglib_h,
+            AC_TRY_COMPILE(
+                [
+                    #undef HAVE_STDLIB_H
+                    #include <stdio.h>
+                    #include <jpeglib.h>
+                ],
+                [
+                ],
+                ac_cv_header_jpeglib_h=yes,
+                ac_cv_header_jpeglib_h=no
              )
              )
-            AC_MSG_RESULT($ac_cv_header_jpeglib_h)
+        )
+        AC_MSG_RESULT($ac_cv_header_jpeglib_h)
  
  
-            if test "$ac_cv_header_jpeglib_h" = "yes"; then
-                AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
-            fi
+        if test "$ac_cv_header_jpeglib_h" = "yes"; then
+            AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
+        fi
  
  
-            if test "x$JPEG_LINK" = "x" ; then
-                if test "$wxUSE_LIBJPEG" = "sys" ; then
-                    AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
-                else
-                    AC_MSG_WARN([system jpeg library not found, will use built-in instead])
-                    wxUSE_LIBJPEG=builtin
-                fi
+        if test "x$JPEG_LINK" = "x" ; then
+            if test "$wxUSE_LIBJPEG" = "sys" ; then
+                AC_MSG_ERROR([system jpeg library not found! Use --with-libjpeg=builtin to use built-in version])
              else
              else
-                dnl we are using the system library
-                wxUSE_LIBJPEG=sys
-
-                if test "$wxUSE_MSW" = 1; then
-                    dnl boolean is defined by the jpeg headers and also by the
-                    dnl Windows headers of some compilers. This type has been
-                    dnl renamed in the builtin, so it is only an issue when
-                    dnl using an external jpeg lib on Windows.
-                    AC_CHECK_TYPES(
-                        [boolean],
-                        [
-                            AC_CHECK_SIZEOF(
-                                [boolean],
-                                [],
-                                [
-                                    #undef HAVE_BOOLEAN
-                                    #include <stdio.h>
-                                    #include <jpeglib.h>
-                                ])
-                            AC_DEFINE_UNQUOTED(
-                                [wxHACK_BOOLEAN],
-                                [wxInt`expr 8 \* $ac_cv_sizeof_boolean`])
-                        ],
-                        [],
-                        [#include <windows.h>])
-                fi
+                AC_MSG_WARN([system jpeg library not found, will use built-in instead])
+                wxUSE_LIBJPEG=builtin
+            fi
+        else
+            dnl we are using the system library
+            wxUSE_LIBJPEG=sys
+
+            if test "$wxUSE_MSW" = 1; then
+                dnl boolean is defined by the jpeg headers and also by the
+                dnl Windows headers of some compilers. This type has been
+                dnl renamed in the builtin, so it is only an issue when
+                dnl using an external jpeg lib on Windows.
+                AC_CHECK_TYPES(
+                    [boolean],
+                    [
+                        AC_CHECK_SIZEOF(
+                            [boolean],
+                            [],
+                            [
+                                #undef HAVE_BOOLEAN
+                                #include <stdio.h>
+                                #include <jpeglib.h>
+                            ])
+                        AC_DEFINE_UNQUOTED(
+                            [wxHACK_BOOLEAN],
+                            [wxInt`expr 8 \* $ac_cv_sizeof_boolean`])
+                    ],
+                    [],
+                    [#include <windows.h>])
              fi
          fi
      fi
              fi
          fi
      fi
@@ -2770,6 +2657,24 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
              dnl we need to hack around this
              ac_configure_args="$ac_configure_args --disable-jpeg"
          fi
              dnl we need to hack around this
              ac_configure_args="$ac_configure_args --disable-jpeg"
          fi
+
+        if test "$wxUSE_LIBLZMA" = "yes"; then
+            dnl If libtiff configure detects lzma library, it enables support for
+            dnl LZMA compression and using it requires linking with liblzma.
+            AC_CHECK_LIB(lzma, lzma_code, [LIBS="$LIBS -llzma"])
+        else
+            dnl Prevent libtiff configure from looking for liblzma if it's
+            dnl explicitly disabled.
+            ac_configure_args="$ac_configure_args --disable-lzma"
+        fi
+
+        dnl Similarly for jbig
+        if test "$wxUSE_LIBJBIG" = "yes"; then
+            AC_CHECK_LIB(jbig, jbg_dec_init, [LIBS="$LIBS -ljbig"])
+        else
+            ac_configure_args="$ac_configure_args --disable-jbig"
+        fi
+
          AC_CONFIG_SUBDIRS([src/tiff])
      fi
  fi
          AC_CONFIG_SUBDIRS([src/tiff])
      fi
  fi
@@ -2845,9 +2750,6 @@ dnl ----------------------------------------------------------------
  dnl search for toolkit (widget sets)
  dnl ----------------------------------------------------------------
  
  dnl search for toolkit (widget sets)
  dnl ----------------------------------------------------------------
  
-AFMINSTALL=
-WIN32INSTALL=
-
  TOOLKIT=
  TOOLKIT_INCLUDE=
  WIDGET_SET=
  TOOLKIT=
  TOOLKIT_INCLUDE=
  WIDGET_SET=
@@ -2881,20 +2783,8 @@ if test "$USE_WIN32" = 1 ; then
              LIBS="$LIBS -lkernel32 -luser32"
      esac
  
              LIBS="$LIBS -lkernel32 -luser32"
      esac
  
-    dnl This one is still used by some sample makefiles.
-    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
-    RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
-
-    dnl This lot we export to wx-config.  It must add the relevant
-    dnl include directories at the point when they can be known.
-    dnl (but are these (still) required anyway?)
-    WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
-
-    dnl install Win32-specific files in "make install"
-    WIN32INSTALL=win32install
-
-    dnl pbt.h is missing on Wine at least
-    AC_CHECK_HEADER([pbt.h],, [AC_DEFINE(NEED_PBT_H)], [ ])
+    dnl Flags to be passed to windres by the applications using wxWidgets.
+    WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
  fi
  
  if test "$wxUSE_GUI" = "yes"; then
  fi
  
  if test "$wxUSE_GUI" = "yes"; then
@@ -2902,8 +2792,10 @@ if test "$wxUSE_GUI" = "yes"; then
  
      GUI_TK_LIBRARY=
  
  
      GUI_TK_LIBRARY=
  
+    WXGTK1=
      WXGTK127=
      WXGTK2=
      WXGTK127=
      WXGTK2=
+    WXGTK3=
      WXGPE=
  
      if test "$wxUSE_OLD_COCOA" = 1 ; then
      WXGPE=
  
      if test "$wxUSE_OLD_COCOA" = 1 ; then
@@ -2951,6 +2843,10 @@ if test "$wxUSE_GUI" = "yes"; then
                      GTK_MODULES=gthread
                  fi
  
                      GTK_MODULES=gthread
                  fi
  
+                if test -z "$wxGTK_VERSION"; then
+                    wxGTK_VERSION=any
+                fi
+
                  dnl detect GTK2
                  wx_cv_lib_gtk=
                  if test "x$wxGTK_VERSION" != "x1"
                  dnl detect GTK2
                  wx_cv_lib_gtk=
                  if test "x$wxGTK_VERSION" != "x1"
@@ -2965,7 +2861,14 @@ if test "$wxUSE_GUI" = "yes"; then
                              fi
                      esac
  
                              fi
                      esac
  
-                    AM_PATH_GTK_2_0(2.4.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
+                    if test "$wxGTK_VERSION" != 3; then
+                        AM_PATH_GTK_2_0(2.6.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
+                    fi
+                    if test -z "$wx_cv_lib_gtk"; then
+                        if test "$wxGTK_VERSION" = 3 -o "$wxGTK_VERSION" = any; then
+                            AM_PATH_GTK_3_0(, wx_cv_lib_gtk=3, , $GTK_MODULES)
+                        fi
+                    fi
                  fi
  
                  dnl detect GTK1.x
                  fi
  
                  dnl detect GTK1.x
@@ -3001,12 +2904,16 @@ if test "$wxUSE_GUI" = "yes"; then
          fi
  
          case "$wx_cv_lib_gtk" in
          fi
  
          case "$wx_cv_lib_gtk" in
+            3)      WXGTK3=1
+                    TOOLKIT_VERSION=3
+                    ;;
              2.0)    WXGTK2=1
                      TOOLKIT_VERSION=2
                      ;;
              1.2.7)  WXGTK127=1
              2.0)    WXGTK2=1
                      TOOLKIT_VERSION=2
                      ;;
              1.2.7)  WXGTK127=1
+                    WXGTK1=1
                      ;;
                      ;;
-            1.2*) ;;
+            1.2*)   WXGTK1=1 ;;
              *)      AC_MSG_ERROR([
  The development files for GTK+ were not found. For GTK+ 2, please
  ensure that pkg-config is in the path and that gtk+-2.0.pc is
              *)      AC_MSG_ERROR([
  The development files for GTK+ were not found. For GTK+ 2, please
  ensure that pkg-config is in the path and that gtk+-2.0.pc is
@@ -3018,7 +2925,10 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                      ;;
          esac
  
                      ;;
          esac
  
-        if test "$WXGTK2" = 1; then
+        if test "$WXGTK3" = 1; then
+            AC_DEFINE(__WXGTK218__)
+            AC_DEFINE(__WXGTK210__)
+        elif test "$WXGTK2" = 1; then
              save_CFLAGS="$CFLAGS"
              save_LIBS="$LIBS"
              CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
              save_CFLAGS="$CFLAGS"
              save_LIBS="$LIBS"
              CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
@@ -3037,7 +2947,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                             [
                              AC_DEFINE(__WXGTK218__)
                              AC_DEFINE(__WXGTK210__)
                             [
                              AC_DEFINE(__WXGTK218__)
                              AC_DEFINE(__WXGTK210__)
-                            AC_DEFINE(__WXGTK26__)
                              AC_MSG_RESULT([yes])
                              ac_wxgtk218=1
                             ],
                              AC_MSG_RESULT([yes])
                              ac_wxgtk218=1
                             ],
@@ -3059,7 +2968,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                                 ],
                                 [
                                  AC_DEFINE(__WXGTK210__)
                                 ],
                                 [
                                  AC_DEFINE(__WXGTK210__)
-                                AC_DEFINE(__WXGTK26__)
                                  AC_MSG_RESULT([yes])
                                  ac_wxgtk210=1
                                 ],
                                  AC_MSG_RESULT([yes])
                                  ac_wxgtk210=1
                                 ],
@@ -3067,28 +2975,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
                                  AC_MSG_RESULT([no])
                                  ac_wxgtk210=0
                                 ])
                                  AC_MSG_RESULT([no])
                                  ac_wxgtk210=0
                                 ])
-
-                if test "$ac_wxgtk210" = 0; then
-                    dnl test if we have at least GTK+ 2.6:
-                    AC_MSG_CHECKING([if GTK+ is version >= 2.6])
-                    AC_TRY_COMPILE([
-                                    #include <gtk/gtk.h>
-                                ],
-                                [
-                                    #if !GTK_CHECK_VERSION(2,6,0)
-                                    Not GTK+ 2.6
-                                    #endif
-                                ],
-                                [
-                                    AC_DEFINE(__WXGTK26__)
-                                    AC_MSG_RESULT([yes])
-                                    ac_wxgtk26=1
-                                ],
-                                [
-                                    AC_MSG_RESULT([no])
-                                    ac_wxgtk26=0
-                                ])
-                fi
              fi
  
              CFLAGS="$save_CFLAGS"
              fi
  
              CFLAGS="$save_CFLAGS"
@@ -3111,14 +2997,13 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
  
          TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
          GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
  
          TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
          GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
-        AFMINSTALL=afminstall
          TOOLKIT=GTK
          GUIDIST=GTK_DIST
  
          dnl test for external libxpm if we're configured to use it
          if test "$wxUSE_GPE" = "yes"; then
              AC_MSG_CHECKING(for gpewidget library)
          TOOLKIT=GTK
          GUIDIST=GTK_DIST
  
          dnl test for external libxpm if we're configured to use it
          if test "$wxUSE_GPE" = "yes"; then
              AC_MSG_CHECKING(for gpewidget library)
-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget)
+            WX_PATH_FIND_LIBRARIES(gpewidget)
              if test "$ac_find_libraries" != "" ; then
                  WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
                  dnl -lgpewidget must be before all GTK libs and
              if test "$ac_find_libraries" != "" ; then
                  WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
                  dnl -lgpewidget must be before all GTK libs and
@@ -3131,7 +3016,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
              fi
  
              dnl AC_MSG_CHECKING(for gpe library)
              fi
  
              dnl AC_MSG_CHECKING(for gpe library)
-            dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe)
+            dnl WX_PATH_FIND_LIBRARIES(gpe)
              dnl if test "$ac_find_libraries" != "" ; then
              dnl     WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
              dnl     GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe"
              dnl if test "$ac_find_libraries" != "" ; then
              dnl     WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
              dnl     GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe"
@@ -3142,74 +3027,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          fi
      fi
  
          fi
      fi
  
-    if test "$wxUSE_MGL" = 1; then
-       AC_MSG_CHECKING(for SciTech MGL library)
-        if test "x$MGL_ROOT" = x ; then
-            AC_MSG_RESULT(not found)
-            AC_MSG_ERROR([Cannot find MGL library. Make sure MGL_ROOT is set.])
-        else
-            AC_MSG_RESULT($MGL_ROOT)
-        fi
-
-        AC_MSG_CHECKING(for libmgl location)
-        dnl Find MGL library that we want
-        dnl FIXME_MGL - test for MGL variants for freebsd etc.;
-        dnl             and for non-x86 versions
-        case "${host}" in
-            *-*-linux* )
-              dnl glibc.so, glibc are for older versions of MGL,
-              dnl x86/a, x86/so are used by >= 5.0 R11
-              if test "x$wxUSE_SHARED" = xyes ; then
-                  mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
-              else
-                  mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
-              fi
-              ;;
-            *-pc-msdosdjgpp )
-              mgl_os_candidates="dos32/dj2"
-              ;;
-            *)
-              AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
-        esac
-
-        mgl_lib_type=""
-        mgl_os=""
-
-        for mgl_os_i in $mgl_os_candidates ; do
-            if test "x$mgl_os" = x ; then
-                if test "$wxUSE_DEBUG_FLAG" = yes ; then
-                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=debug
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
-                if test "x$mgl_lib_type" = x ; then
-                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
-                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
-                        mgl_lib_type=release
-                        mgl_os=$mgl_os_i
-                    fi
-                fi
-            fi
-        done
-
-        if test "x$mgl_os" = x ; then
-            AC_MSG_RESULT(not found)
-            AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
-        fi
-        AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")
-
-        wxUSE_UNIVERSAL="yes"
-
-        TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
-        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
-
-        AFMINSTALL=afminstall
-        TOOLKIT=MGL
-        GUIDIST=MGL_DIST
-    fi
-
      if test "$wxUSE_DFB" = 1; then
         PKG_PROG_PKG_CONFIG()
  
      if test "$wxUSE_DFB" = 1; then
         PKG_PROG_PKG_CONFIG()
  
@@ -3248,7 +3065,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
  
          wxUSE_UNIVERSAL="yes"
  
  
          wxUSE_UNIVERSAL="yes"
  
-        AFMINSTALL=afminstall
          TOOLKIT=MICROWIN
          GUIDIST=MICROWIN_DIST
  
          TOOLKIT=MICROWIN
          GUIDIST=MICROWIN_DIST
  
@@ -3271,7 +3087,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          dnl this junk out
          GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
          TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
          dnl this junk out
          GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'`
          TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
-        AFMINSTALL=afminstall
          COMPILED_X_PROGRAM=0
  
      fi
          COMPILED_X_PROGRAM=0
  
      fi
@@ -3377,7 +3192,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
  
  
          AC_MSG_CHECKING(for Motif/Lesstif library)
  
  
          AC_MSG_CHECKING(for Motif/Lesstif library)
-        WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
+        WX_PATH_FIND_LIBRARIES(Xm)
  
          if test "x$ac_find_libraries" != "x" ; then
              AC_MSG_RESULT(found in $ac_find_libraries)
  
          if test "x$ac_find_libraries" != "x" ; then
              AC_MSG_RESULT(found in $ac_find_libraries)
@@ -3516,7 +3331,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
          dnl test for external libxpm if we're configured to use it
          if test "$wxUSE_LIBXPM" = "sys"; then
              AC_MSG_CHECKING(for Xpm library)
          dnl test for external libxpm if we're configured to use it
          if test "$wxUSE_LIBXPM" = "sys"; then
              AC_MSG_CHECKING(for Xpm library)
-            WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
+            WX_PATH_FIND_LIBRARIES(Xpm)
              if test "$ac_find_libraries" != "" ; then
                  WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
                  GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
              if test "$ac_find_libraries" != "" ; then
                  WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
                  GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
@@ -3698,25 +3513,6 @@ else
  fi
  
  
  fi
  
  
-dnl ---------------------------------------------------------------------------
-dnl UTF-8 support
-dnl ---------------------------------------------------------------------------
-
-dnl If UTF-8 support wasn't explicitly enabled or disabled, enable it only
-dnl for ports where it makes sense by default (GTK+, DirectFB):
-if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then
-    if test "$USE_UNIX" = 1 -a "$wxUSE_DARWIN" != 1 ; then
-        wxUSE_UNICODE_UTF8=yes
-    elif test "$USE_OS2" = 1 ; then
-        dnl wide char support is quite incomplete in libc;
-        dnl UTF-8 might actually work when evaluating/setting
-        dnl code pages correctly, even for ports other than GTK20.
-        wxUSE_UNICODE_UTF8=yes
-    else
-        wxUSE_UNICODE_UTF8=no
-    fi
-fi
-
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries included when system library is not used
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl Optional libraries included when system library is not used
  dnl ---------------------------------------------------------------------------
@@ -3743,19 +3539,18 @@ dnl ---------------------------------------------------------------------------
  USE_XINERAMA=0
  if test "$wxUSE_DISPLAY" = "yes"; then
      dnl Xinerama is used for wxGTK1/wxX11/wxMotif only
  USE_XINERAMA=0
  if test "$wxUSE_DISPLAY" = "yes"; then
      dnl Xinerama is used for wxGTK1/wxX11/wxMotif only
-    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK1" = 1; then
-        AC_MSG_CHECKING([for Xinerama])
-        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$WXGTK1" = 1; then
+        WX_FIND_LIB(Xinerama, XineramaQueryScreens)
          if test "$ac_find_libraries" != "" ; then
          if test "$ac_find_libraries" != "" ; then
-            WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-            if test "$ac_path_to_link" != " -L/usr/lib" ; then
-                LDFLAGS="$LDFLAGS $ac_path_to_link"
+            if test "$ac_find_libraries" != "std" ; then
+              WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+              if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                  LDFLAGS="$LDFLAGS $ac_path_to_link"
+              fi
              fi
              USE_XINERAMA=1
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
              fi
              USE_XINERAMA=1
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
-            AC_MSG_RESULT([yes])
          else
          else
-            AC_MSG_RESULT([no])
              AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
              wxUSE_DISPLAY="no"
          fi
              AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
              wxUSE_DISPLAY="no"
          fi
@@ -3768,10 +3563,8 @@ fi
  if test "$wxUSE_DISPLAY" = "yes"; then
      dnl wxGTK2 needs Xxf86vm as well as Xinerama-using ports from above
      if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then
  if test "$wxUSE_DISPLAY" = "yes"; then
      dnl wxGTK2 needs Xxf86vm as well as Xinerama-using ports from above
      if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then
-        AC_MSG_CHECKING([for Xxf86vm extension])
-        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
+        WX_FIND_LIB(Xxf86vm, XF86VidModeQueryExtension)
          if test "$ac_find_libraries" != "" ; then
          if test "$ac_find_libraries" != "" ; then
-            AC_MSG_RESULT([yes])
              AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
                               [
                                GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
              AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
                               [
                                GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
@@ -3782,8 +3575,6 @@ if test "$wxUSE_DISPLAY" = "yes"; then
                                      #include <X11/Xlib.h>
                                    #endif
                               ])
                                      #include <X11/Xlib.h>
                                    #endif
                               ])
-        else
-            AC_MSG_RESULT([no])
          fi
      fi
  fi
          fi
      fi
  fi
@@ -3793,17 +3584,16 @@ dnl X11 session management
  dnl ---------------------------------------------------------------------------
  if test "$wxUSE_DETECT_SM" = "yes"; then
      if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
  dnl ---------------------------------------------------------------------------
  if test "$wxUSE_DETECT_SM" = "yes"; then
      if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
-        AC_MSG_CHECKING([for -lSM - X11 session management])
-        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM)
+        WX_FIND_LIB(SM, SmcOpenConnection)
          if test "$ac_find_libraries" != "" ; then
          if test "$ac_find_libraries" != "" ; then
-            WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-            if test "$ac_path_to_link" != " -L/usr/lib" ; then
+            if test "$ac_find_libraries" != "std" ; then
+              WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+              if test "$ac_path_to_link" != " -L/usr/lib" ; then
                  LDFLAGS="$LDFLAGS $ac_path_to_link"
                  LDFLAGS="$LDFLAGS $ac_path_to_link"
+              fi
              fi
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"
              fi
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"
-            AC_MSG_RESULT([yes])
          else
          else
-            AC_MSG_RESULT([no])
              AC_MSG_WARN([libSM not found; disabling session management detection])
              wxUSE_DETECT_SM="no"
          fi
              AC_MSG_WARN([libSM not found; disabling session management detection])
              wxUSE_DETECT_SM="no"
          fi
@@ -3826,7 +3616,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; 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"
-    elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then
+    elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 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)
  
          dnl adjust CPPFLAGS to include GL/gl.h location if necessary
          dnl (/opt/graphics/OpenGL is for HP-UX systems, bug 925307)
@@ -3844,48 +3634,43 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
              AC_CHECK_HEADER(GL/glu.h, [
                  found_gl=0
  
              AC_CHECK_HEADER(GL/glu.h, [
                  found_gl=0
  
-                AC_MSG_CHECKING([for -lGL])
-                WX_PATH_FIND_LIBRARIES([$SEARCH_LIB /opt/graphics/OpenGL/lib],GL)
+                WX_FIND_LIB(GL, glBegin, [/opt/graphics/OpenGL/lib])
                  if test "$ac_find_libraries" != "" ; then
                  if test "$ac_find_libraries" != "" ; then
-                    AC_MSG_RESULT([found in $ac_find_libraries])
-
-                    WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-                    if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                    if test "$ac_find_libraries" != "std" ; then
+                      WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                      if test "$ac_path_to_link" != " -L/usr/lib" ; then
                          LDFLAGS_GL="$ac_path_to_link"
                          LDFLAGS_GL="$ac_path_to_link"
+                      fi
                      fi
  
                      dnl don't suppose that libGL and libGLU are always in the
                      dnl same directory -- this is not true for some common
                      dnl distributions
                      fi
  
                      dnl don't suppose that libGL and libGLU are always in the
                      dnl same directory -- this is not true for some common
                      dnl distributions
-                    AC_MSG_CHECKING([for -lGLU])
-                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
+                    WX_FIND_LIB(GLU, gluBeginCurve, [/opt/graphics/OpenGL/lib])
                      if test "$ac_find_libraries" != "" ; then
                      if test "$ac_find_libraries" != "" ; then
+                      if test "$ac_find_libraries" != "std" ; then
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                          if test "$ac_path_to_link" != " -L/usr/lib" -a \
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                          if test "$ac_path_to_link" != " -L/usr/lib" -a \
-                                    "$ac_path_to_link" != "$LDFLAGS_GL"; then
-                            LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+                                "$ac_path_to_link" != "$LDFLAGS_GL" ; then
+                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
                          fi
                          fi
+                      fi
  
                          found_gl=1
                          OPENGL_LIBS="-lGL -lGLU"
  
                          found_gl=1
                          OPENGL_LIBS="-lGL -lGLU"
-                        AC_MSG_RESULT([yes])
-                    else
-                        AC_MSG_RESULT([no])
                      fi
                      fi
-                else
-                    AC_MSG_RESULT([no])
                  fi
  
                  if test "$found_gl" != 1; then
                  fi
  
                  if test "$found_gl" != 1; then
-                    AC_MSG_CHECKING([for -lMesaGL])
-                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
+                    WX_FIND_LIB(MesaGL, glEnable, [/opt/graphics/OpenGL/lib])
                      if test "$ac_find_libraries" != "" ; then
                      if test "$ac_find_libraries" != "" ; then
+                      if test "$ac_find_libraries" != "std" ; then
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-                        LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
-                        OPENGL_LIBS="-lMesaGL -lMesaGLU"
-                        AC_MSG_RESULT([yes])
-                    else
-                        AC_MSG_RESULT([no])
+                        if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                          LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+                        fi
+                      fi
+                      OPENGL_LIBS="-lMesaGL -lMesaGLU"
                      fi
                  fi
              ],, [ ])
                      fi
                  fi
              ],, [ ])
@@ -4267,7 +4052,18 @@ if test "$WCSLEN_FOUND" = 1; then
      AC_DEFINE(HAVE_WCSLEN)
  fi
  
      AC_DEFINE(HAVE_WCSLEN)
  fi
  
-AC_CHECK_FUNCS([wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp])
+dnl Notice that unlike the functions below, this one seems to be present in all
+dnl support OS X versions so it's OK to test for it here.
+AC_CHECK_FUNCS(wcsftime)
+
+dnl OS X provides the wide character functions (and also strnlen(), for some
+dnl reason) only starting from 10.7 so our tests would succeed if we're
+dnl configuring under 10.7 or later, yet the compiled programs would fail if
+dnl ran under 10.6 or earlier. To avoid this problem, define the corresponding
+dnl HAVE_XXX in wx/osx/config_xcode.h instead of testing for them here.
+if test "$wxUSE_MAC" != 1; then
+    AC_CHECK_FUNCS([strnlen wcsdup wcsnlen wcscasecmp wcsncasecmp])
+fi
  
  dnl On HP-UX aCC need this define to find mbstrtowcs() &c
  dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict
  
  dnl 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
@@ -4303,19 +4099,11 @@ if test "$ac_cv_func_vsnprintf" = "yes"; then
      AC_CACHE_CHECK([for vsnprintf declaration], wx_cv_func_vsnprintf_decl,
          [
              dnl our troubles are not over: HP-UX 11 prototypes vsnprintf() as
      AC_CACHE_CHECK([for vsnprintf declaration], wx_cv_func_vsnprintf_decl,
          [
              dnl our troubles are not over: HP-UX 11 prototypes vsnprintf() as
-            dnl taking "char *" and not "const char *" while Metrowerks does
-            dnl provide a correct vsnprintf declaration but in C++ mode it's
-            dnl always in std namespace and so we have to bring it in scope
+            dnl taking "char *" and not "const char *" so test for this too
              AC_TRY_COMPILE(
                  [
                      #include <stdio.h>
                      #include <stdarg.h>
              AC_TRY_COMPILE(
                  [
                      #include <stdio.h>
                      #include <stdarg.h>
-                    #ifdef __MSL__
-                    #if __MSL__ >= 0x6000
-                    namespace std {}
-                    using namespace std;
-                    #endif
-                    #endif
                  ],
                  [
                      char *buf;
                  ],
                  [
                      char *buf;
@@ -4550,41 +4338,48 @@ dnl backtrace() and backtrace_symbols() for wxStackWalker
  if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
      AC_CACHE_CHECK([for backtrace() in <execinfo.h>], wx_cv_func_backtrace,
          [
  if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
      AC_CACHE_CHECK([for backtrace() in <execinfo.h>], wx_cv_func_backtrace,
          [
-            AC_LANG_PUSH(C++)
-            AC_TRY_COMPILE([#include <execinfo.h>],
+            AC_SEARCH_LIBS(backtrace, execinfo,
                  [
                  [
-                    void *trace[1];
-                    char **messages;
-
-                    backtrace(trace, 1);
-                    messages = backtrace_symbols(trace, 1);
+                    AC_LANG_PUSH(C++)
+                    AC_TRY_LINK([#include <execinfo.h>],
+                        [
+                            void *trace[1];
+                            char **messages;
+                            backtrace(trace, 1);
+                            messages = backtrace_symbols(trace, 1);
+                        ],
+                        wx_cv_func_backtrace=yes,
+                        wx_cv_func_backtrace=no
+                    )
+                    AC_LANG_POP()
                  ],
                  ],
-                wx_cv_func_backtrace=yes,
                  wx_cv_func_backtrace=no
              )
                  wx_cv_func_backtrace=no
              )
-            AC_LANG_POP()
          ]
      )
  
          ]
      )
  
-
      if test "$wx_cv_func_backtrace" = "no"; then
          AC_MSG_WARN([backtrace() is not available, wxStackWalker will not be available])
          wxUSE_STACKWALKER=no
      else
      if test "$wx_cv_func_backtrace" = "no"; then
          AC_MSG_WARN([backtrace() is not available, wxStackWalker will not be available])
          wxUSE_STACKWALKER=no
      else
-        AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle,
-            [
-                AC_LANG_PUSH(C++)
-                AC_TRY_LINK([#include <cxxabi.h>],
-                    [
-                        int rc;
-                        __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
-                    ],
-                    wx_cv_func_cxa_demangle=yes,
-                    wx_cv_func_cxa_demangle=no
-                )
-                AC_LANG_POP()
-            ]
-        )
+        if test "$ac_cv_header_cxxabi_h" = "yes"; then
+            AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle,
+                [
+                    AC_LANG_PUSH(C++)
+                    AC_TRY_LINK([#include <cxxabi.h>],
+                        [
+                            int rc;
+                            __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
+                        ],
+                        wx_cv_func_cxa_demangle=yes,
+                        wx_cv_func_cxa_demangle=no
+                    )
+                    AC_LANG_POP()
+                ]
+            )
+        else
+            wx_cv_func_cxa_demangle=no
+        fi
  
          if test "$wx_cv_func_cxa_demangle" = "yes"; then
              AC_DEFINE(HAVE_CXA_DEMANGLE)
  
          if test "$wx_cv_func_cxa_demangle" = "yes"; then
              AC_DEFINE(HAVE_CXA_DEMANGLE)
@@ -5076,7 +4871,13 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
  
      dnl do other tests only if we are using threads
      if test "$wxUSE_THREADS" = "yes" ; then
  
      dnl do other tests only if we are using threads
      if test "$wxUSE_THREADS" = "yes" ; then
-      AC_CHECK_FUNCS(thr_setconcurrency)
+        AC_CHECK_FUNCS(pthread_setconcurrency,
+            AC_DEFINE(HAVE_PTHREAD_SET_CONCURRENCY),
+            [
+                AC_CHECK_FUNCS(thr_setconcurrency,
+                    AC_DEFINE(HAVE_THR_SETCONCURRENCY),
+                    AC_MSG_WARN(Setting thread concurrency will not work properly))
+            ])
  
        dnl can't use AC_CHECK_FUNCS for this one as it's usually a macro and so
        dnl wouldn't be found by it
  
        dnl can't use AC_CHECK_FUNCS for this one as it's usually a macro and so
        dnl wouldn't be found by it
@@ -5273,6 +5074,29 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
              AC_DEFINE(HAVE___THREAD_KEYWORD)
            fi
          fi
              AC_DEFINE(HAVE___THREAD_KEYWORD)
            fi
          fi
+
+        if test "$ac_cv_header_cxxabi_h" = "yes"; then
+            AC_CACHE_CHECK([for abi::__forced_unwind() in <cxxabi.h>],
+                wx_cv_type_abi_forced_unwind,
+                [
+                    AC_LANG_PUSH(C++)
+                    AC_TRY_COMPILE([#include <cxxabi.h>],
+                        [
+                            void foo(abi::__forced_unwind&);
+                        ],
+                        wx_cv_type_abi_forced_unwind=yes,
+                        wx_cv_type_abi_forced_unwind=no
+                    )
+                    AC_LANG_POP()
+                ]
+            )
+        else
+            wx_cv_type_abi_forced_unwind=no
+        fi
+
+        if test "$wx_cv_type_abi_forced_unwind" = "yes"; then
+            AC_DEFINE(HAVE_ABI_FORCEDUNWIND)
+        fi
      fi
  
  dnl from if !MSW
      fi
  
  dnl from if !MSW
@@ -5347,6 +5171,10 @@ dnl AC_CHECK_FUNC(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO), [
  dnl    ]
  dnl )
  
  dnl    ]
  dnl )
  
+dnl This is currently always defined under Unix, there is no reason to ever
+dnl disable compiler TLS support there.
+AC_DEFINE(wxUSE_COMPILER_TLS)
+
  if test "$wxUSE_THREADS" = "yes"; then
    AC_DEFINE(wxUSE_THREADS)
  
  if test "$wxUSE_THREADS" = "yes"; then
    AC_DEFINE(wxUSE_THREADS)
  
@@ -5365,6 +5193,10 @@ else
    fi
  fi
  
    fi
  fi
  
+if test "$WXGTK3" = 1 ; then
+    AC_DEFINE_UNQUOTED(__WXGTK3__, 1)
+    WXGTK2=1
+fi
  if test "$WXGTK2" = 1 ; then
    AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK2)
  fi
  if test "$WXGTK2" = 1 ; then
    AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK2)
  fi
@@ -5401,10 +5233,10 @@ if test "$wxUSE_DEBUG_FLAG" = "no" ; then
      WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0"
  
      if test "$wxUSE_GTK" = 1 ; then
      WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0"
  
      if test "$wxUSE_GTK" = 1 ; then
-        if test "x$wxGTK_VERSION" = "x1" ; then
-            CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
-        else
+        if test "$WXGTK2" = 1 ; then
              CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
              CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
+        else
+            CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
          fi
      fi
  fi
          fi
      fi
  fi
@@ -5710,40 +5542,37 @@ fi
  dnl Unix implementation needs additional checks because audio support
  dnl comes in many favours:
  if test "$USE_UNIX" = 1 ; then
  dnl Unix implementation needs additional checks because audio support
  dnl comes in many favours:
  if test "$USE_UNIX" = 1 ; then
-    dnl mmedia doesn't compile with wxMGL, remove this if this is ever fixed
-    if test "$wxUSE_MGL" != 1; then
-        dnl it's not enough to check for just the header because OSS under NetBSD
-        dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
-        dnl whether we need -lossaudio at link-time
-        AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
-            AC_TRY_LINK([
-                    #include <sys/ioctl.h>
-                    #include <sys/soundcard.h>
-                ],
-                [
-                    ioctl(0, SNDCTL_DSP_SPEED, 0);
-                ],
-                ac_cv_header_sys_soundcard=yes,
-                [
-                    saveLibs="$LIBS"
-                    LIBS="$saveLibs -lossaudio"
-                    AC_TRY_LINK([
-                            #include <sys/ioctl.h>
-                            #include <sys/soundcard.h>
-                        ],
-                        [
-                            ioctl(0, SNDCTL_DSP_SPEED, 0);
-                        ],
-                        ac_cv_header_sys_soundcard=yes,
-                        [
-                            LIBS="$saveLibs"
-                            ac_cv_header_sys_soundcard=no
-                        ]
-                    )
-                ]
-            )
-        ])
-    fi
+    dnl it's not enough to check for just the header because OSS under NetBSD
+    dnl redefines ioctl as oss_ioctrl inside it and so we also need to test
+    dnl whether we need -lossaudio at link-time
+    AC_CACHE_CHECK([for SNDCTL_DSP_SPEED in sys/soundcard.h], ac_cv_header_sys_soundcard, [
+        AC_TRY_LINK([
+                #include <sys/ioctl.h>
+                #include <sys/soundcard.h>
+            ],
+            [
+                ioctl(0, SNDCTL_DSP_SPEED, 0);
+            ],
+            ac_cv_header_sys_soundcard=yes,
+            [
+                saveLibs="$LIBS"
+                LIBS="$saveLibs -lossaudio"
+                AC_TRY_LINK([
+                        #include <sys/ioctl.h>
+                        #include <sys/soundcard.h>
+                    ],
+                    [
+                        ioctl(0, SNDCTL_DSP_SPEED, 0);
+                    ],
+                    ac_cv_header_sys_soundcard=yes,
+                    [
+                        LIBS="$saveLibs"
+                        ac_cv_header_sys_soundcard=no
+                    ]
+                )
+            ]
+        )
+    ])
  
      if test "$ac_cv_header_sys_soundcard" = "yes"; then
          AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
  
      if test "$ac_cv_header_sys_soundcard" = "yes"; then
          AC_DEFINE(HAVE_SYS_SOUNDCARD_H)
@@ -5766,12 +5595,6 @@ if test "$wxUSE_SOUND" = "yes"; then
          WITH_PLUGIN_SDL=1
        fi
      fi
          WITH_PLUGIN_SDL=1
        fi
      fi
-  else
-    dnl wxMGL doesn't support sound under DOS, only under Unix
-    if test "$wxUSE_MGL" = 1; then
-        AC_MSG_WARN([wxSound not supported in MGL under DOS... disabled])
-        wxUSE_SOUND="no"
-    fi
    fi
  fi
  
    fi
  fi
  
@@ -5786,10 +5609,15 @@ if test "$WXGTK2" = 1; then
      if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
  
          if test "$wxUSE_GTKPRINT" = "yes" ; then
      if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
  
          if test "$wxUSE_GTKPRINT" = "yes" ; then
-
+            if test "$WXGTK3" = 1; then
+                gtk_unix_print="gtk+-unix-print-3.0"
+            else
+                gtk_unix_print="gtk+-unix-print-2.0 >= 2.10"
+            fi
                  PKG_CHECK_MODULES(GTKPRINT,
                  PKG_CHECK_MODULES(GTKPRINT,
-                                  [gtk+-unix-print-2.0 >= 2.10],
+                                  [$gtk_unix_print],
                      [
                      [
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GTKPRINT_LIBS"
                          CFLAGS="$GTKPRINT_CFLAGS $CFLAGS"
                          CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS"
                          AC_DEFINE(wxUSE_GTKPRINT)
                          CFLAGS="$GTKPRINT_CFLAGS $CFLAGS"
                          CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS"
                          AC_DEFINE(wxUSE_GTKPRINT)
@@ -5801,17 +5629,26 @@ if test "$WXGTK2" = 1; then
                  )
          fi
  
                  )
          fi
  
+        if test "$WXGTK3" = 1; then
+            wxUSE_LIBGNOMEPRINT=no
+        fi
+
          if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
  
                  PKG_CHECK_MODULES(LIBGNOMEPRINTUI,
                                    [libgnomeprintui-2.2 >= 2.8],
                      [
          if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
  
                  PKG_CHECK_MODULES(LIBGNOMEPRINTUI,
                                    [libgnomeprintui-2.2 >= 2.8],
                      [
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBGNOMEPRINTUI_LIBS"
                          CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS"
                          CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"
                          AC_DEFINE(wxUSE_LIBGNOMEPRINT)
                      ],
                      [
                          CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS"
                          CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"
                          AC_DEFINE(wxUSE_LIBGNOMEPRINT)
                      ],
                      [
-                        AC_MSG_WARN([libgnomeprintui not found, library will use standard PostScript printing])
+                        if test "$wxUSE_GTKPRINT" = yes; then
+                            AC_MSG_RESULT(no)
+                        else
+                            AC_MSG_WARN([libgnomeprintui not found, library will use standard PostScript printing])
+                        fi
                          wxUSE_LIBGNOMEPRINT="no"
                      ]
                  )
                          wxUSE_LIBGNOMEPRINT="no"
                      ]
                  )
@@ -5824,6 +5661,7 @@ if test "$WXGTK2" = 1; then
                  PKG_CHECK_MODULES(GNOMEVFS,
                                    [gnome-vfs-2.0 >= 2.0],
                      [
                  PKG_CHECK_MODULES(GNOMEVFS,
                                    [gnome-vfs-2.0 >= 2.0],
                      [
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GNOMEVFS_LIBS"
                          CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS"
                          CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS"
                          AC_DEFINE(wxUSE_LIBGNOMEVFS)
                          CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS"
                          CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS"
                          AC_DEFINE(wxUSE_LIBGNOMEVFS)
@@ -5836,11 +5674,36 @@ if test "$WXGTK2" = 1; then
          fi
      fi
  
          fi
      fi
  
+    if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes" ; then
+        if test "$wxUSE_LIBNOTIFY" = "yes" ; then
+            HAVE_LIBNOTIFY=0
+            PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.7],
+                [
+                    HAVE_LIBNOTIFY=1
+                    AC_DEFINE(wxUSE_LIBNOTIFY_0_7)
+                ],
+                [
+                    PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= 0.4],
+                        [HAVE_LIBNOTIFY=1],
+                        [AC_MSG_WARN([libnotify not found, wxNotificationMessage will use generic implementation.])]
+                    )
+                ]
+            )
+
+            if test "$HAVE_LIBNOTIFY" = "1" ; then
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBNOTIFY_LIBS"
+                CFLAGS="$LIBNOTIFY_CFLAGS $CFLAGS"
+                CXXFLAGS="$LIBNOTIFY_CFLAGS $CXXFLAGS"
+                AC_DEFINE(wxUSE_LIBNOTIFY)
+            fi
+        fi
+    fi
+
      if test "$wxUSE_LIBHILDON" = "yes" ; then
          PKG_CHECK_MODULES(HILDON,
                            [hildon-lgpl >= 0.9],
              [
      if test "$wxUSE_LIBHILDON" = "yes" ; then
          PKG_CHECK_MODULES(HILDON,
                            [hildon-lgpl >= 0.9],
              [
-                EXTRALIBS_HILDON="$HILDON_LIBS"
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON_LIBS"
                  CFLAGS="$CFLAGS $HILDON_CFLAGS"
                  CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS"
                  AC_DEFINE(wxUSE_LIBHILDON)
                  CFLAGS="$CFLAGS $HILDON_CFLAGS"
                  CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS"
                  AC_DEFINE(wxUSE_LIBHILDON)
@@ -5857,7 +5720,7 @@ if test "$WXGTK2" = 1; then
              PKG_CHECK_MODULES(HILDON2,
                                [hildon-1 >= 1.99],
                  [
              PKG_CHECK_MODULES(HILDON2,
                                [hildon-1 >= 1.99],
                  [
-                    EXTRALIBS_HILDON="$HILDON2_LIBS"
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON2_LIBS"
                      CFLAGS="$CFLAGS $HILDON2_CFLAGS"
                      CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS"
                      AC_DEFINE(wxUSE_LIBHILDON2)
                      CFLAGS="$CFLAGS $HILDON2_CFLAGS"
                      CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS"
                      AC_DEFINE(wxUSE_LIBHILDON2)
@@ -5947,6 +5810,10 @@ if test "$wxUSE_FS_ZIP" = "yes"; then
    fi
  fi
  
    fi
  fi
  
+if test "$wxUSE_FSVOLUME" = "yes"; then
+  AC_DEFINE(wxUSE_FSVOLUME)
+fi
+
  if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
    if test "$USE_UNIX" != 1; then
      AC_MSG_WARN([Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called])
  if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
    if test "$USE_UNIX" != 1; then
      AC_MSG_WARN([Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called])
@@ -6257,16 +6124,14 @@ if test "$wxUSE_DATETIME" = "yes"; then
  fi
  
  dnl ------------------------------------------------------------------------
  fi
  
  dnl ------------------------------------------------------------------------
-dnl wxSocket
+dnl wxProcess
  dnl ------------------------------------------------------------------------
  
  dnl ------------------------------------------------------------------------
  
-dnl VZ: the GUI hooks wxSocket needs are not implemented yet in some toolkits
-if test "$wxUSE_SOCKETS" = "yes"; then
-    if test "$wxUSE_MGL" = 1; then
-        AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
-        wxUSE_SOCKETS="no"
-    fi
-fi
+AC_CHECK_FUNCS(setpriority)
+
+dnl ------------------------------------------------------------------------
+dnl wxSocket
+dnl ------------------------------------------------------------------------
  
  if test "$wxUSE_SOCKETS" = "yes"; then
      dnl under MSW we always have sockets
  
  if test "$wxUSE_SOCKETS" = "yes"; then
      dnl under MSW we always have sockets
@@ -6522,16 +6387,13 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
  
      dnl joystick support is only for Linux 2.1.x or greater
      else
  
      dnl joystick support is only for Linux 2.1.x or greater
      else
-        dnl wxJoystick not supported by wxMGL at all
-        if test "$wxUSE_MGL" != 1; then
-            dnl notice the dummy includes argument: without it, AC_CHECK_HEADER
-            dnl checks only whether the header can be preprocessed, not that it
-            dnl can be compiled and in Linux 2.6.16 joystick.h is present but
-            dnl can't be compiled because of an error and with the default
-            dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
-            dnl build would fail later
-            AC_CHECK_HEADERS([linux/joystick.h], [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
-        fi
+        dnl notice the dummy includes argument: without it, AC_CHECK_HEADER
+        dnl checks only whether the header can be preprocessed, not that it
+        dnl can be compiled and in Linux 2.6.16 joystick.h is present but
+        dnl can't be compiled because of an error and with the default
+        dnl AC_CHECK_HEADER semantics we'd still detect it in this case and
+        dnl build would fail later
+        AC_CHECK_HEADERS([linux/joystick.h], [wxUSE_JOYSTICK=yes],, [AC_INCLUDES_DEFAULT()])
      fi
  
      if test "$wxUSE_JOYSTICK" = "yes"; then
      fi
  
      if test "$wxUSE_JOYSTICK" = "yes"; then
@@ -6721,12 +6583,7 @@ if test "$wxUSE_IPC" = "yes"; then
  fi
  
  if test "$wxUSE_DATAOBJ" = "yes"; then
  fi
  
  if test "$wxUSE_DATAOBJ" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        AC_MSG_WARN([wxDataObject not yet supported under $TOOLKIT... disabled])
-        wxUSE_DATAOBJ=no
-    else
-        AC_DEFINE(wxUSE_DATAOBJ)
-    fi
+    AC_DEFINE(wxUSE_DATAOBJ)
  else
      AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
      wxUSE_CLIPBOARD=no
  else
      AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
      wxUSE_CLIPBOARD=no
@@ -6734,7 +6591,7 @@ else
  fi
  
  if test "$wxUSE_CLIPBOARD" = "yes"; then
  fi
  
  if test "$wxUSE_CLIPBOARD" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
+    if test "$wxUSE_DFB" = 1; then
          AC_MSG_WARN([Clipboard not yet supported under $TOOLKIT... disabled])
          wxUSE_CLIPBOARD=no
      fi
          AC_MSG_WARN([Clipboard not yet supported under $TOOLKIT... disabled])
          wxUSE_CLIPBOARD=no
      fi
@@ -6745,8 +6602,7 @@ if test "$wxUSE_CLIPBOARD" = "yes"; then
  fi
  
  if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
  fi
  
  if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
-    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
-            "$wxUSE_DFB" = 1; then
+    if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
          AC_MSG_WARN([Drag and drop not yet supported under $TOOLKIT... disabled])
          wxUSE_DRAG_AND_DROP=no
      fi
          AC_MSG_WARN([Drag and drop not yet supported under $TOOLKIT... disabled])
          wxUSE_DRAG_AND_DROP=no
      fi
@@ -6904,7 +6760,7 @@ if test "$wxUSE_FONTPICKERCTRL" = "yes"; then
  fi
  
  if test "$wxUSE_DISPLAY" = "yes"; then
  fi
  
  if test "$wxUSE_DISPLAY" = "yes"; then
-    if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_DFB" = 1; then
          AC_MSG_WARN([wxDisplay not yet supported under $TOOLKIT... disabled])
          wxUSE_DISPLAY=no
      else
          AC_MSG_WARN([wxDisplay not yet supported under $TOOLKIT... disabled])
          wxUSE_DISPLAY=no
      else
@@ -7016,6 +6872,10 @@ if test "$wxUSE_RICHMSGDLG" = "yes"; then
      AC_DEFINE(wxUSE_RICHMSGDLG)
  fi
  
      AC_DEFINE(wxUSE_RICHMSGDLG)
  fi
  
+if test "$wxUSE_RICHTOOLTIP" = "yes"; then
+    AC_DEFINE(wxUSE_RICHTOOLTIP)
+fi
+
  if test "$wxUSE_SASH" = "yes"; then
      AC_DEFINE(wxUSE_SASH)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
  if test "$wxUSE_SASH" = "yes"; then
      AC_DEFINE(wxUSE_SASH)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
@@ -7092,6 +6952,11 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then
      AC_DEFINE(wxUSE_RICHEDIT2)
  fi
  
      AC_DEFINE(wxUSE_RICHEDIT2)
  fi
  
+if test "$wxUSE_TIMEPICKCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_TIMEPICKCTRL)
+  USES_CONTROLS=1
+fi
+
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
      if test "$wxUSE_OLD_COCOA" = 1 ; then
          AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
      if test "$wxUSE_OLD_COCOA" = 1 ; then
          AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
@@ -7150,9 +7015,10 @@ if test "$wxUSE_TREECTRL" = "yes"; then
      fi
  fi
  
      fi
  fi
  
-if test "$wxUSE_TREECTRL" = "yes"; then
+if test "$wxUSE_TREELISTCTRL" = "yes"; then
      AC_DEFINE(wxUSE_TREELISTCTRL)
      USES_CONTROLS=1
      AC_DEFINE(wxUSE_TREELISTCTRL)
      USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelist"
  fi
  
  if test "$wxUSE_POPUPWIN" = "yes"; then
  fi
  
  if test "$wxUSE_POPUPWIN" = "yes"; then
@@ -7170,8 +7036,13 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
      fi
  fi
  
      fi
  fi
  
+if test "$wxUSE_PREFERENCES_EDITOR" = "yes"; then
+    AC_DEFINE(wxUSE_PREFERENCES_EDITOR)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS prefseditor"
+fi
+
  if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
  if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
          AC_MSG_WARN([Dialup manager not supported on this platform... disabled])
      else
          AC_DEFINE(wxUSE_DIALUP_MANAGER)
          AC_MSG_WARN([Dialup manager not supported on this platform... disabled])
      else
          AC_DEFINE(wxUSE_DIALUP_MANAGER)
@@ -7336,6 +7207,10 @@ fi
  
  if test "$wxUSE_TASKBARICON" = "yes"; then
      AC_DEFINE(wxUSE_TASKBARICON)
  
  if test "$wxUSE_TASKBARICON" = "yes"; then
      AC_DEFINE(wxUSE_TASKBARICON)
+    dnl This is used under MSW, just enable it always without testing for the
+    dnl toolkit nor providing a separate option for it because it's totally
+    dnl harmless to have it defined even if it's unnecessary.
+    AC_DEFINE(wxUSE_TASKBARICON_BALLOONS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
  fi
  
@@ -7366,78 +7241,71 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
  fi
  
-USE_WEBVIEW=0
  if test "$wxUSE_WEBVIEW" = "yes"; then
  if test "$wxUSE_WEBVIEW" = "yes"; then
-   AC_DEFINE(wxUSE_WEBVIEW)
-   USE_WEBVIEW=1
-   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
-
-   if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_GTK" = 1; then
-       AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
-       AC_MSG_CHECKING([for webkitgtk libraries])
-       WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],webkitgtk-1.0)
-       if test "$ac_find_libraries" != "" ; then
-           WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-           if test "$ac_path_to_link" != " -L/usr/lib" ; then
-               LDFLAGS="$LDFLAGS $ac_path_to_link"
-           fi
-           GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
-           AC_MSG_RESULT([yes])
-       else
-           AC_MSG_RESULT([no])
-           AC_MSG_WARN([libwebkitgtk-1.0 not found; disabling webkit backend])
-           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT, 0)
-       fi
-
-       AC_MSG_CHECKING(for webkitgtk includes)
-       WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/webkit-1.0], webkit/webkit.h)
-       if test "$ac_find_includes" != "" ; then
-           AC_MSG_RESULT(found in $ac_find_includes)
-           WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
-           CPPFLAGS="$ac_path_to_include $CPPFLAGS"
-       else
-           AC_MSG_RESULT([not found])
-           AC_MSG_WARN([webkit includes not found; disabling webkit backend])
-           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT, 0)
-       fi
-       dnl we also depend on libsoup
-       AC_MSG_CHECKING(for libsoup includes)
-       WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/libsoup-2.4], libsoup/soup.h)
-       if test "$ac_find_includes" != "" ; then
-           AC_MSG_RESULT(found in $ac_find_includes)
-           WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
-           CPPFLAGS="$ac_path_to_include $CPPFLAGS"
-       else
-           AC_MSG_RESULT([not found])
-           AC_MSG_WARN([libsoup includes not found; disabling webkit backend])
-           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT, 0)
-       fi
-   fi
+    USE_WEBVIEW_WEBKIT=0
+    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then
+        if test "$wxUSE_GTK" = 1; then
+            webkitgtk=webkit-1.0
+            if test "$WXGTK3" = 1; then
+                webkitgtk=webkitgtk-3.0
+            fi
+            PKG_CHECK_MODULES([WEBKIT],
+                              [$webkitgtk >= 1.3.1],
+                              [
+                                USE_WEBVIEW_WEBKIT=1
+                                CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
+                                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $WEBKIT_LIBS"
+                              ],
+                              [
+                                AC_MSG_WARN([webkitgtk not found.])
+                              ])
+        elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+            dnl Under Mac we always have the libraries but check for the
+            dnl headers
+            old_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="-x objective-c++ $CPPFLAGS"
+            AC_CHECK_HEADER([WebKit/HIWebView.h],
+                            [
+                                USE_WEBVIEW_WEBKIT=1
+                                WEBKIT_LINK="-framework WebKit"
+                            ],
+                            [
+                                AC_MSG_WARN([WebKit headers not found])
+                            ],
+                            [
+                                #include <Carbon/Carbon.h>
+                                #include <WebKit/WebKit.h>
+                            ])
+            CPPFLAGS="$old_CPPFLAGS"
+        fi
+    fi
  
  
-    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
-        old_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="-x objective-c++ $CPPFLAGS"
-        AC_CHECK_HEADER([WebKit/HIWebView.h],
-                        [
-                           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
-                           WEBKIT_LINK="-framework WebKit"
-                        ],
-                        [
-                           AC_MSG_WARN([WebKit headers not found; disabling wxWebView WebKit])
-                           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT, 0)
-                        ],
-                        [
-                           #include <Carbon/Carbon.h>
-                           #include <WebKit/WebKit.h>
-                        ])
-        CPPFLAGS="$old_CPPFLAGS"
-    elif test "$wxUSE_OLD_COCOA" = 1; then
-        AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
-    else
-        AC_DEFINE(wxUSE_WEBVIEW_WEBKIT, 0)
+    wxUSE_WEBVIEW="no"
+    if test "$wxUSE_GTK" = 1 -o "$wxUSE_MAC" = 1; then
+        if test "$USE_WEBVIEW_WEBKIT" = 1; then
+            wxUSE_WEBVIEW="yes"
+            AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
+        else
+            AC_MSG_WARN([WebKit not available, disabling wxWebView])
+        fi
+    elif test "$wxUSE_MSW" = 1; then
+        if test "$wxUSE_WEBVIEW_IE" = "yes"; then
+            dnl TODO: Check for the required headers/libraries under Windows
+            dnl       too and do the right thing automatically there too.
+            wxUSE_WEBVIEW="yes"
+            AC_DEFINE(wxUSE_WEBVIEW_IE)
+        fi
      fi
  fi
  
      fi
  fi
  
+if test "$wxUSE_WEBVIEW" = "yes"; then
+    USE_WEBVIEW=1
+    AC_DEFINE(wxUSE_WEBVIEW)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
+else
+    USE_WEBVIEW=0
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl wxImage options
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl wxImage options
  dnl ---------------------------------------------------------------------------
@@ -7692,7 +7560,7 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
  
          if test "$wxUSE_GSTREAMER8" = "no"; then
              PKG_CHECK_MODULES(GST,
  
          if test "$wxUSE_GSTREAMER8" = "no"; then
              PKG_CHECK_MODULES(GST,
-                [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION gconf-2.0],
+                [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION],
                  [
                      wxUSE_GSTREAMER="yes"
                      GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"
                  [
                      wxUSE_GSTREAMER="yes"
                      GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"
@@ -7726,6 +7594,11 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
          else
              USE_MEDIA=0
          fi
          else
              USE_MEDIA=0
          fi
+
+    elif test "$wxUSE_MAC" = 1; then 
+         dnl We always have the necessary libraries under Mac 
+         dnl but we need to link with it explicitly.
+         GST_LIBS="-framework QTKit"
      fi
  
      if test $USE_MEDIA = 1; then
      fi
  
      if test $USE_MEDIA = 1; then
@@ -7846,7 +7719,39 @@ if test "$wxUSE_MAC" = 1 ; then
          if test "$wxUSE_OSX_IPHONE" = 1; then
              EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore"
          else
          if test "$wxUSE_OSX_IPHONE" = 1; then
              EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore"
          else
-            EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime"
+            EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
+
+            dnl The case of QuickTime framework is special: we only need it in
+            dnl 32 bit builds and not in 64 bit and, moreover, linking with it
+            dnl in 64 bit builds results in a warning because the framework is
+            dnl not available in 64 bits itself. So make an effort to avoid it
+            dnl when building for 64 bits only (i.e. not universal build).
+
+            if test "$cross_compiling" != "no"; then
+                dnl The check below doesn't work well when cross-compiling
+                dnl ("file" under non-OS X systems might not recognize
+                dnl universal binaries) so assume we do build for 32 bits as
+                dnl it's safer: at worst we'll get a warning when building in
+                dnl 64 bits only, but at least the build will still work.
+                wx_cv_target_x86_64=no
+            else
+                AC_CACHE_CHECK(
+                    [if we target only x86_64],
+                    wx_cv_target_x86_64,
+                    AC_LINK_IFELSE(
+                        [AC_LANG_SOURCE([int main() { return 0; }])],
+                        if file conftest$ac_exeext|grep -q 'i386\|ppc'; then
+                            wx_cv_target_x86_64=no
+                        else
+                            wx_cv_target_x86_64=yes
+                        fi
+                    )
+                )
+            fi
+
+            if test "$wx_cv_target_x86_64" != "yes"; then
+                EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
+            fi
          fi
      fi
  fi
          fi
      fi
  fi
@@ -7956,8 +7861,7 @@ dnl add -I options we use during library compilation
  dnl
  dnl note that the order is somewhat important: wxWidgets headers should
  dnl come first and the one with setup.h should be before $(top_srcdir)/include
  dnl
  dnl note that the order is somewhat important: wxWidgets headers should
  dnl come first and the one with setup.h should be before $(top_srcdir)/include
-dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g.
-dnl CodeWarrior):
+dnl in case the latter contains setup.h used by non-autoconf makefiles
  CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \
   -I\\${wx_top_builddir}/lib/wx/include/${TOOLCHAIN_FULLNAME} \
   -I\\${top_srcdir}/include $TOOLKIT_INCLUDE \
  CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \
   -I\\${wx_top_builddir}/lib/wx/include/${TOOLCHAIN_FULLNAME} \
   -I\\${top_srcdir}/include $TOOLKIT_INCLUDE \
@@ -7997,7 +7901,7 @@ EXTRALIBS_HTML="$MSPACK_LINK"
  EXTRALIBS_MEDIA="$GST_LIBS"
  EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
  if test "$wxUSE_GUI" = "yes"; then
  EXTRALIBS_MEDIA="$GST_LIBS"
  EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
  if test "$wxUSE_GUI" = "yes"; then
-    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
+    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK`
  fi
  if test "$wxUSE_OPENGL" = "yes"; then
      EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
  fi
  if test "$wxUSE_OPENGL" = "yes"; then
      EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
@@ -8099,10 +8003,6 @@ AC_SUBST(EXTRALIBS_OPENGL)
  AC_SUBST(EXTRALIBS_SDL)
  AC_SUBST(EXTRALIBS_STC)
  AC_SUBST(WITH_PLUGIN_SDL)
  AC_SUBST(EXTRALIBS_SDL)
  AC_SUBST(EXTRALIBS_STC)
  AC_SUBST(WITH_PLUGIN_SDL)
-AC_SUBST(EXTRALIBS_GTKPRINT)
-AC_SUBST(EXTRALIBS_GNOMEPRINT)
-AC_SUBST(EXTRALIBS_GNOMEVFS)
-AC_SUBST(EXTRALIBS_HILDON)
  AC_SUBST(UNICODE)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(DEBUG_FLAG)
  AC_SUBST(UNICODE)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(DEBUG_FLAG)
@@ -8121,7 +8021,11 @@ case "$TOOLKIT" in
      GTK)
          TOOLKIT_DESC="GTK+"
          if test "$WXGTK2" = 1; then
      GTK)
          TOOLKIT_DESC="GTK+"
          if test "$WXGTK2" = 1; then
-            TOOLKIT_DESC="$TOOLKIT_DESC 2"
+            if test "$WXGTK3" = 1; then
+                TOOLKIT_DESC="$TOOLKIT_DESC 3"
+            else
+                TOOLKIT_DESC="$TOOLKIT_DESC 2"
+            fi
              if test "$wxUSE_GTKPRINT" = "yes" ; then
                  TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";
              fi
              if test "$wxUSE_GTKPRINT" = "yes" ; then
                  TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";
              fi
@@ -8131,6 +8035,9 @@ case "$TOOLKIT" in
              if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then
                  TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomevfs"
              fi
              if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then
                  TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomevfs"
              fi
+            if test "$wxUSE_LIBNOTIFY" = "yes" ; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA libnotify"
+            fi
              if test "$wxUSE_LIBHILDON" = "yes"; then
                  TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
              fi
              if test "$wxUSE_LIBHILDON" = "yes"; then
                  TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
              fi
@@ -8297,9 +8204,11 @@ dnl at which time, this hack can be removed.
  
  if test "$wxUSE_MAC" = 1 ; then
      if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then
  
  if test "$wxUSE_MAC" = 1 ; then
      if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then
-        sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp
-        mv temp bk-deps
-        chmod +x bk-deps
+        if test "x$disable_macosx_deps" = "xyes"; then
+            sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp
+                mv temp bk-deps
+            chmod +x bk-deps
+        fi
      fi
  fi
  
      fi
  fi
  
@@ -8344,9 +8253,9 @@ case "${host}" in
          dnl system packages are compiled with Sun CC and so pkg-config outputs
          dnl CC-specific "-mt" flag, remove it when using gcc
          if test "$GCC" = yes; then
          dnl system packages are compiled with Sun CC and so pkg-config outputs
          dnl CC-specific "-mt" flag, remove it when using gcc
          if test "$GCC" = yes; then
-            CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'`
-            LIBS=`echo $LIBS | sed 's/-mt//'`
-            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'`
+            CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//g'`
+            LIBS=`echo $LIBS | sed 's/-mt//g'`
+            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//g'`
          fi
          ;;
  
          fi
          ;;
  
@@ -8354,9 +8263,9 @@ case "${host}" in
          dnl OTOH when using Sun CC under Linux, the flags contain gcc-specific
          dnl -pthreads which Sun CC doesn't know about
          if test "x$SUNCXX" = xyes; then
          dnl OTOH when using Sun CC under Linux, the flags contain gcc-specific
          dnl -pthreads which Sun CC doesn't know about
          if test "x$SUNCXX" = xyes; then
-            CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//'`
-            LIBS=`echo $LIBS | sed 's/-pthread//'`
-            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//'`
+            CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//g'`
+            LIBS=`echo $LIBS | sed 's/-pthread//g'`
+            EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//g'`
          fi
          ;;
  esac
          fi
          ;;
  esac
@@ -8390,8 +8299,6 @@ AC_SUBST(WX_LIBRARY_BASENAME_GUI)
  
  dnl toolkit options
  AC_SUBST(USE_GUI)
  
  dnl toolkit options
  AC_SUBST(USE_GUI)
-AC_SUBST(AFMINSTALL)
-AC_SUBST(WIN32INSTALL)
  AC_SUBST(TOOLKIT)
  AC_SUBST(TOOLKIT_DIR)
  AC_SUBST(TOOLCHAIN_NAME)
  AC_SUBST(TOOLKIT)
  AC_SUBST(TOOLKIT_DIR)
  AC_SUBST(TOOLCHAIN_NAME)
@@ -8444,8 +8351,6 @@ dnl additional resurces settings
  AC_SUBST(RESCOMP)
  AC_SUBST(WINDRES)
  AC_SUBST(REZ)
  AC_SUBST(RESCOMP)
  AC_SUBST(WINDRES)
  AC_SUBST(REZ)
-AC_SUBST(RESFLAGS)
-AC_SUBST(RESPROGRAMOBJ)
  AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
  AC_SUBST(WX_RESOURCES_MACOSX_DATA)
  
  AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
  AC_SUBST(WX_RESOURCES_MACOSX_DATA)