]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
adding more infos, links
[wxWidgets.git] / configure
index 1217820045518787dd9aafd70db9f9e23ae70114..4165801b8ad707e6a0c4d562a60b52099c44d766 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 61322 2009-07-05 11:51:53Z VZ .
+# From configure.in Id.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.1.
 #
@@ -676,6 +676,7 @@ CXX
 CXXFLAGS
 ac_ct_CXX
 AR
+OSX_SW_VERS
 subdirs
 PKG_CONFIG
 GTK_CFLAGS
@@ -709,6 +710,8 @@ GNOMEVFS_CFLAGS
 GNOMEVFS_LIBS
 HILDON_CFLAGS
 HILDON_LIBS
+HILDON2_CFLAGS
+HILDON2_LIBS
 PYTHON
 COND_PYTHON
 CAIRO_CFLAGS
@@ -747,7 +750,6 @@ EXTRALIBS_GNOMEPRINT
 EXTRALIBS_GNOMEVFS
 EXTRALIBS_HILDON
 UNICODE
-BUILD
 DEBUG_INFO
 DEBUG_FLAG
 TOOLKIT_LOWERCASE
@@ -800,7 +802,7 @@ USE_SOVERLINUX
 USE_SOVERSOLARIS
 USE_SOVERCYGWIN
 USE_MACVERSION
-USE_SOSYMLINKS
+USE_SOTWOSYMLINKS
 SONAME_FLAG
 DEPS_TRACKING
 BK_DEPS
@@ -831,6 +833,7 @@ COND_BUILD_release
 COND_BUILD_release_DEBUG_INFO_default
 COND_BUILD_release_UNICODE_0
 COND_BUILD_release_UNICODE_1
+COND_DEBUG_FLAG_0
 COND_DEBUG_FLAG_1
 COND_DEBUG_INFO_0
 COND_DEBUG_INFO_1
@@ -846,6 +849,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
 COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
+COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1
 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
 COND_MONOLITHIC_0_SHARED_0_USE_STC_1
 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
@@ -856,6 +860,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
 COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
+COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1
 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
 COND_MONOLITHIC_0_SHARED_1_USE_STC_1
 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
@@ -866,6 +871,7 @@ COND_MONOLITHIC_0_USE_HTML_1
 COND_MONOLITHIC_0_USE_MEDIA_1
 COND_MONOLITHIC_0_USE_PROPGRID_1
 COND_MONOLITHIC_0_USE_QA_1
+COND_MONOLITHIC_0_USE_RIBBON_1
 COND_MONOLITHIC_0_USE_RICHTEXT_1
 COND_MONOLITHIC_0_USE_STC_1
 COND_MONOLITHIC_0_USE_XRC_1
@@ -878,6 +884,7 @@ COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
 COND_PLATFORM_MACOSX_1
 COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0
+COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0
 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1
 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
@@ -899,6 +906,7 @@ COND_PLATFORM_UNIX_1_USE_GUI_1
 COND_PLATFORM_UNIX_1_USE_PLUGINS_0
 COND_PLATFORM_WIN32_0
 COND_PLATFORM_WIN32_1
+COND_PLATFORM_WIN32_1_SHARED_0
 COND_SHARED_0
 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
@@ -952,6 +960,7 @@ COND_TOOLKIT_WINCE_WXUNIV_0
 COND_TOOLKIT_X11
 COND_TOOLKIT_X11_USE_GUI_1
 COND_UNICODE_1
+COND_USE_CAIRO_1
 COND_USE_EXCEPTIONS_0
 COND_USE_EXCEPTIONS_1
 COND_USE_GUI_0
@@ -970,10 +979,11 @@ COND_USE_PCH_1
 COND_USE_PLUGINS_0
 COND_USE_RTTI_0
 COND_USE_RTTI_1
-COND_USE_SOSYMLINKS_1
+COND_USE_SOTWOSYMLINKS_1
 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1
 COND_USE_SOVERLINUX_1
 COND_USE_SOVERSION_0
+COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1
 COND_USE_SOVERSOLARIS_1
 COND_USE_STC_1
 COND_USE_THREADS_0
@@ -1012,12 +1022,12 @@ WX_RELEASE
 WX_VERSION
 WX_SUBVERSION
 WX_CHARTYPE
-WX_DEBUGTYPE
 WXCONFIG_CPPFLAGS
 WXCONFIG_CFLAGS
 WXCONFIG_CXXFLAGS
 WXCONFIG_LIBS
 WXCONFIG_RPATH
+WXCONFIG_LDFLAGS
 WXCONFIG_LDFLAGS_GUI
 WXCONFIG_RESFLAGS
 GUIDIST
@@ -1071,6 +1081,8 @@ GNOMEVFS_CFLAGS
 GNOMEVFS_LIBS
 HILDON_CFLAGS
 HILDON_LIBS
+HILDON2_CFLAGS
+HILDON2_LIBS
 CAIRO_CFLAGS
 CAIRO_LIBS
 GST_CFLAGS
@@ -1664,8 +1676,13 @@ Optional Features:
   --enable-nanox          use NanoX
   --disable-gtk2          use GTK+ 1.2 instead of 2.0
   --enable-gpe            use GNOME PDA Environment features if possible
+  --enable-debug          build library for debugging
+  --disable-debug_flag    disable all debugging support
+  --enable-debug_info     generate debug information
+  --enable-debug_gdb      create code with extra GDB debugging information
+  --enable-debug_cntxt    obsolete, don't use: use wxDebugContext
+  --enable-mem_tracing    obsolete, don't use: create code with memory tracing
   --disable-shared        create static library instead of shared
-  --enable-debug          same as debug_flag and debug_info
   --enable-stl            use STL for containers
   --enable-std_iostreams  use standard C++ stream classes
   --enable-std_string     use standard C++ string classes
@@ -1675,12 +1692,7 @@ Optional Features:
   --enable-utf8only       only support UTF-8 locales in UTF-8 build (Unix only)
   --enable-extended_rtti  use extended RTTI (XTI)
   --enable-omf            use OMF object format
-  --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)
-  --enable-debug_info     create code with debugging information
   --disable-optimise      compile without optimisations
-  --enable-debug_gdb      create code with extra GDB debugging information
-  --enable-debug_cntxt    use wxDebugContext
-  --enable-mem_tracing    create code with memory tracing
   --enable-profile        create code with profiling information
   --enable-no_rtti        create code without RTTI information
   --enable-no_exceptions  create code without C++ exceptions handling
@@ -1709,6 +1721,7 @@ Optional Features:
   --enable-baseevtloop    use event loop in console programs too
   --enable-epollloop      use wxEpollDispatcher class (Linux only)
   --enable-selectloop     use wxSelectDispatcher class
+  --enable-any            use wxAny class
   --enable-apple_ieee     use the Apple IEEE codec
   --enable-arcstream      use wxArchive streams
   --enable-base64         use base64 encoding/decoding functions
@@ -1723,12 +1736,14 @@ Optional Features:
   --enable-exceptions     build exception-safe library
   --enable-ffile          use wxFFile class
   --enable-file           use wxFile class
+  --enable-filehistory    use wxFileHistory class
   --enable-filesystem     use virtual file systems classes
   --enable-fontenum       use wxFontEnumerator class
   --enable-fontmap        use font encodings conversion classes
   --enable-fs_archive     use virtual archive filesystems
   --enable-fs_inet        use virtual HTTP/FTP filesystems
   --enable-fs_zip         now replaced by fs_archive
+  --enable-fswatcher      use wxFileSystemWatcher class
   --enable-geometry       use geometry class
   --enable-log            use logging system
   --enable-longlong       use wxLongLong class
@@ -1762,6 +1777,7 @@ Optional Features:
   --enable-xrc            use XRC resources sub-library
   --enable-aui            use AUI docking library
   --enable-propgrid       use wxPropertyGrid library
+  --enable-ribbon         use wxRibbon library
   --enable-stc            use wxStyledTextCtrl library
   --enable-constraints    use layout-constraints system
   --enable-loggui         use standard GUI logger
@@ -1773,10 +1789,10 @@ Optional Features:
   --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
   --enable-webkit         use wxWebKitCtrl (Mac)
   --enable-richtext       use wxRichTextCtrl
-  --enable-graphics_ctx   use graphics context 2D drawing API
   --enable-postscript     use wxPostscriptDC device context (default for gtk+)
   --enable-printarch      use printing architecture
   --enable-svg            use wxSVGFileDC device context
+  --enable-graphics_ctx   use graphics context 2D drawing API
   --enable-clipboard      use wxClipboard class
   --enable-dnd            use Drag'n'Drop classes
   --enable-metafile       use win32 metafiles
@@ -1810,6 +1826,7 @@ Optional Features:
   --enable-headerctrl     use wxHeaderCtrl class
   --enable-hyperlink      use wxHyperlinkCtrl class
   --enable-imaglist       use wxImageList class
+  --enable-infobar        use wxInfoBar class
   --enable-listbook       use wxListbook class
   --enable-listbox        use wxListBox class
   --enable-listctrl       use wxListCtrl class
@@ -1867,6 +1884,7 @@ Optional Features:
   --enable-metafiles      use wxMetaFile (Win32 only)
   --enable-dragimage      use wxDragImage
   --enable-accessibility  enable accessibility support
+  --enable-uiactionsim    use wxUIActionSimulator (experimental)
   --enable-palette        use wxPalette class
   --enable-image          use wxImage class
   --enable-gif            use gif images (GIF file format)
@@ -1903,8 +1921,13 @@ Optional Packages:
   --with-motif            use Motif/Lesstif
   --with-osx_carbon       use Mac OS X (Carbon)
   --with-osx_cocoa        use Mac OS X (Cocoa)
-  --with-mac              use Mac OS X (Default)
-  --with-cocoa            use Cocoa
+  --with-osx_iphone       use iPhone OS X port
+  --with-osx              use Mac OS X (default port, currently Carbon)
+  --with-carbon           same as --with-osx_carbon
+  --with-cocoa            same as --with-osx_cocoa
+  --with-iphone           same as --with-osx_iphone
+  --with-mac              same as --with-osx
+  --with-old_cocoa        use old, deprecated, Cocoa port
   --with-wine             use Wine
   --with-msw              use MS-Windows
   --with-pm               use OS/2 Presentation Manager
@@ -1921,7 +1944,7 @@ Optional Packages:
   --without-gtkprint      don't use GTK printing support
   --without-gnomeprint    don't use GNOME printing libraries
   --with-gnomevfs         use GNOME VFS for associating MIME types
-  --with-hildon           use Hildon framework for Nokia 770
+  --with-hildon           use Hildon framework for Nokia 770/800/810
   --with-opengl           use OpenGL (or Mesa)
   --with-dmalloc          use dmalloc library (http://dmalloc.com/)
   --with-sdl              use SDL for audio on Unix
@@ -1982,6 +2005,10 @@ Some influential environment variables:
   HILDON_CFLAGS
               C compiler flags for HILDON, overriding pkg-config
   HILDON_LIBS linker flags for HILDON, overriding pkg-config
+  HILDON2_CFLAGS
+              C compiler flags for HILDON2, overriding pkg-config
+  HILDON2_LIBS
+              linker flags for HILDON2, overriding pkg-config
   CAIRO_CFLAGS
               C compiler flags for CAIRO, overriding pkg-config
   CAIRO_LIBS  linker flags for CAIRO, overriding pkg-config
@@ -2585,12 +2612,13 @@ USE_ALPHA=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
-ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB"
 
-DEFAULT_wxUSE_COCOA=0
+DEFAULT_wxUSE_OLD_COCOA=0
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_wxUSE_OSX_COCOA=0
+DEFAULT_wxUSE_OSX_IPHONE=0
 DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
@@ -2599,10 +2627,11 @@ DEFAULT_wxUSE_PM=0
 DEFAULT_wxUSE_X11=0
 DEFAULT_wxUSE_DFB=0
 
-DEFAULT_DEFAULT_wxUSE_COCOA=0
+DEFAULT_DEFAULT_wxUSE_OLD_COCOA=0
 DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
+DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
 DEFAULT_DEFAULT_wxUSE_MGL=0
 DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
@@ -2671,6 +2700,14 @@ _ACEOF
 
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
+  *-*-qnx*)
+    USE_QNX=1
+    cat >>confdefs.h <<\_ACEOF
+#define __QNX__ 1
+_ACEOF
+
+    DEFAULT_DEFAULT_wxUSE_X11=1
+  ;;
   *-*-solaris2* )
     USE_SUN=1
     USE_SOLARIS=1
@@ -2867,6 +2904,20 @@ _ACEOF
     DEFAULT_STD_FLAG=no
   ;;
 
+  arm-apple-darwin*)
+        USE_BSD=1
+    USE_DARWIN=1
+    cat >>confdefs.h <<\_ACEOF
+#define __BSD__ 1
+_ACEOF
+
+    cat >>confdefs.h <<\_ACEOF
+#define __DARWIN__ 1
+_ACEOF
+
+    DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=1
+  ;;
+
   *-*-darwin* )
         USE_BSD=1
     USE_DARWIN=1
@@ -2913,13 +2964,14 @@ DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
 DEFAULT_wxUSE_DMALLOC=no
 DEFAULT_wxUSE_LIBGNOMEVFS=no
 DEFAULT_wxUSE_LIBHILDON=no
+DEFAULT_wxUSE_LIBHILDON2=no
 DEFAULT_wxUSE_LIBMSPACK=no
 DEFAULT_wxUSE_LIBSDL=no
 
 DEFAULT_wxUSE_ACCESSIBILITY=no
-DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
 DEFAULT_wxUSE_IPV6=no
 DEFAULT_wxUSE_GSTREAMER8=no
+DEFAULT_wxUSE_UIACTIONSIMULATOR=no
 
 DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_OPENGL=auto
@@ -3304,15 +3356,45 @@ if test "${with_osx_cocoa+set}" = set; then
 fi
 
 
+# Check whether --with-osx_iphone was given.
+if test "${with_osx_iphone+set}" = set; then
+  withval=$with_osx_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-osx was given.
+if test "${with_osx+set}" = set; then
+  withval=$with_osx; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-carbon was given.
+if test "${with_carbon+set}" = set; then
+  withval=$with_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-cocoa was given.
+if test "${with_cocoa+set}" = set; then
+  withval=$with_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-iphone was given.
+if test "${with_iphone+set}" = set; then
+  withval=$with_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1
+fi
+
+
 # Check whether --with-mac was given.
 if test "${with_mac+set}" = set; then
   withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
 fi
 
 
-# Check whether --with-cocoa was given.
-if test "${with_cocoa+set}" = set; then
-  withval=$with_cocoa; wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1
+# Check whether --with-old_cocoa was given.
+if test "${with_old_cocoa+set}" = set; then
+  withval=$with_old_cocoa; wxUSE_OLD_COCOA="$withval" CACHE_OLD_COCOA=1 TOOLKIT_GIVEN=1
 fi
 
 
@@ -3498,8 +3580,8 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
       done
     fi
 
-            NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
-                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+            NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+                  + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
                   + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
 
         case "${host}" in
@@ -3548,7 +3630,9 @@ echo "${ECHO_T}base only" >&6; }
 fi
 
 wxUSE_MAC=0
-if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then
+if test "$wxUSE_OSX_CARBON" = 1 \
+       -o "$wxUSE_OSX_COCOA" = 1 \
+       -o "$wxUSE_OSX_IPHONE" = 1; then
     wxUSE_MAC=1
 fi
 
@@ -4318,6 +4402,49 @@ fi
 echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
 
 
+{ echo "$as_me:$LINENO: checking for --enable-debug" >&5
+echo $ECHO_N "checking for --enable-debug... $ECHO_C" >&6; }
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval=$enable_debug;
+        if test "$enableval" = yes; then
+            wxUSE_DEBUG=yes
+        elif test "$enableval" = no; then
+            wxUSE_DEBUG=no
+        elif test "$enableval" = max; then
+            wxUSE_DEBUG=yes
+            WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=2"
+        else
+            { { echo "$as_me:$LINENO: error: Invalid --enable-debug value, must be yes, no or max" >&5
+echo "$as_me: error: Invalid --enable-debug value, must be yes, no or max" >&2;}
+   { (exit 1); exit 1; }; }
+        fi
+
+else
+  wxUSE_DEBUG=default
+
+fi
+
+
+case "$wxUSE_DEBUG" in
+    yes)
+                        DEFAULT_wxUSE_DEBUG_FLAG=yes
+        DEFAULT_wxUSE_DEBUG_INFO=yes
+
+                        DEFAULT_wxUSE_OPTIMISE=no
+        ;;
+
+    no)
+                        DEFAULT_wxUSE_DEBUG_FLAG=no
+        DEFAULT_wxUSE_DEBUG_INFO=no
+        ;;
+
+    default)
+                        DEFAULT_wxUSE_DEBUG_FLAG=yes
+        DEFAULT_wxUSE_DEBUG_INFO=no
+        ;;
+esac
+
 
           enablestring=disable
           defaultval=
@@ -4329,34 +4456,34 @@ echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
               fi
           fi
 
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
-          # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval=$enable_shared;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
+          # Check whether --enable-debug_flag was given.
+if test "${enable_debug_flag+set}" = set; then
+  enableval=$enable_debug_flag;
                           if test "$enableval" = yes; then
-                            wx_cv_use_shared='wxUSE_SHARED=yes'
+                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
                           else
-                            wx_cv_use_shared='wxUSE_SHARED=no'
+                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
                           fi
 
 else
 
-                          wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
+                          wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
 
 fi
 
 
-          eval "$wx_cv_use_shared"
+          eval "$wx_cv_use_debug_flag"
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_SHARED = no; then
+            if test $wxUSE_DEBUG_FLAG = no; then
               result=yes
             else
               result=no
             fi
           else
-            result=$wxUSE_SHARED
+            result=$wxUSE_DEBUG_FLAG
           fi
 
           { echo "$as_me:$LINENO: result: $result" >&5
@@ -4373,34 +4500,214 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; }
-          # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
+          # Check whether --enable-debug_info was given.
+if test "${enable_debug_info+set}" = set; then
+  enableval=$enable_debug_info;
                           if test "$enableval" = yes; then
-                            wx_cv_use_debug='wxUSE_DEBUG=yes'
+                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
                           else
-                            wx_cv_use_debug='wxUSE_DEBUG=no'
+                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
                           fi
 
 else
 
-                          wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
+                          wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
 
 fi
 
 
-          eval "$wx_cv_use_debug"
+          eval "$wx_cv_use_debug_info"
 
           if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG = no; then
+            if test $wxUSE_DEBUG_INFO = no; then
               result=yes
             else
               result=no
             fi
           else
-            result=$wxUSE_DEBUG
+            result=$wxUSE_DEBUG_INFO
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+
+
+          enablestring=
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
+          # Check whether --enable-debug_gdb was given.
+if test "${enable_debug_gdb+set}" = set; then
+  enableval=$enable_debug_gdb;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
+                          else
+                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
+                          fi
+
+else
+
+                          wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_debug_gdb"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DEBUG_GDB = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_DEBUG_GDB
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
+          # Check whether --enable-debug_cntxt was given.
+if test "${enable_debug_cntxt+set}" = set; then
+  enableval=$enable_debug_cntxt;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
+                          else
+                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
+                          fi
+
+else
+
+                          wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_debug_cntxt"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DEBUG_CONTEXT = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_DEBUG_CONTEXT
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+          enablestring=
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
+          # Check whether --enable-mem_tracing was given.
+if test "${enable_mem_tracing+set}" = set; then
+  enableval=$enable_mem_tracing;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
+                          else
+                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
+                          fi
+
+else
+
+                          wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_mem_tracing"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_MEM_TRACING = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_MEM_TRACING
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+
+
+          enablestring=disable
+          defaultval=
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
+          # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval=$enable_shared;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_shared='wxUSE_SHARED=yes'
+                          else
+                            wx_cv_use_shared='wxUSE_SHARED=no'
+                          fi
+
+else
+
+                          wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_shared"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_SHARED = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_SHARED
           fi
 
           { echo "$as_me:$LINENO: result: $result" >&5
@@ -4783,114 +5090,6 @@ echo "${ECHO_T}$result" >&6; }
 
 fi
 
-if test "$wxUSE_DEBUG" = "yes"; then
-    DEFAULT_wxUSE_DEBUG_FLAG=yes
-    DEFAULT_wxUSE_DEBUG_INFO=yes
-    BUILD=debug
-elif test "$wxUSE_DEBUG" = "no"; then
-    DEFAULT_wxUSE_DEBUG_FLAG=no
-    DEFAULT_wxUSE_DEBUG_INFO=no
-    BUILD=release
-fi
-
-
-          enablestring=
-          defaultval=
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
-          # Check whether --enable-debug_flag was given.
-if test "${enable_debug_flag+set}" = set; then
-  enableval=$enable_debug_flag;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
-                          else
-                            wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
-                          fi
-
-else
-
-                          wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_debug_flag"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_FLAG = no; then
-              result=yes
-            else
-              result=no
-            fi
-          else
-            result=$wxUSE_DEBUG_FLAG
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-          enablestring=
-          defaultval=
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
-          # Check whether --enable-debug_info was given.
-if test "${enable_debug_info+set}" = set; then
-  enableval=$enable_debug_info;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
-                          else
-                            wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
-                          fi
-
-else
-
-                          wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_debug_info"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_INFO = no; then
-              result=yes
-            else
-              result=no
-            fi
-          else
-            result=$wxUSE_DEBUG_INFO
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
-    wxUSE_DEBUG=yes
-    BUILD=debug
-fi
-
-if test "$wxUSE_DEBUG" = "yes"; then
-    DEFAULT_wxUSE_OPTIMISE=no
-fi
-
 
           enablestring=disable
           defaultval=
@@ -4937,138 +5136,6 @@ echo "${ECHO_T}$result" >&6; }
 
 
 
-          enablestring=
-          defaultval=
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
-          # Check whether --enable-debug_gdb was given.
-if test "${enable_debug_gdb+set}" = set; then
-  enableval=$enable_debug_gdb;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
-                          else
-                            wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
-                          fi
-
-else
-
-                          wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_debug_gdb"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_GDB = no; then
-              result=yes
-            else
-              result=no
-            fi
-          else
-            result=$wxUSE_DEBUG_GDB
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-          enablestring=
-          defaultval=
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
-          # Check whether --enable-debug_cntxt was given.
-if test "${enable_debug_cntxt+set}" = set; then
-  enableval=$enable_debug_cntxt;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
-                          else
-                            wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
-                          fi
-
-else
-
-                          wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_debug_cntxt"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DEBUG_CONTEXT = no; then
-              result=yes
-            else
-              result=no
-            fi
-          else
-            result=$wxUSE_DEBUG_CONTEXT
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
-          enablestring=
-          defaultval=
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
-          # Check whether --enable-mem_tracing was given.
-if test "${enable_mem_tracing+set}" = set; then
-  enableval=$enable_mem_tracing;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
-                          else
-                            wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
-                          fi
-
-else
-
-                          wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_mem_tracing"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_MEM_TRACING = no; then
-              result=yes
-            else
-              result=no
-            fi
-          else
-            result=$wxUSE_MEM_TRACING
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
           enablestring=
           defaultval=
           if test -z "$defaultval"; then
@@ -6288,6 +6355,50 @@ echo "${ECHO_T}$result" >&6; }
 
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-any" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-any... $ECHO_C" >&6; }
+          # Check whether --enable-any was given.
+if test "${enable_any+set}" = set; then
+  enableval=$enable_any;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_any='wxUSE_ANY=yes'
+                          else
+                            wx_cv_use_any='wxUSE_ANY=no'
+                          fi
+
+else
+
+                          wx_cv_use_any='wxUSE_ANY=${'DEFAULT_wxUSE_ANY":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_any"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_ANY = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_ANY
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -6904,6 +7015,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filehistory" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filehistory... $ECHO_C" >&6; }
+          # Check whether --enable-filehistory was given.
+if test "${enable_filehistory+set}" = set; then
+  enableval=$enable_filehistory;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_filehistory='wxUSE_FILE_HISTORY=yes'
+                          else
+                            wx_cv_use_filehistory='wxUSE_FILE_HISTORY=no'
+                          fi
+
+else
+
+                          wx_cv_use_filehistory='wxUSE_FILE_HISTORY=${'DEFAULT_wxUSE_FILE_HISTORY":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_filehistory"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FILE_HISTORY = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_FILE_HISTORY
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -7168,6 +7323,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fswatcher" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fswatcher... $ECHO_C" >&6; }
+          # Check whether --enable-fswatcher was given.
+if test "${enable_fswatcher+set}" = set; then
+  enableval=$enable_fswatcher;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_fswatcher='wxUSE_FSWATCHER=yes'
+                          else
+                            wx_cv_use_fswatcher='wxUSE_FSWATCHER=no'
+                          fi
+
+else
+
+                          wx_cv_use_fswatcher='wxUSE_FSWATCHER=${'DEFAULT_wxUSE_FSWATCHER":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_fswatcher"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FSWATCHER = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_FSWATCHER
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -7618,25 +7817,25 @@ echo "${ECHO_T}$result" >&6; }
               fi
           fi
 
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6; }
-          # Check whether --enable-system_options was given.
-if test "${enable_system_options+set}" = set; then
-  enableval=$enable_system_options;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sysoptions" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-sysoptions... $ECHO_C" >&6; }
+          # Check whether --enable-sysoptions was given.
+if test "${enable_sysoptions+set}" = set; then
+  enableval=$enable_sysoptions;
                           if test "$enableval" = yes; then
-                            wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
+                            wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=yes'
                           else
-                            wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
+                            wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=no'
                           fi
 
 else
 
-                          wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
+                          wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
 
 fi
 
 
-          eval "$wx_cv_use_system_options"
+          eval "$wx_cv_use_sysoptions"
 
           if test x"$enablestring" = xdisable; then
             if test $wxUSE_SYSTEM_OPTIONS = no; then
@@ -8627,6 +8826,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ribbon" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ribbon... $ECHO_C" >&6; }
+          # Check whether --enable-ribbon was given.
+if test "${enable_ribbon+set}" = set; then
+  enableval=$enable_ribbon;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_ribbon='wxUSE_RIBBON=yes'
+                          else
+                            wx_cv_use_ribbon='wxUSE_RIBBON=no'
+                          fi
+
+else
+
+                          wx_cv_use_ribbon='wxUSE_RIBBON=${'DEFAULT_wxUSE_RIBBON":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_ribbon"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RIBBON = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_RIBBON
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -9111,50 +9354,6 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
-          enablestring=
-          defaultval=$wxUSE_ALL_FEATURES
-          if test -z "$defaultval"; then
-              if test x"$enablestring" = xdisable; then
-                  defaultval=yes
-              else
-                  defaultval=no
-              fi
-          fi
-
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; }
-          # Check whether --enable-graphics_ctx was given.
-if test "${enable_graphics_ctx+set}" = set; then
-  enableval=$enable_graphics_ctx;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
-                          else
-                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
-                          fi
-
-else
-
-                          wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_graphics_ctx"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_GRAPHICS_CONTEXT = no; then
-              result=yes
-            else
-              result=no
-            fi
-          else
-            result=$wxUSE_GRAPHICS_CONTEXT
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -9287,6 +9486,53 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
+if test "$wxUSE_MAC" != 1; then
+
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; }
+          # Check whether --enable-graphics_ctx was given.
+if test "${enable_graphics_ctx+set}" = set; then
+  enableval=$enable_graphics_ctx;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
+                          else
+                            wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
+                          fi
+
+else
+
+                          wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_graphics_ctx"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_GRAPHICS_CONTEXT = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_GRAPHICS_CONTEXT
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+fi
+
 
 
           enablestring=
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-infobar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-infobar... $ECHO_C" >&6; }
+          # Check whether --enable-infobar was given.
+if test "${enable_infobar+set}" = set; then
+  enableval=$enable_infobar;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_infobar='wxUSE_INFOBAR=yes'
+                          else
+                            wx_cv_use_infobar='wxUSE_INFOBAR=no'
+                          fi
+
+else
+
+                          wx_cv_use_infobar='wxUSE_INFOBAR=${'DEFAULT_wxUSE_INFOBAR":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_infobar"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_INFOBAR = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_INFOBAR
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
 echo "${ECHO_T}$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-uiactionsim" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-uiactionsim... $ECHO_C" >&6; }
+          # Check whether --enable-uiactionsim was given.
+if test "${enable_uiactionsim+set}" = set; then
+  enableval=$enable_uiactionsim;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=yes'
+                          else
+                            wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=no'
+                          fi
+
+else
+
+                          wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=${'DEFAULT_wxUSE_UIACTIONSIMULATOR":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_uiactionsim"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_UIACTIONSIMULATOR = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_UIACTIONSIMULATOR
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
 
 
           enablestring=
@@ -18107,9 +18441,11 @@ echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
     fi
 fi
 
+
+if test "$wxUSE_MAC" = 1; then
+
 retest_macosx_linking=no
 
-#if test "$wxUSE_MAC" = 1; then
     if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
                         if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
             # Implicitly turn on the new --with-macosx-sdk using the default
@@ -18153,7 +18489,6 @@ echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_
 echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;}
         bk_use_pch=no
     fi
-#fi
 
 if test "x$wxUSE_MACOSX_SDK" = "xno"; then
     wxUSE_MACOSX_SDK=
@@ -18212,14 +18547,71 @@ echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.pl
         wxUSE_MACOSX_VERSION_MIN=
     fi
 elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
-    OSX_VERSION=`sw_vers -productVersion | grep 10.[0-9]`
-    if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then
-        # otherwise configure stops on leopard for universal_binary
-        wxUSE_MACOSX_VERSION_MIN=10.4
+    for ac_prog in sw_vers
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_OSX_SW_VERS+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$OSX_SW_VERS"; then
+  ac_cv_prog_OSX_SW_VERS="$OSX_SW_VERS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OSX_SW_VERS="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+OSX_SW_VERS=$ac_cv_prog_OSX_SW_VERS
+if test -n "$OSX_SW_VERS"; then
+  { echo "$as_me:$LINENO: result: $OSX_SW_VERS" >&5
+echo "${ECHO_T}$OSX_SW_VERS" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  test -n "$OSX_SW_VERS" && break
+done
+
+    if test "$OSX_SW_VERS" != ""; then
+        OSX_VERSION=`sw_vers -productVersion | grep 10.[0-9]`
     else
-        # for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard
-        wxUSE_MACOSX_VERSION_MIN=10.5
+                        { echo "$as_me:$LINENO: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&5
+echo "$as_me: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&2;}
+        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"
@@ -18387,7 +18779,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
 
-
+fi
 case "${host}" in
 
                 *-*-darwin* )
@@ -24398,42 +24790,9 @@ if test "x$SUNCC" = xyes; then
 fi
 
 if test "x$SGICC" = "xyes"; then
-    CFLAGS="-woff 3970 $CFLAGS"
-fi
-if test "x$SGICXX" = "xyes"; then
-    CXXFLAGS="-woff 3970 $CXXFLAGS"
-fi
-
-if test "x$HPCC" = "xyes"; then
-                    CFLAGS="+W 2011,2450 $CFLAGS"
-fi
-if test "x$HPCXX" = "xyes"; then
-                            CXXFLAGS="+W 2340,4232 $CXXFLAGS"
-fi
-
-if test "x$COMPAQCXX" = "xyes"; then
-                                CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
-    if test "$wxUSE_UNICODE" = "yes"; then
-        std_string="std::wstring"
-        char_type="wchar_t"
-    else
-        std_string="std::string"
-        char_type="char"
-    fi
-
-        { echo "$as_me:$LINENO: checking for $std_string in <string>" >&5
-echo $ECHO_N "checking for $std_string in <string>... $ECHO_C" >&6; }
-if test "${wx_cv_class_stdstring+set}" = set; then
+    { echo "$as_me:$LINENO: checking if cc version is 7.4.4 or greater" >&5
+echo $ECHO_N "checking if cc version is 7.4.4 or greater... $ECHO_C" >&6; }
+if test "${wx_cv_prog_sgicc744+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -24443,86 +24802,15 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <string>
+
 int
 main ()
 {
-$std_string foo;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  wx_cv_class_stdstring=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_class_stdstring=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_stdstring" >&5
-echo "${ECHO_T}$wx_cv_class_stdstring" >&6; }
-
-    if test "$wx_cv_class_stdstring" = yes; then
-        if test "$wxUSE_UNICODE" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_WSTRING 1
-_ACEOF
 
-        fi
-                    else
-        { echo "$as_me:$LINENO: checking if std::basic_string<$char_type> works" >&5
-echo $ECHO_N "checking if std::basic_string<$char_type> works... $ECHO_C" >&6; }
-if test "${wx_cv_class_stdbasicstring+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-                cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-                    #ifdef HAVE_WCHAR_H
-                    #  ifdef __CYGWIN__
-                    #    include <stddef.h>
-                    #  endif
-                    #  include <wchar.h>
-                    #endif
-                    #ifdef HAVE_STDLIB_H
-                    #  include <stdlib.h>
+                    #if _SGI_COMPILER_VERSION >= 744
+                    chock me: mipsPro is 7.4.4 or later
                     #endif
-                    #include <stdio.h>
-                    #include <string>
 
-int
-main ()
-{
-std::basic_string<$char_type> foo;
-                     const $char_type* dummy = foo.c_str();
   ;
   return 0;
 }
@@ -24541,15 +24829,15 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
+        test -z "$ac_c_werror_flag" ||
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  wx_cv_class_stdbasicstring=yes
+  wx_cv_prog_sgicc744=no
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       wx_cv_class_stdbasicstring=no
+       wx_cv_prog_sgicc744=yes
 
 fi
 
@@ -24557,113 +24845,349 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_stdbasicstring" >&5
-echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_prog_sgicc744" >&5
+echo "${ECHO_T}$wx_cv_prog_sgicc744" >&6; }
 
-        if test "$wx_cv_class_stdbasicstring" != yes; then
-            if test "$wxUSE_STL" = "yes"; then
-                { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5
-echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;}
-   { (exit 1); exit 1; }; }
-            elif test "$wxUSE_STD_STRING" = "yes"; then
-                { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5
-echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;}
-   { (exit 1); exit 1; }; }
-            else
-                { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5
-echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;}
-                wxUSE_STD_STRING=no
-            fi
-        fi
+    if test "x$wx_cv_prog_sgicc744" = "xyes"; then
+        CFLAGS="-woff 3970 $CFLAGS"
     fi
 fi
-
-if test "$wxUSE_STD_IOSTREAM" = "yes"; then
-    { echo "$as_me:$LINENO: checking for std::istream" >&5
-echo $ECHO_N "checking for std::istream... $ECHO_C" >&6; }
-if test "${ac_cv_type_std__istream+set}" = set; then
+if test "x$SGICXX" = "xyes"; then
+    { echo "$as_me:$LINENO: checking if CC version is 7.4.4 or greater" >&5
+echo $ECHO_N "checking if CC version is 7.4.4 or greater... $ECHO_C" >&6; }
+if test "${wx_cv_prog_sgicxx744+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <iostream>
-
-typedef std::istream ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_cxx_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_std__istream=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_type_std__istream=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_std__istream" >&5
-echo "${ECHO_T}$ac_cv_type_std__istream" >&6; }
-if test $ac_cv_type_std__istream = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STD__ISTREAM 1
-_ACEOF
 
+            ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-else
-  wxUSE_STD_IOSTREAM=no
-fi
-{ echo "$as_me:$LINENO: checking for std::ostream" >&5
-echo $ECHO_N "checking for std::ostream... $ECHO_C" >&6; }
-if test "${ac_cv_type_std__ostream+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
+            cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <iostream>
 
-typedef std::ostream ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+
+                    #if _SGI_COMPILER_VERSION >= 744
+                    chock me: mipsPro is 7.4.4 or later
+                    #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  wx_cv_prog_sgicxx744=no
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_prog_sgicxx744=yes
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+            ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_prog_sgicxx744" >&5
+echo "${ECHO_T}$wx_cv_prog_sgicxx744" >&6; }
+
+    if test "x$wx_cv_prog_sgicxx744" = "xyes"; then
+        CXXFLAGS="-woff 3970 $CXXFLAGS"
+    fi
+fi
+
+if test "x$HPCC" = "xyes"; then
+                    CFLAGS="+W 2011,2450 $CFLAGS"
+fi
+if test "x$HPCXX" = "xyes"; then
+                            CXXFLAGS="+W 2340,4232 $CXXFLAGS"
+fi
+
+if test "x$COMPAQCXX" = "xyes"; then
+                                CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit"
+fi
+
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
+    if test "$wxUSE_UNICODE" = "yes"; then
+        std_string="std::wstring"
+        char_type="wchar_t"
+    else
+        std_string="std::string"
+        char_type="char"
+    fi
+
+        { echo "$as_me:$LINENO: checking for $std_string in <string>" >&5
+echo $ECHO_N "checking for $std_string in <string>... $ECHO_C" >&6; }
+if test "${wx_cv_class_stdstring+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+            cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string>
+int
+main ()
+{
+$std_string foo;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  wx_cv_class_stdstring=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_class_stdstring=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_stdstring" >&5
+echo "${ECHO_T}$wx_cv_class_stdstring" >&6; }
+
+    if test "$wx_cv_class_stdstring" = yes; then
+        if test "$wxUSE_UNICODE" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_WSTRING 1
+_ACEOF
+
+        fi
+                    else
+        { echo "$as_me:$LINENO: checking if std::basic_string<$char_type> works" >&5
+echo $ECHO_N "checking if std::basic_string<$char_type> works... $ECHO_C" >&6; }
+if test "${wx_cv_class_stdbasicstring+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+                cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+                    #ifdef HAVE_WCHAR_H
+                    #  ifdef __CYGWIN__
+                    #    include <stddef.h>
+                    #  endif
+                    #  include <wchar.h>
+                    #endif
+                    #ifdef HAVE_STDLIB_H
+                    #  include <stdlib.h>
+                    #endif
+                    #include <stdio.h>
+                    #include <string>
+
+int
+main ()
+{
+std::basic_string<$char_type> foo;
+                     const $char_type* dummy = foo.c_str();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  wx_cv_class_stdbasicstring=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       wx_cv_class_stdbasicstring=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_stdbasicstring" >&5
+echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6; }
+
+        if test "$wx_cv_class_stdbasicstring" != yes; then
+            if test "$wxUSE_STL" = "yes"; then
+                { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5
+echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;}
+   { (exit 1); exit 1; }; }
+            elif test "$wxUSE_STD_STRING" = "yes"; then
+                { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5
+echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;}
+   { (exit 1); exit 1; }; }
+            else
+                { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5
+echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;}
+                wxUSE_STD_STRING=no
+            fi
+        fi
+    fi
+fi
+
+if test "$wxUSE_STD_IOSTREAM" = "yes"; then
+    { echo "$as_me:$LINENO: checking for std::istream" >&5
+echo $ECHO_N "checking for std::istream... $ECHO_C" >&6; }
+if test "${ac_cv_type_std__istream+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <iostream>
+
+typedef std::istream ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_type_std__istream=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_cv_type_std__istream=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_std__istream" >&5
+echo "${ECHO_T}$ac_cv_type_std__istream" >&6; }
+if test $ac_cv_type_std__istream = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STD__ISTREAM 1
+_ACEOF
+
+
+else
+  wxUSE_STD_IOSTREAM=no
+fi
+{ echo "$as_me:$LINENO: checking for std::ostream" >&5
+echo $ECHO_N "checking for std::ostream... $ECHO_C" >&6; }
+if test "${ac_cv_type_std__ostream+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <iostream>
+
+typedef std::ostream ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+  return 0;
+if (sizeof (ac__type_new_))
+  return 0;
   ;
   return 0;
 }
@@ -26835,9 +27359,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
 
 
             if test "$ac_cv_header_png_h" = "yes"; then
-                { echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; }
-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
+                { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
+echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
+if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -26855,11 +27379,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char png_check_sig ();
+char png_sig_cmp ();
 int
 main ()
 {
-return png_check_sig ();
+return png_sig_cmp ();
   ;
   return 0;
 }
@@ -26882,21 +27406,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_png_png_check_sig=yes
+  ac_cv_lib_png_png_sig_cmp=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_png_png_check_sig=no
+       ac_cv_lib_png_png_sig_cmp=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; }
-if test $ac_cv_lib_png_png_check_sig = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
+echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6; }
+if test $ac_cv_lib_png_png_sig_cmp = yes; then
   PNG_LINK=" -lpng -lz"
 fi
 
 
 
             case "${host}" in
-       x86_64-*-mingw32* )
+        x86_64-*-mingw32* )
                         LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+
+                                                WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
         ;;
         * )
             LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
@@ -28319,7 +28845,7 @@ if test "$wxUSE_GUI" = "yes"; then
     WXGTK2=
     WXGPE=
 
-    if test "$wxUSE_COCOA" = 1 ; then
+    if test "$wxUSE_OLD_COCOA" = 1 ; then
         if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
             { echo "$as_me:$LINENO: WARNING: Printing not supported under wxCocoa yet, disabled" >&5
 echo "$as_me: WARNING: Printing not supported under wxCocoa yet, disabled" >&2;}
@@ -29401,8 +29927,8 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
             CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
             LIBS="$LIBS $wx_cv_libs_gtk"
 
-                        { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5
-echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; }
+                        { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.18" >&5
+echo $ECHO_N "checking if GTK+ is version >= 2.18... $ECHO_C" >&6; }
             cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29416,8 +29942,8 @@ int
 main ()
 {
 
-                            #if !GTK_CHECK_VERSION(2,10,0)
-                            Not GTK+ 2.10
+                            #if !GTK_CHECK_VERSION(2,18,0)
+                            Not GTK+ 2.18
                             #endif
 
   ;
@@ -29442,6 +29968,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
 
+                            cat >>confdefs.h <<\_ACEOF
+#define __WXGTK218__ 1
+_ACEOF
+
                             cat >>confdefs.h <<\_ACEOF
 #define __WXGTK210__ 1
 _ACEOF
@@ -29452,7 +29982,7 @@ _ACEOF
 
                             { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-                            ac_wxgtk210=1
+                            ac_wxgtk218=1
 
 else
   echo "$as_me: failed program was:" >&5
@@ -29461,15 +29991,15 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
                             { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-                            ac_wxgtk210=0
+                            ac_wxgtk218=0
 
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-            if test "$ac_wxgtk210" = 0; then
-                                { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5
-echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6; }
+            if test "$ac_wxgtk218" = 0; then
+                                { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5
+echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; }
                 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29483,8 +30013,8 @@ int
 main ()
 {
 
-                                #if !GTK_CHECK_VERSION(2,6,0)
-                                Not GTK+ 2.6
+                                #if !GTK_CHECK_VERSION(2,10,0)
+                                Not GTK+ 2.10
                                 #endif
 
   ;
@@ -29509,13 +30039,17 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
         test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
 
+                                cat >>confdefs.h <<\_ACEOF
+#define __WXGTK210__ 1
+_ACEOF
+
                                 cat >>confdefs.h <<\_ACEOF
 #define __WXGTK26__ 1
 _ACEOF
 
                                 { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-                                ac_wxgtk26=1
+                                ac_wxgtk210=1
 
 else
   echo "$as_me: failed program was:" >&5
@@ -29524,11 +30058,75 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
                                 { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-                                ac_wxgtk26=0
+                                ac_wxgtk210=0
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+                if test "$ac_wxgtk210" = 0; then
+                                        { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5
+echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6; }
+                    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+                                    #include <gtk/gtk.h>
+
+int
+main ()
+{
+
+                                    #if !GTK_CHECK_VERSION(2,6,0)
+                                    Not GTK+ 2.6
+                                    #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+                                    cat >>confdefs.h <<\_ACEOF
+#define __WXGTK26__ 1
+_ACEOF
+
+                                    { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+                                    ac_wxgtk26=1
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+                                    { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+                                    ac_wxgtk26=0
 
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                fi
             fi
 
             CFLAGS="$save_CFLAGS"
@@ -29710,6 +30308,8 @@ done
         TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
         GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
 
+                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS"
+
         AFMINSTALL=afminstall
         TOOLKIT=GTK
         GUIDIST=GTK_DIST
@@ -32674,22 +33274,30 @@ echo "${ECHO_T}none" >&6; }
         fi
 
         if test "x$wxUSE_UNIX" = "xyes"; then
-            CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon $CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS_PASCAL -I/Developer/Headers/FlatCarbon $CPPFLAGS"
         else
-                        CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
+                        CPPFLAGS="$CPPFLAGS_PASCAL -DTARGET_CARBON $CPPFLAGS"
         fi
 
         TOOLKIT=OSX_CARBON
                 GUIDIST=OSX_CARBON_DIST
                         WXBASEPORT="_carbon"
+
+                                        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
     fi
 
     if test "$wxUSE_OSX_COCOA" = 1; then
         TOOLKIT=OSX_COCOA
         GUIDIST=OSX_COCOA_DIST
+
+                TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
     fi
 
-    if test "$wxUSE_COCOA" = 1; then
+    if test "$wxUSE_OSX_IPHONE" = 1; then
+        TOOLKIT=OSX_IPHONE
+    fi
+
+    if test "$wxUSE_OLD_COCOA" = 1; then
         TOOLKIT=COCOA
         GUIDIST=COCOA_DIST
     fi
@@ -32931,7 +33539,7 @@ fi
 
 
 if test "$wxUSE_DISPLAY" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
         { echo "$as_me:$LINENO: checking for Xinerama" >&5
 echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; }
 
@@ -33111,7 +33719,7 @@ echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; }
 fi
 
 if test "$wxUSE_DETECT_SM" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
         { echo "$as_me:$LINENO: checking for -lSM - X11 session management" >&5
 echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6; }
 
@@ -33164,7 +33772,7 @@ USE_OPENGL=0
 if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
 
 
-    if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
+    if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
@@ -34023,15 +34631,6 @@ if test "$wxUSE_UNICODE" = "yes"; then
     UNICODE=1
 fi
 
-lib_debug_suffix=
-WX_DEBUGTYPE="release"
-DEBUG_FLAG=0
-if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-    lib_debug_suffix=d
-    WX_DEBUGTYPE="debug"
-    DEBUG_FLAG=1
-fi
-
 WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
 WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
 
@@ -34040,27 +34639,27 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then
     DEBUG_INFO=1
 fi
 
-WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
 
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 
-TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
+TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
 
 
-if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
-    WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
 else
-    WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
 fi
 if test "${TOOLKIT_DIR}" = "os2"; then
-    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
 else
-    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
 fi
 
 
 
-if test "$wxUSE_COCOA" = 1; then
+if test "$wxUSE_OLD_COCOA" = 1; then
 
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -38980,6 +39579,10 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
                 fi
                 ;;
 
+          *-*-qnx*)
+                                                THREAD_OPTS=""
+                ;;
+
           *-*-*UnixWare*)
                                 if test "x$GCC" != "xyes"; then
                     THREAD_OPTS="-Ethread"
@@ -38987,7 +39590,15 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;}
                 ;;
         esac
 
-                                THREAD_OPTS="$THREAD_OPTS pthread none"
+        case "${host}" in
+            *-*-qnx*)
+                                                                THREAD_OPTS="none pthread"
+                ;;
+
+            *)
+                                                                                THREAD_OPTS="$THREAD_OPTS pthread none"
+                ;;
+        esac
 
                 THREADS_OK=no
         for flag in $THREAD_OPTS; do
@@ -39077,7 +39688,8 @@ echo "${ECHO_T}$THREADS_OK" >&6; }
           { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5
 echo "$as_me: WARNING: No thread support on this system... disabled" >&2;}
       else
-                              LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
+                                                                                          LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
+          WXCONFIG_LDFLAGS="$THREADS_CFLAGS $WXCONFIG_LDFLAGS"
           LIBS="$THREADS_LINK $LIBS"
 
           { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
@@ -39086,6 +39698,7 @@ echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_
           case "${host}" in
             *-aix*)
                                                                                                                 LDFLAGS="-L/usr/lib/threads $LDFLAGS"
+                WXCONFIG_LDFLAGS="-L/usr/lib/threads $WXCONFIG_LDFLAGS"
                 flag="-D_THREAD_SAFE"
                 ;;
             *-freebsd*)
@@ -41519,13 +42132,7 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then
     fi
 fi
 
-if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define WXDEBUG 1
-_ACEOF
-
-    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__"
-else
+if test "$wxUSE_DEBUG_FLAG" = "no" ; then
     if test "$wxUSE_GTK" = 1 ; then
         if test "x$wxGTK_VERSION" = "x1" ; then
             CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
@@ -41560,7 +42167,7 @@ fi
 
 if test "$GCC" = "yes" ; then
     if test "$wxUSE_NO_RTTI" = "yes" ; then
-        WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-rtti"
+                                WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -DwxNO_RTTI -fno-rtti"
     fi
     if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
         WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-exceptions"
@@ -42230,6 +42837,158 @@ _ACEOF
 fi
 
 
+if test "$wxUSE_FSWATCHER" = "yes"; then
+                if test "$wxUSE_MSW" != "1"; then
+        if test "$wxUSE_UNIX" = "yes"; then
+
+for ac_header in sys/inotify.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+            if test "$ac_cv_header_sys_inotify_h" = "yes"; then
+                cat >>confdefs.h <<\_ACEOF
+#define wxHAS_INOTIFY 1
+_ACEOF
+
+            else
+
+for ac_header in sys/event.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+              { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+                if test "$ac_cv_header_sys_event_h" = "yes"; then
+                    cat >>confdefs.h <<\_ACEOF
+#define wxHAS_KQUEUE 1
+_ACEOF
+
+                else
+                    wxUSE_FSWATCHER=no
+                fi
+            fi
+        else
+            wxUSE_FSWATCHER=no
+        fi
+    fi
+
+    if test "$wxUSE_FSWATCHER" = "yes"; then
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FSWATCHER 1
+_ACEOF
+
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher"
+    else
+        { echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher won't be available on this platform" >&5
+echo "$as_me: WARNING: wxFileSystemWatcher won't be available on this platform" >&2;}
+    fi
+fi
+
+
 if test "$wxUSE_STL" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_STL 1
@@ -42244,6 +43003,13 @@ _ACEOF
 
 fi
 
+if test "$wxUSE_ANY" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ANY 1
+_ACEOF
+
+fi
+
 if test "$wxUSE_APPLE_IEEE" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_APPLE_IEEE 1
@@ -43184,6 +43950,7 @@ fi
                 { echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5
 echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
                         wxUSE_LIBHILDON="no"
+                        ac_hildon_lgpl=0
 
 
 elif test $pkg_failed = untried; then
@@ -43191,6 +43958,7 @@ elif test $pkg_failed = untried; then
                 { echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5
 echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
                         wxUSE_LIBHILDON="no"
+                        ac_hildon_lgpl=0
 
 
 else
@@ -43206,8 +43974,99 @@ echo "${ECHO_T}yes" >&6; }
 #define wxUSE_LIBHILDON 1
 _ACEOF
 
+                ac_hildon_lgpl=1
+
+fi
+
+        if test "$ac_hildon_lgpl" = 0 ; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for HILDON2" >&5
+echo $ECHO_N "checking for HILDON2... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$HILDON2_CFLAGS"; then
+        pkg_cv_HILDON2_CFLAGS="$HILDON2_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\"") >&5
+  ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_HILDON2_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 >= 1.99" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$HILDON2_LIBS"; then
+        pkg_cv_HILDON2_LIBS="$HILDON2_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\"") >&5
+  ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_HILDON2_LIBS=`$PKG_CONFIG --libs "hildon-1 >= 1.99" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+       pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+               HILDON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 >= 1.99"`
+        else
+               HILDON2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 >= 1.99"`
+        fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$HILDON2_PKG_ERRORS" >&5
+
+
+                    { echo "$as_me:$LINENO: WARNING: libhildon_1 not found" >&5
+echo "$as_me: WARNING: libhildon_1 not found" >&2;}
+                            wxUSE_LIBHILDON2="no"
+
+
+elif test $pkg_failed = untried; then
+
+                    { echo "$as_me:$LINENO: WARNING: libhildon_1 not found" >&5
+echo "$as_me: WARNING: libhildon_1 not found" >&2;}
+                            wxUSE_LIBHILDON2="no"
+
+
+else
+       HILDON2_CFLAGS=$pkg_cv_HILDON2_CFLAGS
+       HILDON2_LIBS=$pkg_cv_HILDON2_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+                    EXTRALIBS_HILDON="$HILDON2_LIBS"
+                    CFLAGS="$CFLAGS $HILDON2_CFLAGS"
+                    CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS"
+                    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBHILDON2 1
+_ACEOF
+
 
 fi
+        fi
     fi
 fi
 
@@ -43286,6 +44145,13 @@ _ACEOF
   fi
 fi
 
+if test "$wxUSE_FILE_HISTORY" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FILE_HISTORY 1
+_ACEOF
+
+fi
+
 if test "$wxUSE_FILESYSTEM" = "yes"; then
   if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then
     { echo "$as_me:$LINENO: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5
@@ -45538,6 +46404,14 @@ _ACEOF
 
 fi
 
+if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_UIACTIONSIMULATOR 1
+_ACEOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction"
+fi
+
 
 USES_CONTROLS=0
 if test "$wxUSE_CONTROLS" = "yes"; then
@@ -45778,6 +46652,13 @@ _ACEOF
 
 fi
 
+if test "$wxUSE_INFOBAR" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_INFOBAR 1
+_ACEOF
+
+fi
+
 if test "$wxUSE_LISTBOOK" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_LISTBOOK 1
@@ -45986,7 +46867,7 @@ _ACEOF
 fi
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
-    if test "$wxUSE_COCOA" = 1 ; then
+    if test "$wxUSE_OLD_COCOA" = 1 ; then
         { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5
 echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
         wxUSE_TOGGLEBTN=no
@@ -46069,7 +46950,7 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
-    if test "$wxUSE_COCOA" = 1 ; then
+    if test "$wxUSE_OLD_COCOA" = 1 ; then
         { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
 echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
     else
@@ -46089,7 +46970,7 @@ _ACEOF
 fi
 
 if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
-    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
         { echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform... disabled" >&5
 echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;}
     else
@@ -46228,7 +47109,7 @@ fi
 
 
         CPPFLAGS="$old_CPPFLAGS"
-    elif test "$wxUSE_COCOA" = 1; then
+    elif test "$wxUSE_OLD_COCOA" = 1; then
         cat >>confdefs.h <<\_ACEOF
 #define wxUSE_WEBKIT 1
 _ACEOF
@@ -46277,6 +47158,16 @@ _ACEOF
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
 fi
 
+USE_RIBBON=0
+if test "$wxUSE_RIBBON" = "yes"; then
+   cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RIBBON 1
+_ACEOF
+
+   USE_RIBBON=1
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon"
+fi
+
 USE_STC=0
 if test "$wxUSE_STC" = "yes"; then
    cat >>confdefs.h <<\_ACEOF
 
 
 if test "$wxUSE_MAC" = 1; then
-       wxUSE_GRAPHICS_CONTEXT="yes"
+    wxUSE_GRAPHICS_CONTEXT="yes"
 fi
 
 if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
-   if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
-      cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GRAPHICS_CONTEXT 1
+    wx_has_graphics=0
+    if test "$wxUSE_MSW" = 1; then
+        { echo "$as_me:$LINENO: checking if GDI+ is available" >&5
+echo $ECHO_N "checking if GDI+ is available... $ECHO_C" >&6; }
+if test "${wx_cv_lib_gdiplus+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+                                                ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+                cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <windows.h>
+                     #include <gdiplus.h>
+int
+main ()
+{
 
-   elif test "$wxUSE_GTK" != 1; then
-            cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GRAPHICS_CONTEXT 1
+                        using namespace Gdiplus;
+
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_cxx_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  wx_cv_lib_gdiplus=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-   else
+       wx_cv_lib_gdiplus=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_lib_gdiplus" >&5
+echo "${ECHO_T}$wx_cv_lib_gdiplus" >&6; }
+        if test "$wx_cv_lib_gdiplus" = "yes"; then
+            wx_has_graphics=1
+        fi
+    elif test "$wxUSE_GTK" = 1; then
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for CAIRO" >&5
        # Put the nasty error message in config.log where it belongs
        echo "$CAIRO_PKG_ERRORS" >&5
 
-       { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5
-echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&2;}
+       { echo "$as_me:$LINENO: WARNING: Cairo library not found" >&5
+echo "$as_me: WARNING: Cairo library not found" >&2;}
 
 elif test $pkg_failed = untried; then
-       { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5
-echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&2;}
+       { echo "$as_me:$LINENO: WARNING: Cairo library not found" >&5
+echo "$as_me: WARNING: Cairo library not found" >&2;}
 
 else
        CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
        CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
-       cat >>confdefs.h <<\_ACEOF
+       wx_has_graphics=1
+fi
+    else
+                wx_has_graphics=1
+    fi
+
+    if test "$wx_has_graphics" = 1; then
+        cat >>confdefs.h <<\_ACEOF
 #define wxUSE_GRAPHICS_CONTEXT 1
 _ACEOF
 
-fi
-   fi
+    else
+        { echo "$as_me:$LINENO: WARNING: wxGraphicsContext won't be available" >&5
+echo "$as_me: WARNING: wxGraphicsContext won't be available" >&2;}
+    fi
 fi
 
 
@@ -47013,6 +47976,9 @@ if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_PROPGRID" = "yes" ; then
         BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
     fi
+    if test "$wxUSE_RIBBON" = "yes" ; then
+        BUILT_WX_LIBS="ribbon $BUILT_WX_LIBS"
+    fi
     if test "$wxUSE_RICHTEXT" = "yes" ; then
         BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
     fi
 
 
 
-
+EXTRA_FRAMEWORKS=
 if test "$wxUSE_MAC" = 1 ; then
-    if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
-        if test "$USE_DARWIN" = 1; then
-            LDFLAGS="$LDFLAGS -framework QuickTime"
-        fi
-    fi
     if test "$USE_DARWIN" = 1; then
-        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
+        EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime"
     fi
 fi
-if test "$wxUSE_COCOA" = 1 ; then
-    LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
+if test "$wxUSE_OLD_COCOA" = 1 ; then
+    EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa"
     if test "$wxUSE_MEDIACTRL" = "yes"; then
-        LDFLAGS="$LDFLAGS -framework QuickTime"
+        EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
     fi
 fi
-if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
-    LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then
+    EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
 fi
 
+LDFLAGS="$LDFLAGS $EXTRA_FRAMEWORKS"
+WXCONFIG_LDFLAGS="$WXCONFIG_LDFLAGS $EXTRA_FRAMEWORKS"
+
 LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
 
 if test "$wxUSE_GUI" = "yes"; then
@@ -47067,7 +48031,7 @@ if test "$wxUSE_GUI" = "yes"; then
     if test "$TOOLKIT" = "MSW"; then
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest"
         if test "$wxUSE_UNIVERSAL" != "yes"; then
-            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg"
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg dll"
         fi
     fi
     if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then
@@ -47220,7 +48184,7 @@ EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
 EXTRALIBS_MEDIA="$GST_LIBS"
-EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
+EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
 if test "$wxUSE_GUI" = "yes"; then
     EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
 fi
@@ -47252,7 +48216,7 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
 fi
 
 for i in $wxconfig_3rdparty ; do
-    WXCONFIG_LIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
+    WXCONFIG_LIBS="-lwx${i}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
 done
 
 
 
 
 
-
-TOOLKIT_LOWERCASE=xxx
-if test "$TOOLKIT" = "MAC"; then
-    TOOLKIT_LOWERCASE=osx_carbon
-fi
-if test "$TOOLKIT" = "OSX_CARBON"; then
-    TOOLKIT_LOWERCASE=osx_carbon
-fi
-if test "$TOOLKIT" = "OSX_COCOA"; then
-    TOOLKIT_LOWERCASE=osx_cocoa
-fi
-if test "$TOOLKIT_LOWERCASE" = "xxx"; then
-    TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
-fi
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
 
 
 
@@ -47377,6 +48328,9 @@ case "$TOOLKIT" in
             if test "$wxUSE_LIBHILDON" = "yes"; then
                 TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
             fi
+            if test "$wxUSE_LIBHILDON2" = "yes"; then
+                TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
+            fi
 
             if test "$TOOLKIT_EXTRA" != ""; then
                 TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`"
@@ -48091,7 +49045,10 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
                 PLATFORM_BEOS=1
             ;;
             * )
-                                            ;;
+                { { echo "$as_me:$LINENO: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&5
+echo "$as_me: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&2;}
+   { (exit 1); exit 1; }; }
+            ;;
         esac
     fi
 
@@ -48362,7 +49319,7 @@ EOF
         chmod +x shared-ld-sh
 
         SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
-        SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"
+        SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC"
 
 
                                 { echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
@@ -49040,7 +49997,7 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
     USE_SOVERLINUX=0
     USE_SOVERSOLARIS=0
     USE_SOVERCYGWIN=0
-    USE_SOSYMLINKS=0
+    USE_SOTWOSYMLINKS=0
     USE_MACVERSION=0
     SONAME_FLAG=
 
@@ -49054,20 +50011,19 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
         fi
         USE_SOVERSION=1
         USE_SOVERLINUX=1
-        USE_SOSYMLINKS=1
+        USE_SOTWOSYMLINKS=1
       ;;
 
       *-*-solaris2* )
         SONAME_FLAG="-h "
         USE_SOVERSION=1
         USE_SOVERSOLARIS=1
-        USE_SOSYMLINKS=1
       ;;
 
       *-*-darwin* )
         USE_MACVERSION=1
         USE_SOVERSION=1
-        USE_SOSYMLINKS=1
+        USE_SOTWOSYMLINKS=1
       ;;
 
       *-*-cygwin* )
 
 
 
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.6"
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
 
 
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.8"
 
 
 
@@ -49745,6 +50701,11 @@ EOF
         COND_BUILD_release_UNICODE_1=""
     fi
 
+    COND_DEBUG_FLAG_0="#"
+    if test "x$DEBUG_FLAG" = "x0" ; then
+        COND_DEBUG_FLAG_0=""
+    fi
+
     COND_DEBUG_FLAG_1="#"
     if test "x$DEBUG_FLAG" = "x1" ; then
         COND_DEBUG_FLAG_1=""
@@ -49820,6 +50781,11 @@ EOF
         COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
     fi
 
+    COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1=""
+    fi
+
     COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
@@ -49870,6 +50836,11 @@ EOF
         COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
     fi
 
+    COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1=""
+    fi
+
     COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
@@ -49920,6 +50891,11 @@ EOF
         COND_MONOLITHIC_0_USE_QA_1=""
     fi
 
+    COND_MONOLITHIC_0_USE_RIBBON_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_RIBBON" = "x1" ; then
+        COND_MONOLITHIC_0_USE_RIBBON_1=""
+    fi
+
     COND_MONOLITHIC_0_USE_RICHTEXT_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
         COND_MONOLITHIC_0_USE_RICHTEXT_1=""
@@ -49980,6 +50956,11 @@ EOF
         COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
     fi
 
+    COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
+        COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
+    fi
+
     COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
         COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1=""
@@ -50085,6 +51066,11 @@ EOF
         COND_PLATFORM_WIN32_1=""
     fi
 
+    COND_PLATFORM_WIN32_1_SHARED_0="#"
+    if test "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
+        COND_PLATFORM_WIN32_1_SHARED_0=""
+    fi
+
     COND_SHARED_0="#"
     if test "x$SHARED" = "x0" ; then
         COND_SHARED_0=""
@@ -50350,6 +51336,11 @@ EOF
         COND_UNICODE_1=""
     fi
 
+    COND_USE_CAIRO_1="#"
+    if test "x$USE_CAIRO" = "x1" ; then
+        COND_USE_CAIRO_1=""
+    fi
+
     COND_USE_EXCEPTIONS_0="#"
     if test "x$USE_EXCEPTIONS" = "x0" ; then
         COND_USE_EXCEPTIONS_0=""
@@ -50440,9 +51431,9 @@ EOF
         COND_USE_RTTI_1=""
     fi
 
-    COND_USE_SOSYMLINKS_1="#"
-    if test "x$USE_SOSYMLINKS" = "x1" ; then
-        COND_USE_SOSYMLINKS_1=""
+    COND_USE_SOTWOSYMLINKS_1="#"
+    if test "x$USE_SOTWOSYMLINKS" = "x1" ; then
+        COND_USE_SOTWOSYMLINKS_1=""
     fi
 
     COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#"
@@ -50460,6 +51451,11 @@ EOF
         COND_USE_SOVERSION_0=""
     fi
 
+    COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1="#"
+    if test "x$USE_SOVERSION" = "x1" -a "x$USE_SOVERSOLARIS" = "x1" ; then
+        COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1=""
+    fi
+
     COND_USE_SOVERSOLARIS_1="#"
     if test "x$USE_SOVERSOLARIS" = "x1" ; then
         COND_USE_SOVERSOLARIS_1=""
@@ -50598,10 +51594,10 @@ echo "$as_me: error: Required windres program not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
-    RESCOMP="$WINDRES"
+    RESCOMP="$WINDRES $WINDRES_CPU_DEFINE"
 fi
 
-if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
             WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
     WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
 
@@ -51753,6 +52749,7 @@ CXX!$CXX$ac_delim
 CXXFLAGS!$CXXFLAGS$ac_delim
 ac_ct_CXX!$ac_ct_CXX$ac_delim
 AR!$AR$ac_delim
+OSX_SW_VERS!$OSX_SW_VERS$ac_delim
 subdirs!$subdirs$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 GTK_CFLAGS!$GTK_CFLAGS$ac_delim
@@ -51786,10 +52783,9 @@ GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
 GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
 HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
 HILDON_LIBS!$HILDON_LIBS$ac_delim
+HILDON2_CFLAGS!$HILDON2_CFLAGS$ac_delim
+HILDON2_LIBS!$HILDON2_LIBS$ac_delim
 PYTHON!$PYTHON$ac_delim
-COND_PYTHON!$COND_PYTHON$ac_delim
-CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
-CAIRO_LIBS!$CAIRO_LIBS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -51831,6 +52827,9 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+COND_PYTHON!$COND_PYTHON$ac_delim
+CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
+CAIRO_LIBS!$CAIRO_LIBS$ac_delim
 GST_CFLAGS!$GST_CFLAGS$ac_delim
 GST_LIBS!$GST_LIBS$ac_delim
 ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim
@@ -51865,7 +52864,6 @@ EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
 EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim
 EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim
 UNICODE!$UNICODE$ac_delim
-BUILD!$BUILD$ac_delim
 DEBUG_INFO!$DEBUG_INFO$ac_delim
 DEBUG_FLAG!$DEBUG_FLAG$ac_delim
 TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
@@ -51918,7 +52916,7 @@ USE_SOVERLINUX!$USE_SOVERLINUX$ac_delim
 USE_SOVERSOLARIS!$USE_SOVERSOLARIS$ac_delim
 USE_SOVERCYGWIN!$USE_SOVERCYGWIN$ac_delim
 USE_MACVERSION!$USE_MACVERSION$ac_delim
-USE_SOSYMLINKS!$USE_SOSYMLINKS$ac_delim
+USE_SOTWOSYMLINKS!$USE_SOTWOSYMLINKS$ac_delim
 SONAME_FLAG!$SONAME_FLAG$ac_delim
 DEPS_TRACKING!$DEPS_TRACKING$ac_delim
 BK_DEPS!$BK_DEPS$ac_delim
@@ -51926,8 +52924,6 @@ WINDRES!$WINDRES$ac_delim
 REZ!$REZ$ac_delim
 SETFILE!$SETFILE$ac_delim
 OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim
-GCC_PCH!$GCC_PCH$ac_delim
-ICC_PCH!$ICC_PCH$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -51969,6 +52965,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+GCC_PCH!$GCC_PCH$ac_delim
+ICC_PCH!$ICC_PCH$ac_delim
 ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
 ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
 BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
@@ -51990,6 +52988,7 @@ COND_BUILD_release!$COND_BUILD_release$ac_delim
 COND_BUILD_release_DEBUG_INFO_default!$COND_BUILD_release_DEBUG_INFO_default$ac_delim
 COND_BUILD_release_UNICODE_0!$COND_BUILD_release_UNICODE_0$ac_delim
 COND_BUILD_release_UNICODE_1!$COND_BUILD_release_UNICODE_1$ac_delim
+COND_DEBUG_FLAG_0!$COND_DEBUG_FLAG_0$ac_delim
 COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
 COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim
 COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim
@@ -52005,6 +53004,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim
+COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
@@ -52015,6 +53015,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim
+COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
@@ -52025,6 +53026,7 @@ COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
 COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
 COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim
 COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
+COND_MONOLITHIC_0_USE_RIBBON_1!$COND_MONOLITHIC_0_USE_RIBBON_1$ac_delim
 COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
 COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
 COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim
@@ -52037,6 +53039,7 @@ COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0
 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim
 COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim
 COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0$ac_delim
+COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0$ac_delim
 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
@@ -52058,14 +53061,7 @@ COND_PLATFORM_UNIX_1_USE_GUI_1!$COND_PLATFORM_UNIX_1_USE_GUI_1$ac_delim
 COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim
 COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
 COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
-COND_SHARED_0!$COND_SHARED_0$ac_delim
-COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
-COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
-COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
-COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
-COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
-COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
+COND_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_WIN32_1_SHARED_0$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52107,6 +53103,14 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+COND_SHARED_0!$COND_SHARED_0$ac_delim
+COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
+COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
+COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
+COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
 COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
 COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
 COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
@@ -52152,6 +53156,7 @@ COND_TOOLKIT_WINCE_WXUNIV_0!$COND_TOOLKIT_WINCE_WXUNIV_0$ac_delim
 COND_TOOLKIT_X11!$COND_TOOLKIT_X11$ac_delim
 COND_TOOLKIT_X11_USE_GUI_1!$COND_TOOLKIT_X11_USE_GUI_1$ac_delim
 COND_UNICODE_1!$COND_UNICODE_1$ac_delim
+COND_USE_CAIRO_1!$COND_USE_CAIRO_1$ac_delim
 COND_USE_EXCEPTIONS_0!$COND_USE_EXCEPTIONS_0$ac_delim
 COND_USE_EXCEPTIONS_1!$COND_USE_EXCEPTIONS_1$ac_delim
 COND_USE_GUI_0!$COND_USE_GUI_0$ac_delim
@@ -52170,10 +53175,11 @@ COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
 COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
 COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
 COND_USE_RTTI_1!$COND_USE_RTTI_1$ac_delim
-COND_USE_SOSYMLINKS_1!$COND_USE_SOSYMLINKS_1$ac_delim
+COND_USE_SOTWOSYMLINKS_1!$COND_USE_SOTWOSYMLINKS_1$ac_delim
 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim
 COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
 COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim
+COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1!$COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1$ac_delim
 COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
 COND_USE_STC_1!$COND_USE_STC_1$ac_delim
 COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim
@@ -52194,16 +53200,6 @@ COND_wxUSE_LIBJPEG_builtin!$COND_wxUSE_LIBJPEG_builtin$ac_delim
 COND_wxUSE_LIBPNG_builtin!$COND_wxUSE_LIBPNG_builtin$ac_delim
 COND_wxUSE_LIBTIFF_builtin!$COND_wxUSE_LIBTIFF_builtin$ac_delim
 COND_wxUSE_REGEX_builtin!$COND_wxUSE_REGEX_builtin$ac_delim
-COND_wxUSE_ZLIB_builtin!$COND_wxUSE_ZLIB_builtin$ac_delim
-DEREZ!$DEREZ$ac_delim
-SHARED!$SHARED$ac_delim
-WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
-WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
-USE_GUI!$USE_GUI$ac_delim
-AFMINSTALL!$AFMINSTALL$ac_delim
-WIN32INSTALL!$WIN32INSTALL$ac_delim
-TOOLKIT!$TOOLKIT$ac_delim
-TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52245,6 +53241,16 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+COND_wxUSE_ZLIB_builtin!$COND_wxUSE_ZLIB_builtin$ac_delim
+DEREZ!$DEREZ$ac_delim
+SHARED!$SHARED$ac_delim
+WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
+WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
+USE_GUI!$USE_GUI$ac_delim
+AFMINSTALL!$AFMINSTALL$ac_delim
+WIN32INSTALL!$WIN32INSTALL$ac_delim
+TOOLKIT!$TOOLKIT$ac_delim
+TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
 TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
 TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
 cross_compiling!$cross_compiling$ac_delim
@@ -52253,12 +53259,12 @@ WX_RELEASE!$WX_RELEASE$ac_delim
 WX_VERSION!$WX_VERSION$ac_delim
 WX_SUBVERSION!$WX_SUBVERSION$ac_delim
 WX_CHARTYPE!$WX_CHARTYPE$ac_delim
-WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim
 WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
 WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
 WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
 WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim
 WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
+WXCONFIG_LDFLAGS!$WXCONFIG_LDFLAGS$ac_delim
 WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
 WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
 GUIDIST!$GUIDIST$ac_delim
@@ -52283,7 +53289,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -52914,8 +53920,6 @@ echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
 echo ""
 echo "  Which GUI toolkit should wxWidgets use?                 ${TOOLKIT_DESC}"
 echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
-
-echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
 echo $ECHO_N "  Should wxWidgets support Unicode?                       ${wxUSE_UNICODE:-no}$ECHO_C"
 if test "$wxUSE_UNICODE" = "yes"; then