always return (owned or non-owned, depending on build) wxScopedCharBuffer from utf8_s...

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

index 43017aedf73eec755b47906164754142df7036d0..bd353a59f09834f4b532d36c2a5536c14deb86c6 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
  #! /bin/sh
  #! /bin/sh
-# From configure.in Id: configure.in 55576 2008-09-12 20:57:41Z VZ .
+# From configure.in Id: configure.in 59905 2009-03-28 19:10:05Z VZ .
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
  #
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
  #
@@ -661,10 +661,6 @@ host
  host_cpu
  host_vendor
  host_os
  host_cpu
  host_vendor
  host_os
-target
-target_cpu
-target_vendor
-target_os
  wx_top_builddir
  CC
  CFLAGS
  wx_top_builddir
  CC
  CFLAGS
@@ -701,6 +697,7 @@ PANGOXFT_LIBS
  CFLAGS_VISIBILITY
  CXXFLAGS_VISIBILITY
  LIBICONV
  CFLAGS_VISIBILITY
  CXXFLAGS_VISIBILITY
  LIBICONV
+GXX_VERSION
  SDL_CONFIG
  SDL_CFLAGS
  SDL_LIBS
  SDL_CONFIG
  SDL_CFLAGS
  SDL_LIBS
@@ -753,8 +750,10 @@ DEBUG_INFO
  DEBUG_FLAG
  TOOLKIT_LOWERCASE
  TOOLKIT_VERSION
  DEBUG_FLAG
  TOOLKIT_LOWERCASE
  TOOLKIT_VERSION
+DYLIB_RPATH_INSTALL
+DYLIB_RPATH_POSTLINK
  SAMPLES_RPATH_FLAG
  SAMPLES_RPATH_FLAG
-SAMPLES_RPATH_POSTLINK
+HEADER_PAD_OPTION
  HOST_SUFFIX
  CPPUNIT_CFLAGS
  CPPUNIT_LIBS
  HOST_SUFFIX
  CPPUNIT_CFLAGS
  CPPUNIT_LIBS
@@ -806,8 +805,11 @@ BK_DEPS
  WINDRES
  REZ
  SETFILE
  WINDRES
  REZ
  SETFILE
+OBJCXXFLAGS
  GCC_PCH
  ICC_PCH
  GCC_PCH
  ICC_PCH
+ICC_PCH_CREATE_SWITCH
+ICC_PCH_USE_SWITCH
  BK_MAKE_PCH
  COND_BUILD_DEBUG
  COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT
  BK_MAKE_PCH
  COND_BUILD_DEBUG
  COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT
@@ -818,6 +820,15 @@ COND_BUILD_RELEASE
  COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
  COND_BUILD_RELEASE_UNICODE_0
  COND_BUILD_RELEASE_UNICODE_1
  COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
  COND_BUILD_RELEASE_UNICODE_0
  COND_BUILD_RELEASE_UNICODE_1
+COND_BUILD_debug
+COND_BUILD_debug_DEBUG_FLAG_default
+COND_BUILD_debug_DEBUG_INFO_default
+COND_BUILD_debug_UNICODE_0
+COND_BUILD_debug_UNICODE_1
+COND_BUILD_release
+COND_BUILD_release_DEBUG_INFO_default
+COND_BUILD_release_UNICODE_0
+COND_BUILD_release_UNICODE_1
  COND_DEBUG_FLAG_1
  COND_DEBUG_INFO_0
  COND_DEBUG_INFO_1
  COND_DEBUG_FLAG_1
  COND_DEBUG_INFO_0
  COND_DEBUG_INFO_1
@@ -891,13 +902,13 @@ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
  COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
  COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
  COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
  COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
  COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
  COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin
  COND_SHARED_0_USE_STC_1
  COND_SHARED_0_USE_STC_1
-COND_SHARED_0_WXUSE_EXPAT_BUILTIN
-COND_SHARED_0_WXUSE_REGEX_BUILTIN
-COND_SHARED_0_WXUSE_ZLIB_BUILTIN
+COND_SHARED_0_wxUSE_EXPAT_builtin
+COND_SHARED_0_wxUSE_REGEX_builtin
+COND_SHARED_0_wxUSE_ZLIB_builtin
  COND_SHARED_1
  COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
  COND_TOOLKIT_
  COND_SHARED_1
  COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
  COND_TOOLKIT_
@@ -911,7 +922,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
  COND_TOOLKIT_GTK_USE_GUI_1
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
  COND_TOOLKIT_GTK_USE_GUI_1
@@ -952,6 +962,9 @@ COND_USE_GUI_1_WXUNIV_1
  COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
  COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
  COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
  COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
  COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
  COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin
  COND_USE_OPENGL_1
  COND_USE_PCH_1
  COND_USE_PLUGINS_0
  COND_USE_OPENGL_1
  COND_USE_PCH_1
  COND_USE_PLUGINS_0
@@ -976,6 +989,12 @@ COND_WXUSE_LIBPNG_BUILTIN
  COND_WXUSE_LIBTIFF_BUILTIN
  COND_WXUSE_REGEX_BUILTIN
  COND_WXUSE_ZLIB_BUILTIN
  COND_WXUSE_LIBTIFF_BUILTIN
  COND_WXUSE_REGEX_BUILTIN
  COND_WXUSE_ZLIB_BUILTIN
+COND_wxUSE_EXPAT_builtin
+COND_wxUSE_LIBJPEG_builtin
+COND_wxUSE_LIBPNG_builtin
+COND_wxUSE_LIBTIFF_builtin
+COND_wxUSE_REGEX_builtin
+COND_wxUSE_ZLIB_builtin
  DEREZ
  SHARED
  WX_LIBRARY_BASENAME_NOGUI
  DEREZ
  SHARED
  WX_LIBRARY_BASENAME_NOGUI
@@ -1623,7 +1642,6 @@ X features:
  System types:
    --build=BUILD     configure for building on BUILD [guessed]
    --host=HOST       cross-compile to build programs to run on HOST [BUILD]
  System types:
    --build=BUILD     configure for building on BUILD [guessed]
    --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
  _ACEOF
  fi
  
  _ACEOF
  fi
  
@@ -1764,9 +1782,9 @@ Optional Features:
    --disable-controls      disable compilation of all standard controls
    --enable-accel          use accelerators
    --enable-animatectrl    use wxAnimationCtrl class
    --disable-controls      disable compilation of all standard controls
    --enable-accel          use accelerators
    --enable-animatectrl    use wxAnimationCtrl class
-  --enable-button         use wxButton class
    --enable-bmpbutton      use wxBitmapButton class
    --enable-bmpcombobox    use wxBitmapComboBox class
    --enable-bmpbutton      use wxBitmapButton class
    --enable-bmpcombobox    use wxBitmapComboBox class
+  --enable-button         use wxButton class
    --enable-calendar       use wxCalendarCtrl class
    --enable-caret          use wxCaret class
    --enable-checkbox       use wxCheckBox class
    --enable-calendar       use wxCalendarCtrl class
    --enable-caret          use wxCaret class
    --enable-checkbox       use wxCheckBox class
@@ -1777,17 +1795,18 @@ Optional Features:
    --enable-colourpicker   use wxColourPickerCtrl class
    --enable-combobox       use wxComboBox class
    --enable-comboctrl      use wxComboCtrl class
    --enable-colourpicker   use wxColourPickerCtrl class
    --enable-combobox       use wxComboBox class
    --enable-comboctrl      use wxComboCtrl class
+  --enable-dataviewctrl   use wxDataViewCtrl class
    --enable-datepick       use wxDatePickerCtrl class
    --enable-datepick       use wxDatePickerCtrl class
+  --enable-detect_sm      use code to detect X11 session manager
    --enable-dirpicker      use wxDirPickerCtrl class
    --enable-display        use wxDisplay class
    --enable-dirpicker      use wxDirPickerCtrl class
    --enable-display        use wxDisplay class
-  --enable-detect_sm      use code to detect X11 session manager
    --enable-editablebox    use wxEditableListBox class
    --enable-editablebox    use wxEditableListBox class
-  --enable-filepicker     use wxFilePickerCtrl class
    --enable-filectrl       use wxFileCtrl class
    --enable-filectrl       use wxFileCtrl class
+  --enable-filepicker     use wxFilePickerCtrl class
    --enable-fontpicker     use wxFontPickerCtrl class
    --enable-gauge          use wxGauge class
    --enable-grid           use wxGrid class
    --enable-fontpicker     use wxFontPickerCtrl class
    --enable-gauge          use wxGauge class
    --enable-grid           use wxGrid class
-  --enable-dataviewctrl   use wxDataViewCtrl class
+  --enable-headerctrl     use wxHeaderCtrl class
    --enable-hyperlink      use wxHyperlinkCtrl class
    --enable-imaglist       use wxImageList class
    --enable-listbook       use wxListbook class
    --enable-hyperlink      use wxHyperlinkCtrl class
    --enable-imaglist       use wxImageList class
    --enable-listbook       use wxListbook class
@@ -1796,8 +1815,10 @@ Optional Features:
    --enable-notebook       use wxNotebook class
    --enable-notifmsg       use wxNotificationMessage class
    --enable-odcombobox     use wxOwnerDrawnComboBox class
    --enable-notebook       use wxNotebook class
    --enable-notifmsg       use wxNotificationMessage class
    --enable-odcombobox     use wxOwnerDrawnComboBox class
+  --enable-popupwin       use wxPopUpWindow class
    --enable-radiobox       use wxRadioBox class
    --enable-radiobtn       use wxRadioButton class
    --enable-radiobox       use wxRadioBox class
    --enable-radiobtn       use wxRadioButton class
+  --enable-rearrangectrl  use wxRearrangeList/Ctrl/Dialog
    --enable-sash           use wxSashWindow class
    --enable-scrollbar      use wxScrollBar class and scrollable windows
    --enable-searchctrl     use wxSearchCtrl class
    --enable-sash           use wxSashWindow class
    --enable-scrollbar      use wxScrollBar class and scrollable windows
    --enable-searchctrl     use wxSearchCtrl class
@@ -1810,17 +1831,15 @@ Optional Features:
    --enable-statline       use wxStaticLine class
    --enable-stattext       use wxStaticText class
    --enable-statusbar      use wxStatusBar class
    --enable-statline       use wxStaticLine class
    --enable-stattext       use wxStaticText class
    --enable-statusbar      use wxStatusBar class
-  --enable-tabdialog      use wxTabControl class
    --enable-taskbaricon    use wxTaskBarIcon class
    --enable-taskbaricon    use wxTaskBarIcon class
+  --enable-tbarnative     use native wxToolBar class
    --enable-textctrl       use wxTextCtrl class
    --enable-textctrl       use wxTextCtrl class
+  --enable-tipwindow      use wxTipWindow class
    --enable-togglebtn      use wxToggleButton class
    --enable-toolbar        use wxToolBar class
    --enable-togglebtn      use wxToggleButton class
    --enable-toolbar        use wxToolBar class
-  --enable-tbarnative     use native wxToolBar class
-  --enable-treebook       use wxTreebook class
    --enable-toolbook       use wxToolbook class
    --enable-toolbook       use wxToolbook class
+  --enable-treebook       use wxTreebook class
    --enable-treectrl       use wxTreeCtrl class
    --enable-treectrl       use wxTreeCtrl class
-  --enable-tipwindow      use wxTipWindow class
-  --enable-popupwin       use wxPopUpWindow class
    --enable-commondlg      use all common dialogs
    --enable-aboutdlg       use wxAboutBox
    --enable-choicedlg      use wxChoiceDialog
    --enable-commondlg      use all common dialogs
    --enable-aboutdlg       use wxAboutBox
    --enable-choicedlg      use wxChoiceDialog
@@ -2516,50 +2535,14 @@ IFS=$ac_save_IFS
  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
  
  
  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
  
  
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-fi
  
  
+if test "$cross_compiling" != "no"; then
+    HOST_PREFIX="${host_alias}-"
+    HOST_SUFFIX="-$host_alias"
+else
+    HOST_PREFIX=
+    HOST_SUFFIX=
  fi
  fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
  
  
  wx_major_version_number=2
  
  
  wx_major_version_number=2
@@ -2628,9 +2611,9 @@ DEFAULT_DEFAULT_wxUSE_X11=0
  DEFAULT_DEFAULT_wxUSE_DFB=0
  
  PROGRAM_EXT=
  DEFAULT_DEFAULT_wxUSE_DFB=0
  
  PROGRAM_EXT=
-SO_SUFFIX=so
  SAMPLES_RPATH_FLAG=
  SAMPLES_RPATH_FLAG=
-SAMPLES_RPATH_POSTLINK=
+DYLIB_RPATH_INSTALL=
+DYLIB_RPATH_POSTLINK=
  
  DEFAULT_STD_FLAG=yes
  
  
  DEFAULT_STD_FLAG=yes
  
@@ -2639,7 +2622,6 @@ case "${host}" in
      USE_HPUX=1
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
      NEEDS_D_REENTRANT_FOR_R_FUNCS=1
      USE_HPUX=1
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
      NEEDS_D_REENTRANT_FOR_R_FUNCS=1
-    SO_SUFFIX=sl
      cat >>confdefs.h <<\_ACEOF
  #define __HPUX__ 1
  _ACEOF
      cat >>confdefs.h <<\_ACEOF
  #define __HPUX__ 1
  _ACEOF
@@ -2811,7 +2793,6 @@ _ACEOF
      USE_AIX=1
      USE_SYSV=1
      USE_SVR4=1
      USE_AIX=1
      USE_SYSV=1
      USE_SVR4=1
-                        SO_SUFFIX=a
      cat >>confdefs.h <<\_ACEOF
  #define __AIX__ 1
  _ACEOF
      cat >>confdefs.h <<\_ACEOF
  #define __AIX__ 1
  _ACEOF
@@ -2838,8 +2819,7 @@ _ACEOF
    ;;
  
    *-*-cygwin* | *-*-mingw32* )
    ;;
  
    *-*-cygwin* | *-*-mingw32* )
-                SO_SUFFIX=dll
-    PROGRAM_EXT=".exe"
+                PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_MSW=1
    ;;
  
      DEFAULT_DEFAULT_wxUSE_MSW=1
    ;;
  
@@ -2889,7 +2869,6 @@ _ACEOF
    *-*-darwin* )
          USE_BSD=1
      USE_DARWIN=1
    *-*-darwin* )
          USE_BSD=1
      USE_DARWIN=1
-    SO_SUFFIX=dylib
      cat >>confdefs.h <<\_ACEOF
  #define __BSD__ 1
  _ACEOF
      cat >>confdefs.h <<\_ACEOF
  #define __BSD__ 1
  _ACEOF
@@ -2908,7 +2887,6 @@ _ACEOF
    powerpc-apple-macos* )
          USE_UNIX=0
              ac_cv_c_bigendian=yes
    powerpc-apple-macos* )
          USE_UNIX=0
              ac_cv_c_bigendian=yes
-    SO_SUFFIX=shlib
              DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
      DEFAULT_STD_FLAG=no
    ;;
              DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
      DEFAULT_STD_FLAG=no
    ;;
@@ -2943,16 +2921,16 @@ DEFAULT_wxUSE_LIBGNOMEVFS=no
  DEFAULT_wxUSE_LIBHILDON=no
  DEFAULT_wxUSE_LIBMSPACK=no
  DEFAULT_wxUSE_LIBSDL=no
  DEFAULT_wxUSE_LIBHILDON=no
  DEFAULT_wxUSE_LIBMSPACK=no
  DEFAULT_wxUSE_LIBSDL=no
-DEFAULT_wxUSE_OPENGL=no
  
  DEFAULT_wxUSE_ACCESSIBILITY=no
  DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
  DEFAULT_wxUSE_IPV6=no
  
  DEFAULT_wxUSE_ACCESSIBILITY=no
  DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
  DEFAULT_wxUSE_IPV6=no
-DEFAULT_wxUSE_MEDIACTRL=no
-DEFAULT_wxUSE_TAB_DIALOG=no
  DEFAULT_wxUSE_GSTREAMER8=no
  
  DEFAULT_wxUSE_UNICODE_UTF8=auto
  DEFAULT_wxUSE_GSTREAMER8=no
  
  DEFAULT_wxUSE_UNICODE_UTF8=auto
+DEFAULT_wxUSE_OPENGL=auto
+DEFAULT_wxUSE_MEDIACTRL=auto
+
  DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
  
  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
  DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
  
  DEFAULT_wxUSE_UNIVERSAL_BINARY=no
@@ -3246,6 +3224,10 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  echo "${ECHO_T}$result" >&6; }
  
  
+if test "$wxUSE_ALL_FEATURES" = "no"; then
+                    DEFAULT_wxUSE_MEDIACTRL=no
+fi
+
  
  if test "$wxUSE_GUI" = "yes"; then
  
  
  if test "$wxUSE_GUI" = "yes"; then
  
@@ -5466,6 +5448,11 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  echo "${ECHO_T}$result" >&6; }
  
  
+cat >>confdefs.h <<\_ACEOF
+#define wxEVENTS_COMPATIBILITY_2_8 0
+_ACEOF
+
+
  
            enablestring=disable
            defaultval=
  
            enablestring=disable
            defaultval=
@@ -9447,114 +9434,61 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  echo "${ECHO_T}$result" >&6; }
  
  
-if test "$wxUSE_CONTROLS" = "yes"; then
-  DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_ANIMATIONCTRL=yes
-  DEFAULT_wxUSE_BMPBUTTON=yes
-  DEFAULT_wxUSE_BUTTON=yes
-  DEFAULT_wxUSE_CALCTRL=yes
-  DEFAULT_wxUSE_CARET=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_CHECKBOX=yes
-  DEFAULT_wxUSE_CHECKLISTBOX=yes
-  DEFAULT_wxUSE_CHOICE=yes
-  DEFAULT_wxUSE_CHOICEBOOK=yes
-  DEFAULT_wxUSE_COLLPANE=yes
-  DEFAULT_wxUSE_COLOURPICKERCTRL=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_DATEPICKCTRL=yes
-  DEFAULT_wxUSE_DISPLAY=yes
-  DEFAULT_wxUSE_DETECT_SM=yes
-  DEFAULT_wxUSE_DIRPICKERCTRL=yes
-  DEFAULT_wxUSE_FILECTRL=yes
-  DEFAULT_wxUSE_FILEPICKERCTRL=yes
-  DEFAULT_wxUSE_FONTPICKERCTRL=yes
-  DEFAULT_wxUSE_GAUGE=yes
-  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_HYPERLINKCTRL=yes
-  DEFAULT_wxUSE_DATAVIEWCTRL=yes
-  DEFAULT_wxUSE_IMAGLIST=yes
-  DEFAULT_wxUSE_LISTBOOK=yes
-  DEFAULT_wxUSE_LISTBOX=yes
-  DEFAULT_wxUSE_LISTCTRL=yes
-  DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_RADIOBOX=yes
-  DEFAULT_wxUSE_RADIOBTN=yes
-  DEFAULT_wxUSE_SASH=yes
-  DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SEARCHCTRL=yes
-  DEFAULT_wxUSE_SLIDER=yes
-  DEFAULT_wxUSE_SPINBTN=yes
-  DEFAULT_wxUSE_SPINCTRL=yes
-  DEFAULT_wxUSE_SPLITTER=yes
-  DEFAULT_wxUSE_STATBMP=yes
-  DEFAULT_wxUSE_STATBOX=yes
-  DEFAULT_wxUSE_STATLINE=yes
-  DEFAULT_wxUSE_STATUSBAR=yes
-  DEFAULT_wxUSE_TAB_DIALOG=yes
-  DEFAULT_wxUSE_TOGGLEBTN=yes
-  DEFAULT_wxUSE_TOOLBAR=yes
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
-  DEFAULT_wxUSE_TOOLTIPS=yes
-  DEFAULT_wxUSE_TREEBOOK=yes
-  DEFAULT_wxUSE_TOOLBOOK=yes
-  DEFAULT_wxUSE_TREECTRL=yes
-  DEFAULT_wxUSE_POPUPWIN=yes
-  DEFAULT_wxUSE_TIPWINDOW=yes
-elif test "$wxUSE_CONTROLS" = "no"; then
-  DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_ANIMATIONCTRL=no
-  DEFAULT_wxUSE_BMPBUTTON=no
-  DEFAULT_wxUSE_BUTTON=no
-  DEFAULT_wxUSE_CALCTRL=no
-  DEFAULT_wxUSE_CARET=no
-  DEFAULT_wxUSE_COLLPANE=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_CHECKBOX=no
-  DEFAULT_wxUSE_CHECKLISTBOX=no
-  DEFAULT_wxUSE_CHOICE=no
-  DEFAULT_wxUSE_CHOICEBOOK=no
-  DEFAULT_wxUSE_COLOURPICKERCTRL=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_DATEPICKCTRL=no
-  DEFAULT_wxUSE_DISPLAY=no
-  DEFAULT_wxUSE_DETECT_SM=no
-  DEFAULT_wxUSE_DIRPICKERCTRL=no
-  DEFAULT_wxUSE_FILECTRL=no
-  DEFAULT_wxUSE_FILEPICKERCTRL=no
-  DEFAULT_wxUSE_FONTPICKERCTRL=no
-  DEFAULT_wxUSE_GAUGE=no
-  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_HYPERLINKCTRL=no
-  DEFAULT_wxUSE_DATAVIEWCTRL=no
-  DEFAULT_wxUSE_IMAGLIST=no
-  DEFAULT_wxUSE_LISTBOOK=no
-  DEFAULT_wxUSE_LISTBOX=no
-  DEFAULT_wxUSE_LISTCTRL=no
-  DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_RADIOBOX=no
-  DEFAULT_wxUSE_RADIOBTN=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SEARCHCTRL=no
-  DEFAULT_wxUSE_SLIDER=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPINCTRL=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STATBMP=no
-  DEFAULT_wxUSE_STATBOX=no
-  DEFAULT_wxUSE_STATLINE=no
-  DEFAULT_wxUSE_STATUSBAR=no
-  DEFAULT_wxUSE_TAB_DIALOG=no
-  DEFAULT_wxUSE_TOGGLEBTN=no
-  DEFAULT_wxUSE_TOOLBAR=no
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
-  DEFAULT_wxUSE_TOOLTIPS=no
-  DEFAULT_wxUSE_TREEBOOK=no
-  DEFAULT_wxUSE_TOOLBOOK=no
-  DEFAULT_wxUSE_TREECTRL=no
-  DEFAULT_wxUSE_POPUPWIN=no
-  DEFAULT_wxUSE_TIPWINDOW=no
+if test "$wxUSE_CONTROLS" = "no"; then
+    DEFAULT_wxUSE_ACCEL=no
+    DEFAULT_wxUSE_ANIMATIONCTRL=no
+    DEFAULT_wxUSE_BMPBUTTON=no
+    DEFAULT_wxUSE_BUTTON=no
+    DEFAULT_wxUSE_CALCTRL=no
+    DEFAULT_wxUSE_CARET=no
+    DEFAULT_wxUSE_CHECKBOX=no
+    DEFAULT_wxUSE_CHECKLISTBOX=no
+    DEFAULT_wxUSE_CHOICE=no
+    DEFAULT_wxUSE_CHOICEBOOK=no
+    DEFAULT_wxUSE_COLLPANE=no
+    DEFAULT_wxUSE_COLOURPICKERCTRL=no
+    DEFAULT_wxUSE_COMBOBOX=no
+    DEFAULT_wxUSE_COMBOBOX=no
+    DEFAULT_wxUSE_DATAVIEWCTRL=no
+    DEFAULT_wxUSE_DATEPICKCTRL=no
+    DEFAULT_wxUSE_DETECT_SM=no
+    DEFAULT_wxUSE_DIRPICKERCTRL=no
+    DEFAULT_wxUSE_DISPLAY=no
+    DEFAULT_wxUSE_FILECTRL=no
+    DEFAULT_wxUSE_FILEPICKERCTRL=no
+    DEFAULT_wxUSE_FONTPICKERCTRL=no
+    DEFAULT_wxUSE_GAUGE=no
+    DEFAULT_wxUSE_GRID=no
+    DEFAULT_wxUSE_HEADERCTRL=no
+    DEFAULT_wxUSE_HYPERLINKCTRL=no
+    DEFAULT_wxUSE_IMAGLIST=no
+    DEFAULT_wxUSE_LISTBOOK=no
+    DEFAULT_wxUSE_LISTBOX=no
+    DEFAULT_wxUSE_LISTCTRL=no
+    DEFAULT_wxUSE_NOTEBOOK=no
+    DEFAULT_wxUSE_POPUPWIN=no
+    DEFAULT_wxUSE_RADIOBOX=no
+    DEFAULT_wxUSE_RADIOBTN=no
+    DEFAULT_wxUSE_REARRANGECTRL=no
+    DEFAULT_wxUSE_SASH=no
+    DEFAULT_wxUSE_SCROLLBAR=no
+    DEFAULT_wxUSE_SEARCHCTRL=no
+    DEFAULT_wxUSE_SLIDER=no
+    DEFAULT_wxUSE_SPINBTN=no
+    DEFAULT_wxUSE_SPINCTRL=no
+    DEFAULT_wxUSE_SPLITTER=no
+    DEFAULT_wxUSE_STATBMP=no
+    DEFAULT_wxUSE_STATBOX=no
+    DEFAULT_wxUSE_STATLINE=no
+    DEFAULT_wxUSE_STATUSBAR=no
+    DEFAULT_wxUSE_TIPWINDOW=no
+    DEFAULT_wxUSE_TOGGLEBTN=no
+    DEFAULT_wxUSE_TOOLBAR=no
+    DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+    DEFAULT_wxUSE_TOOLBOOK=no
+    DEFAULT_wxUSE_TOOLTIPS=no
+    DEFAULT_wxUSE_TREEBOOK=no
+    DEFAULT_wxUSE_TREECTRL=no
  fi
  
  
  fi
  
  
@@ -9656,34 +9590,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; }
-          # Check whether --enable-button was given.
-if test "${enable_button+set}" = set; then
-  enableval=$enable_button;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; }
+          # Check whether --enable-bmpbutton was given.
+if test "${enable_bmpbutton+set}" = set; then
+  enableval=$enable_bmpbutton;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_button='wxUSE_BUTTON=yes'
+                            wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
                            else
                            else
-                            wx_cv_use_button='wxUSE_BUTTON=no'
+                            wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
+                          wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_button"
+          eval "$wx_cv_use_bmpbutton"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BUTTON = yes; then
+            if test $wxUSE_BMPBUTTON = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_BUTTON
+            result=$wxUSE_BMPBUTTON
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -9700,34 +9634,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; }
-          # Check whether --enable-bmpbutton was given.
-if test "${enable_bmpbutton+set}" = set; then
-  enableval=$enable_bmpbutton;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; }
+          # Check whether --enable-bmpcombobox was given.
+if test "${enable_bmpcombobox+set}" = set; then
+  enableval=$enable_bmpcombobox;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
+                            wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
                            else
                            else
-                            wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
+                            wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
+                          wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_bmpbutton"
+          eval "$wx_cv_use_bmpcombobox"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BMPBUTTON = yes; then
+            if test $wxUSE_BITMAPCOMBOBOX = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_BMPBUTTON
+            result=$wxUSE_BITMAPCOMBOBOX
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -9744,34 +9678,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; }
-          # Check whether --enable-bmpcombobox was given.
-if test "${enable_bmpcombobox+set}" = set; then
-  enableval=$enable_bmpcombobox;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; }
+          # Check whether --enable-button was given.
+if test "${enable_button+set}" = set; then
+  enableval=$enable_button;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
+                            wx_cv_use_button='wxUSE_BUTTON=yes'
                            else
                            else
-                            wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
+                            wx_cv_use_button='wxUSE_BUTTON=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
+                          wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_bmpcombobox"
+          eval "$wx_cv_use_button"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_BITMAPCOMBOBOX = yes; then
+            if test $wxUSE_BUTTON = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_BITMAPCOMBOBOX
+            result=$wxUSE_BUTTON
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -10218,6 +10152,50 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  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}-dataviewctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; }
+          # Check whether --enable-dataviewctrl was given.
+if test "${enable_dataviewctrl+set}" = set; then
+  enableval=$enable_dataviewctrl;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
+                          else
+                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
+                          fi
+
+else
+
+                          wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_dataviewctrl"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_DATAVIEWCTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_DATAVIEWCTRL
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
@@ -10272,34 +10250,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; }
-          # Check whether --enable-dirpicker was given.
-if test "${enable_dirpicker+set}" = set; then
-  enableval=$enable_dirpicker;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; }
+          # Check whether --enable-detect_sm was given.
+if test "${enable_detect_sm+set}" = set; then
+  enableval=$enable_detect_sm;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes'
+                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
                            else
                            else
-                            wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
+                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
+                          wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_dirpicker"
+          eval "$wx_cv_use_detect_sm"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DIRPICKERCTRL = yes; then
+            if test $wxUSE_DETECT_SM = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_DIRPICKERCTRL
+            result=$wxUSE_DETECT_SM
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -10316,34 +10294,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; }
-          # Check whether --enable-display was given.
-if test "${enable_display+set}" = set; then
-  enableval=$enable_display;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; }
+          # Check whether --enable-dirpicker was given.
+if test "${enable_dirpicker+set}" = set; then
+  enableval=$enable_dirpicker;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_display='wxUSE_DISPLAY=yes'
+                            wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes'
                            else
                            else
-                            wx_cv_use_display='wxUSE_DISPLAY=no'
+                            wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
+                          wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_display"
+          eval "$wx_cv_use_dirpicker"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DISPLAY = yes; then
+            if test $wxUSE_DIRPICKERCTRL = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_DISPLAY
+            result=$wxUSE_DIRPICKERCTRL
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -10360,34 +10338,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; }
-          # Check whether --enable-detect_sm was given.
-if test "${enable_detect_sm+set}" = set; then
-  enableval=$enable_detect_sm;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; }
+          # Check whether --enable-display was given.
+if test "${enable_display+set}" = set; then
+  enableval=$enable_display;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
+                            wx_cv_use_display='wxUSE_DISPLAY=yes'
                            else
                            else
-                            wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
+                            wx_cv_use_display='wxUSE_DISPLAY=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
+                          wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_detect_sm"
+          eval "$wx_cv_use_display"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DETECT_SM = yes; then
+            if test $wxUSE_DISPLAY = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_DETECT_SM
+            result=$wxUSE_DISPLAY
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -10448,34 +10426,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; }
-          # Check whether --enable-filepicker was given.
-if test "${enable_filepicker+set}" = set; then
-  enableval=$enable_filepicker;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filectrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filectrl... $ECHO_C" >&6; }
+          # Check whether --enable-filectrl was given.
+if test "${enable_filectrl+set}" = set; then
+  enableval=$enable_filectrl;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
+                            wx_cv_use_filectrl='wxUSE_FILECTRL=yes'
                            else
                            else
-                            wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
+                            wx_cv_use_filectrl='wxUSE_FILECTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
+                          wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_filepicker"
+          eval "$wx_cv_use_filectrl"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILEPICKERCTRL = yes; then
+            if test $wxUSE_FILECTRL = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_FILEPICKERCTRL
+            result=$wxUSE_FILECTRL
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -10492,34 +10470,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filectrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-filectrl... $ECHO_C" >&6; }
-          # Check whether --enable-filectrl was given.
-if test "${enable_filectrl+set}" = set; then
-  enableval=$enable_filectrl;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; }
+          # Check whether --enable-filepicker was given.
+if test "${enable_filepicker+set}" = set; then
+  enableval=$enable_filepicker;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_filectrl='wxUSE_FILECTRL=yes'
+                            wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
                            else
                            else
-                            wx_cv_use_filectrl='wxUSE_FILECTRL=no'
+                            wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}"
+                          wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_filectrl"
+          eval "$wx_cv_use_filepicker"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_FILECTRL = yes; then
+            if test $wxUSE_FILEPICKERCTRL = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_FILECTRL
+            result=$wxUSE_FILEPICKERCTRL
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -10668,34 +10646,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; }
-          # Check whether --enable-dataviewctrl was given.
-if test "${enable_dataviewctrl+set}" = set; then
-  enableval=$enable_dataviewctrl;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-headerctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-headerctrl... $ECHO_C" >&6; }
+          # Check whether --enable-headerctrl was given.
+if test "${enable_headerctrl+set}" = set; then
+  enableval=$enable_headerctrl;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
+                            wx_cv_use_headerctrl='wxUSE_HEADERCTRL=yes'
                            else
                            else
-                            wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
+                            wx_cv_use_headerctrl='wxUSE_HEADERCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
+                          wx_cv_use_headerctrl='wxUSE_HEADERCTRL=${'DEFAULT_wxUSE_HEADERCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_dataviewctrl"
+          eval "$wx_cv_use_headerctrl"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_DATAVIEWCTRL = yes; then
+            if test $wxUSE_HEADERCTRL = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_DATAVIEWCTRL
+            result=$wxUSE_HEADERCTRL
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -11054,6 +11032,50 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  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}-popupwin" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; }
+          # Check whether --enable-popupwin was given.
+if test "${enable_popupwin+set}" = set; then
+  enableval=$enable_popupwin;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_popupwin='wxUSE_POPUPWIN=yes'
+                          else
+                            wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
+                          fi
+
+else
+
+                          wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_popupwin"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_POPUPWIN = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_POPUPWIN
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
@@ -11142,6 +11164,50 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  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}-rearrangectrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-rearrangectrl... $ECHO_C" >&6; }
+          # Check whether --enable-rearrangectrl was given.
+if test "${enable_rearrangectrl+set}" = set; then
+  enableval=$enable_rearrangectrl;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=yes'
+                          else
+                            wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=no'
+                          fi
+
+else
+
+                          wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=${'DEFAULT_wxUSE_REARRANGECTRL":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_rearrangectrl"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_REARRANGECTRL = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_REARRANGECTRL
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
@@ -11670,50 +11736,6 @@ fi
  echo "${ECHO_T}$result" >&6; }
  
  
  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}-tabdialog" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6; }
-          # Check whether --enable-tabdialog was given.
-if test "${enable_tabdialog+set}" = set; then
-  enableval=$enable_tabdialog;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes'
-                          else
-                            wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
-                          fi
-
-else
-
-                          wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_tabdialog"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TAB_DIALOG = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_TAB_DIALOG
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
            enablestring=
            defaultval=$wxUSE_ALL_FEATURES
            if test -z "$defaultval"; then
@@ -11768,34 +11790,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; }
-          # Check whether --enable-textctrl was given.
-if test "${enable_textctrl+set}" = set; then
-  enableval=$enable_textctrl;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; }
+          # Check whether --enable-tbarnative was given.
+if test "${enable_tbarnative+set}" = set; then
+  enableval=$enable_tbarnative;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
+                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
                            else
                            else
-                            wx_cv_use_textctrl='wxUSE_TEXTCTRL=no'
+                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
+                          wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_textctrl"
+          eval "$wx_cv_use_tbarnative"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TEXTCTRL = yes; then
+            if test $wxUSE_TOOLBAR_NATIVE = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_TEXTCTRL
+            result=$wxUSE_TOOLBAR_NATIVE
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -11812,34 +11834,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; }
-          # Check whether --enable-togglebtn was given.
-if test "${enable_togglebtn+set}" = set; then
-  enableval=$enable_togglebtn;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; }
+          # Check whether --enable-textctrl was given.
+if test "${enable_textctrl+set}" = set; then
+  enableval=$enable_textctrl;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
+                            wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
                            else
                            else
-                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
+                            wx_cv_use_textctrl='wxUSE_TEXTCTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
+                          wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_togglebtn"
+          eval "$wx_cv_use_textctrl"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOGGLEBTN = yes; then
+            if test $wxUSE_TEXTCTRL = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_TOGGLEBTN
+            result=$wxUSE_TEXTCTRL
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -11856,34 +11878,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; }
-          # Check whether --enable-toolbar was given.
-if test "${enable_toolbar+set}" = set; then
-  enableval=$enable_toolbar;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; }
+          # Check whether --enable-tipwindow was given.
+if test "${enable_tipwindow+set}" = set; then
+  enableval=$enable_tipwindow;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
                            else
                            else
-                            wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
+                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
+                          wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_toolbar"
+          eval "$wx_cv_use_tipwindow"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOOLBAR = yes; then
+            if test $wxUSE_TIPWINDOW = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_TOOLBAR
+            result=$wxUSE_TIPWINDOW
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -11900,34 +11922,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; }
-          # Check whether --enable-tbarnative was given.
-if test "${enable_tbarnative+set}" = set; then
-  enableval=$enable_tbarnative;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; }
+          # Check whether --enable-togglebtn was given.
+if test "${enable_togglebtn+set}" = set; then
+  enableval=$enable_togglebtn;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
                            else
                            else
-                            wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+                            wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
+                          wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_tbarnative"
+          eval "$wx_cv_use_togglebtn"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TOOLBAR_NATIVE = yes; then
+            if test $wxUSE_TOGGLEBTN = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_TOOLBAR_NATIVE
+            result=$wxUSE_TOGGLEBTN
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -11944,34 +11966,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; }
-          # Check whether --enable-treebook was given.
-if test "${enable_treebook+set}" = set; then
-  enableval=$enable_treebook;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; }
+          # Check whether --enable-toolbar was given.
+if test "${enable_toolbar+set}" = set; then
+  enableval=$enable_toolbar;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_treebook='wxUSE_TREEBOOK=yes'
+                            wx_cv_use_toolbar='wxUSE_TOOLBAR=yes'
                            else
                            else
-                            wx_cv_use_treebook='wxUSE_TREEBOOK=no'
+                            wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
+                          wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_treebook"
+          eval "$wx_cv_use_toolbar"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TREEBOOK = yes; then
+            if test $wxUSE_TOOLBAR = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_TREEBOOK
+            result=$wxUSE_TOOLBAR
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -12032,78 +12054,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; }
-          # Check whether --enable-treectrl was given.
-if test "${enable_treectrl+set}" = set; then
-  enableval=$enable_treectrl;
-                          if test "$enableval" = yes; then
-                            wx_cv_use_treectrl='wxUSE_TREECTRL=yes'
-                          else
-                            wx_cv_use_treectrl='wxUSE_TREECTRL=no'
-                          fi
-
-else
-
-                          wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
-
-fi
-
-
-          eval "$wx_cv_use_treectrl"
-
-          if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TREECTRL = yes; then
-              result=no
-            else
-              result=yes
-            fi
-          else
-            result=$wxUSE_TREECTRL
-          fi
-
-          { echo "$as_me:$LINENO: result: $result" >&5
-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}-tipwindow" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; }
-          # Check whether --enable-tipwindow was given.
-if test "${enable_tipwindow+set}" = set; then
-  enableval=$enable_tipwindow;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; }
+          # Check whether --enable-treebook was given.
+if test "${enable_treebook+set}" = set; then
+  enableval=$enable_treebook;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
+                            wx_cv_use_treebook='wxUSE_TREEBOOK=yes'
                            else
                            else
-                            wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
+                            wx_cv_use_treebook='wxUSE_TREEBOOK=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
+                          wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_tipwindow"
+          eval "$wx_cv_use_treebook"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_TIPWINDOW = yes; then
+            if test $wxUSE_TREEBOOK = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_TIPWINDOW
+            result=$wxUSE_TREEBOOK
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -12120,34 +12098,34 @@ echo "${ECHO_T}$result" >&6; }
                fi
            fi
  
                fi
            fi
  
-          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; }
-          # Check whether --enable-popupwin was given.
-if test "${enable_popupwin+set}" = set; then
-  enableval=$enable_popupwin;
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; }
+          # Check whether --enable-treectrl was given.
+if test "${enable_treectrl+set}" = set; then
+  enableval=$enable_treectrl;
                            if test "$enableval" = yes; then
                            if test "$enableval" = yes; then
-                            wx_cv_use_popupwin='wxUSE_POPUPWIN=yes'
+                            wx_cv_use_treectrl='wxUSE_TREECTRL=yes'
                            else
                            else
-                            wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
+                            wx_cv_use_treectrl='wxUSE_TREECTRL=no'
                            fi
  
  else
  
                            fi
  
  else
  
-                          wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
+                          wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
  
  fi
  
  
  
  fi
  
  
-          eval "$wx_cv_use_popupwin"
+          eval "$wx_cv_use_treectrl"
  
            if test x"$enablestring" = xdisable; then
  
            if test x"$enablestring" = xdisable; then
-            if test $wxUSE_POPUPWIN = yes; then
+            if test $wxUSE_TREECTRL = yes; then
                result=no
              else
                result=yes
              fi
            else
                result=no
              else
                result=yes
              fi
            else
-            result=$wxUSE_POPUPWIN
+            result=$wxUSE_TREECTRL
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
            fi
  
            { echo "$as_me:$LINENO: result: $result" >&5
@@ -15050,6 +15028,163 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+        if test "$INTELCC" = "yes"; then
+
+
+    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
+
+    { echo "$as_me:$LINENO: checking whether we are using Intel C compiler v8 or later" >&5
+echo $ECHO_N "checking whether we are using Intel C compiler v8 or later... $ECHO_C" >&6; }
+if test "${bakefile_cv_c_compiler___INTEL_COMPILER_lt_800+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.  */
+
+int
+main ()
+{
+
+             #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800
+                choke me
+             #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
+  bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&6; }
+    if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" = "xyes"; then
+        :; INTELCC8=yes
+    else
+        :;
+    fi
+    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
+
+
+
+
+
+    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
+
+    { echo "$as_me:$LINENO: checking whether we are using Intel C compiler v10 or later" >&5
+echo $ECHO_N "checking whether we are using Intel C compiler v10 or later... $ECHO_C" >&6; }
+if test "${bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000+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.  */
+
+int
+main ()
+{
+
+             #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000
+                choke me
+             #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
+  bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&6; }
+    if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then
+        :; INTELCC10=yes
+    else
+        :;
+    fi
+    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
+
          if test "x$GCC" != "xyes"; then
          if test "xCC" = "xC"; then
              { echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5
          if test "x$GCC" != "xyes"; then
          if test "xCC" = "xC"; then
              { echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5
@@ -15428,6 +15563,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+                if test "$MWCC" != "yes"; then
  
  
      ac_ext=c
  
  
      ac_ext=c
@@ -15505,6 +15641,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+                fi
                  ;;
  
              IRIX*)
                  ;;
  
              IRIX*)
@@ -15588,6 +15725,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
                  ;;
  
              Linux*)
                  ;;
  
              Linux*)
+                                                if test "$INTELCC" != "yes"; then
  
  
      ac_ext=c
  
  
      ac_ext=c
@@ -15665,6 +15803,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+                fi
                  ;;
  
              HP-UX*)
                  ;;
  
              HP-UX*)
@@ -16802,6 +16941,163 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+        if test "$INTELCXX" = "yes"; then
+
+
+    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
+
+    { echo "$as_me:$LINENO: checking whether we are using Intel C++ compiler v8 or later" >&5
+echo $ECHO_N "checking whether we are using Intel C++ compiler v8 or later... $ECHO_C" >&6; }
+if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800+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.  */
+
+int
+main ()
+{
+
+             #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800
+                choke me
+             #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
+  bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" = "xyes"; then
+        :; INTELCXX8=yes
+    else
+        :;
+    fi
+    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
+
+
+
+
+
+    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
+
+    { echo "$as_me:$LINENO: checking whether we are using Intel C++ compiler v10 or later" >&5
+echo $ECHO_N "checking whether we are using Intel C++ compiler v10 or later... $ECHO_C" >&6; }
+if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000+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.  */
+
+int
+main ()
+{
+
+             #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000
+                choke me
+             #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
+  bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&6; }
+    if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then
+        :; INTELCXX10=yes
+    else
+        :;
+    fi
+    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
+
          if test "x$GCXX" != "xyes"; then
          if test "xCXX" = "xC"; then
              { echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5
          if test "x$GCXX" != "xyes"; then
          if test "xCXX" = "xC"; then
              { echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5
@@ -17180,6 +17476,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+                if test "$MWCXX" != "yes"; then
  
  
      ac_ext=cpp
  
  
      ac_ext=cpp
@@ -17257,6 +17554,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+                fi
                  ;;
  
              IRIX*)
                  ;;
  
              IRIX*)
@@ -17340,6 +17638,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
                  ;;
  
              Linux*)
                  ;;
  
              Linux*)
+                                                if test "$INTELCXX" != "yes"; then
  
  
      ac_ext=cpp
  
  
      ac_ext=cpp
@@ -17417,6 +17716,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
+                fi
                  ;;
  
              HP-UX*)
                  ;;
  
              HP-UX*)
@@ -23256,6 +23556,8 @@ _ACEOF
  fi
  
  fi
  fi
  
  fi
+
+LARGEFILE_CPPFLAGS=
  # Check whether --enable-largefile was given.
  if test "${enable_largefile+set}" = set; then
    enableval=$enable_largefile;
  # Check whether --enable-largefile was given.
  if test "${enable_largefile+set}" = set; then
    enableval=$enable_largefile;
@@ -23410,25 +23712,29 @@ _ACEOF
  echo "${ECHO_T}$wx_largefile" >&6; }
  fi
  
  echo "${ECHO_T}$wx_largefile" >&6; }
  fi
  
+if test "$ac_cv_sys_file_offset_bits" = "64"; then
+    LARGEFILE_CPPFLAGS="-D_FILE_OFFSET_BITS=64"
+elif test "$ac_cv_sys_large_files" = 1; then
+    LARGEFILE_CPPFLAGS="-D_LARGE_FILES"
+fi
  
  
-if test "x$wx_largefile" = "xyes"; then
-    if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+if test -n "$LARGEFILE_CPPFLAGS"; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $LARGEFILE_CPPFLAGS"
  
  
-                                                        if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
-            { echo "$as_me:$LINENO: checking if -D__STDC_EXT__ is required" >&5
+                            if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
+        { echo "$as_me:$LINENO: checking if -D__STDC_EXT__ is required" >&5
  echo $ECHO_N "checking if -D__STDC_EXT__ is required... $ECHO_C" >&6; }
  if test "${wx_cv_STDC_EXT_required+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
  echo $ECHO_N "checking if -D__STDC_EXT__ is required... $ECHO_C" >&6; }
  if test "${wx_cv_STDC_EXT_required+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-                    ac_ext=cpp
+                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
  
  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
+                cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -23439,9 +23745,9 @@ int
  main ()
  {
  
  main ()
  {
  
-                            #ifndef __STDC_EXT__
-                                choke me
-                            #endif
+                        #ifndef __STDC_EXT__
+                            choke me
+                        #endif
  
    ;
    return 0;
  
    ;
    return 0;
@@ -23474,7 +23780,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-                    ac_ext=c
+                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_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'
@@ -23485,14 +23791,21 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  fi
  { echo "$as_me:$LINENO: result: $wx_cv_STDC_EXT_required" >&5
  echo "${ECHO_T}$wx_cv_STDC_EXT_required" >&6; }
  fi
  { echo "$as_me:$LINENO: result: $wx_cv_STDC_EXT_required" >&5
  echo "${ECHO_T}$wx_cv_STDC_EXT_required" >&6; }
-            if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
-                WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
-            fi
+        if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
+            WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
          fi
          fi
-    else
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGE_FILES"
      fi
      fi
-        { echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+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
+
+old_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LARGEFILE_CPPFLAGS"
+{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
  echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
  if test "${ac_cv_sys_largefile_source+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
  if test "${ac_cv_sys_largefile_source+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -23529,7 +23842,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
          test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -23575,7 +23888,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
+        test -z "$ac_cxx_werror_flag" ||
          test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
          test ! -s conftest.err
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
@@ -23616,9 +23929,15 @@ _ACEOF
  
  fi
  
  
  fi
  
-    if test "$ac_cv_sys_largefile_source" != no; then
-        WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
-    fi
+CPPFLAGS="$old_CPPFLAGS"
+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
+
+if test "$ac_cv_sys_largefile_source" != no; then
+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
  fi
  
  { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
  fi
  
  { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
@@ -23874,92 +24193,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
  
  
  
-  { echo "$as_me:$LINENO: checking if C++ compiler supports bool" >&5
-echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6; }
-if test "${wx_cv_cpp_bool+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.  */
-
-
-int
-main ()
-{
-
-        bool b = true;
-
-        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
-
-        wx_cv_cpp_bool=yes
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-        wx_cv_cpp_bool=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_cpp_bool" >&5
-echo "${ECHO_T}$wx_cv_cpp_bool" >&6; }
-
-  if test "$wx_cv_cpp_bool" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_BOOL 1
-_ACEOF
-
-  fi
-
-
-
    { echo "$as_me:$LINENO: checking if C++ compiler supports the explicit keyword" >&5
  echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6; }
  if test "${wx_cv_explicit+set}" = set; then
    { echo "$as_me:$LINENO: checking if C++ compiler supports the explicit keyword" >&5
  echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6; }
  if test "${wx_cv_explicit+set}" = set; then
@@ -24089,229 +24322,6 @@ _ACEOF
    fi
  
  
    fi
  
  
-{ echo "$as_me:$LINENO: checking whether the compiler supports const_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports const_cast<>... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_const_cast+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.  */
-
-int
-main ()
-{
-int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;
-  ;
-  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_cxx_const_cast=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_cxx_const_cast=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: $ac_cv_cxx_const_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_const_cast" >&6; }
-if test "$ac_cv_cxx_const_cast" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CONST_CAST
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking whether the compiler supports reinterpret_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports reinterpret_cast<>... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_reinterpret_cast+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 <typeinfo>
-class Base { public : Base () {} virtual void f () = 0;};
-class Derived : public Base { public : Derived () {} virtual void f () {} };
-class Unrelated { public : Unrelated () {} };
-int g (Unrelated&) { return 0; }
-int
-main ()
-{
-
-Derived d;Base& b=d;Unrelated& e=reinterpret_cast<Unrelated&>(b);return g(e);
-  ;
-  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_cxx_reinterpret_cast=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_cxx_reinterpret_cast=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: $ac_cv_cxx_reinterpret_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_reinterpret_cast" >&6; }
-if test "$ac_cv_cxx_reinterpret_cast" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REINTERPRET_CAST
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking whether the compiler supports static_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports static_cast<>... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_static_cast+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 <typeinfo>
-class Base { public : Base () {} virtual void f () = 0; };
-class Derived : public Base { public : Derived () {} virtual void f () {} };
-int g (Derived&) { return 0; }
-int
-main ()
-{
-
-Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);
-  ;
-  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_cxx_static_cast=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_cxx_static_cast=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: $ac_cv_cxx_static_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_static_cast" >&6; }
-if test "$ac_cv_cxx_static_cast" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STATIC_CAST
-_ACEOF
-
-fi
-
-
  if test "x$SUNCXX" = xyes; then
      CXXFLAGS="-features=tmplife $CXXFLAGS"
  fi
  if test "x$SUNCXX" = xyes; then
      CXXFLAGS="-features=tmplife $CXXFLAGS"
  fi
@@ -24331,7 +24341,7 @@ if test "x$HPCC" = "xyes"; then
                      CFLAGS="+W 2011,2450 $CFLAGS"
  fi
  if test "x$HPCXX" = "xyes"; then
                      CFLAGS="+W 2011,2450 $CFLAGS"
  fi
  if test "x$HPCXX" = "xyes"; then
-            CXXFLAGS="+W 2340 $CXXFLAGS"
+                            CXXFLAGS="+W 2340,4232 $CXXFLAGS"
  fi
  
  if test "x$COMPAQCXX" = "xyes"; then
  fi
  
  if test "x$COMPAQCXX" = "xyes"; then
@@ -33080,16 +33090,15 @@ fi
  
  
  USE_OPENGL=0
  
  
  USE_OPENGL=0
-if test "$wxUSE_OPENGL" = "yes"; then
-    if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
-        { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
-echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
-        wxUSE_OPENGL="no"
-    elif test "$wxUSE_OSX_CARBON" = 1 -o test "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
+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
          OPENGL_LIBS="-framework OpenGL -framework AGL"
      elif test "$wxUSE_MSW" = 1; then
          OPENGL_LIBS="-lopengl32 -lglu32"
          OPENGL_LIBS="-framework OpenGL -framework AGL"
      elif test "$wxUSE_MSW" = 1; then
          OPENGL_LIBS="-lopengl32 -lglu32"
-    else
+    elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then
+
                          { echo "$as_me:$LINENO: checking for OpenGL headers" >&5
  echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; }
  
                          { echo "$as_me:$LINENO: checking for OpenGL headers" >&5
  echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; }
  
@@ -33347,10 +33356,23 @@ fi
  
  
          if test "x$OPENGL_LIBS" = "x"; then
  
  
          if test "x$OPENGL_LIBS" = "x"; then
-                                                { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5
+            if test "$wxUSE_OPENGL" = "yes"; then
+                { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5
  echo "$as_me: error: OpenGL libraries not available" >&2;}
     { (exit 1); exit 1; }; }
  echo "$as_me: error: OpenGL libraries not available" >&2;}
     { (exit 1); exit 1; }; }
+            else
+                                { echo "$as_me:$LINENO: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&5
+echo "$as_me: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&2;}
+                wxUSE_OPENGL=no
+                USE_OPENGL=0
+            fi
+        else
+                        wxUSE_OPENGL=yes
          fi
          fi
+    else
+        { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
+echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
+        wxUSE_OPENGL="no"
      fi
  
      if test "$wxUSE_OPENGL" = "yes"; then
      fi
  
      if test "$wxUSE_OPENGL" = "yes"; then
@@ -33870,20 +33892,24 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        ;;
  
        *-*-darwin* )
        ;;
  
        *-*-darwin* )
-        install_name_tool=`which install_name_tool`
+        install_name_tool=`which ${HOST_PREFIX}install_name_tool`
          if test "$install_name_tool" -a -x "$install_name_tool"; then
          if test "$install_name_tool" -a -x "$install_name_tool"; then
-            SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+            DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
  libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
              cat <<EOF >change-install-names
  #!/bin/sh
  libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
-inst_cmd="install_name_tool "
  for i in \${libnames} ; do
  for i in \${libnames} ; do
-    inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+    ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
+    for dep in \${libnames} ; do
+        ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
+    done
  done
  done
-\${inst_cmd} \${3}
  EOF
              chmod +x change-install-names
  EOF
              chmod +x change-install-names
+            DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
          fi
          fi
+
+                                        HEADER_PAD_OPTION="-headerpad_max_install_names"
        ;;
  
        *-*-cygwin* | *-*-mingw32* )
        ;;
  
        *-*-cygwin* | *-*-mingw32* )
@@ -33901,7 +33927,7 @@ EOF
  
      if test $wxUSE_RPATH = "no"; then
          SAMPLES_RPATH_FLAG=''
  
      if test $wxUSE_RPATH = "no"; then
          SAMPLES_RPATH_FLAG=''
-        SAMPLES_RPATH_POSTLINK=''
+        DYLIB_PATH_POSTLINK=''
          WXCONFIG_RPATH=''
      fi
  
          WXCONFIG_RPATH=''
      fi
  
@@ -33943,17 +33969,16 @@ fi
  
  WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
  
  
  WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
  
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
  
  
-TOOLCHAIN_FULLNAME="${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}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
  
  
-if test "$cross_compiling" = "yes"; then
-    HOST_SUFFIX="-$host_alias"
-    TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX"
-    TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME"
-fi
  
  
-WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+else
+    WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+fi
  if test "${TOOLKIT_DIR}" = "os2"; then
      WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
  else
  if test "${TOOLKIT_DIR}" = "os2"; then
      WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
  else
@@ -34939,7 +34964,11 @@ _ACEOF
      fi
  
  
      fi
  
  
-for ac_func in wcsdup
+
+
+
+
+for ac_func in wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -40221,7 +40250,7 @@ if test "${wx_cv_cc___thread+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
    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
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
@@ -40232,8 +40261,8 @@ int
  main ()
  {
  
  main ()
  {
  
-                  static __thread int n = 0;
-                  static __thread int *p = 0;
+                      static __thread int n = 0;
+                      static __thread int *p = 0;
  
    ;
    return 0;
  
    ;
    return 0;
@@ -40267,11 +40296,129 @@ fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+
  fi
  { echo "$as_me:$LINENO: result: $wx_cv_cc___thread" >&5
  echo "${ECHO_T}$wx_cv_cc___thread" >&6; }
  
        if test "$wx_cv_cc___thread" = "yes"; then
  fi
  { echo "$as_me:$LINENO: result: $wx_cv_cc___thread" >&5
  echo "${ECHO_T}$wx_cv_cc___thread" >&6; }
  
        if test "$wx_cv_cc___thread" = "yes"; then
+
+  GXX_VERSION=""
+
+
+
+  { echo "$as_me:$LINENO: checking if gcc accepts -dumpversion option" >&5
+echo $ECHO_N "checking if gcc accepts -dumpversion option... $ECHO_C" >&6; }
+
+  if  test "x$GCC" = "xyes" ; then
+
+    if  test -z "" ; then
+
+      ax_gcc_option_test="int main()
+{
+       return 0;
+}"
+
+else
+
+      ax_gcc_option_test=""
+
+fi
+
+
+    # Dump the test program to file
+    cat <<EOF > conftest.c
+$ax_gcc_option_test
+EOF
+
+    # Dump back the file to the log, useful for debugging purposes
+    { ac_try='cat conftest.c 1>&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }
+
+    if  { ac_try='$CC  -dumpversion -c conftest.c 1>&5'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } ; then
+
+               { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+    ax_gcc_version_option=yes
+
+
+else
+
+               { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+    ax_gcc_version_option=no
+
+
+fi
+
+
+else
+
+    { echo "$as_me:$LINENO: result: no gcc available" >&5
+echo "${ECHO_T}no gcc available" >&6; }
+
+fi
+
+
+  if test "x$GXX" = "xyes"; then
+
+    if test "x$ax_gxx_version_option" != "no"; then
+
+      { echo "$as_me:$LINENO: checking gxx version" >&5
+echo $ECHO_N "checking gxx version... $ECHO_C" >&6; }
+if test "${ax_cv_gxx_version+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+        ax_cv_gxx_version="`$CXX -dumpversion`"
+        if test "x$ax_cv_gxx_version" = "x"; then
+
+          ax_cv_gxx_version=""
+
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ax_cv_gxx_version" >&5
+echo "${ECHO_T}$ax_cv_gxx_version" >&6; }
+      GXX_VERSION=$ax_cv_gxx_version
+
+fi
+
+
+fi
+
+
+
+          if test -n "$ax_cv_gxx_version"; then
+                                                                                                                              { echo "$as_me:$LINENO: checking whether __thread support in g++ is usable" >&5
+echo $ECHO_N "checking whether __thread support in g++ is usable... $ECHO_C" >&6; }
+              case "$ax_cv_gxx_version" in
+                1.* | 2.* | 3.* )
+                    { echo "$as_me:$LINENO: result: no, it's broken" >&5
+echo "${ECHO_T}no, it's broken" >&6; }
+                    wx_cv_cc___thread=no
+                    ;;
+                *)
+                    { echo "$as_me:$LINENO: result: yes, it works" >&5
+echo "${ECHO_T}yes, it works" >&6; }
+                    ;;
+              esac
+          fi
+      fi
+
+      if test "$wx_cv_cc___thread" = "yes"; then
          cat >>confdefs.h <<\_ACEOF
  #define HAVE___THREAD_KEYWORD 1
  _ACEOF
          cat >>confdefs.h <<\_ACEOF
  #define HAVE___THREAD_KEYWORD 1
  _ACEOF
@@ -41273,7 +41420,10 @@ _ACEOF
  fi
  
  DEBUG_CFLAGS=
  fi
  
  DEBUG_CFLAGS=
-if test "$wxUSE_DEBUG_INFO" = "yes" ; then
+if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then
+                    { echo "$as_me:$LINENO: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&5
+echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&2;}
+elif test "$wxUSE_DEBUG_INFO" = "yes" ; then
      DEBUG_CFLAGS="-g"
  fi
  
      DEBUG_CFLAGS="-g"
  fi
  
@@ -41345,22 +41495,27 @@ if test "$GCC" = "yes" ; then
  fi
  
  OPTIMISE_CFLAGS=
  fi
  
  OPTIMISE_CFLAGS=
-if test "$wxUSE_OPTIMISE" = "no" ; then
-    if test "$GCC" = yes ; then
-                        OPTIMISE_CFLAGS="-O0"
-    fi
+if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then
+                    { echo "$as_me:$LINENO: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&5
+echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&2;}
  else
  else
-    if test "$GCC" = yes ; then
-        case "${host}" in
-            *-pc-os2_emx | *-pc-os2-emx )
-                                                OPTIMISE_CFLAGS="-O2"
-            ;;
-            *)
-                                                                OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
-            ;;
-        esac
+    if test "$wxUSE_OPTIMISE" = "no" ; then
+        if test "$GCC" = yes ; then
+                                    OPTIMISE_CFLAGS="-O0"
+        fi
      else
      else
-        OPTIMISE_CFLAGS="-O"
+        if test "$GCC" = yes ; then
+            case "${host}" in
+                *-pc-os2_emx | *-pc-os2-emx )
+                                                            OPTIMISE_CFLAGS="-O2"
+                ;;
+                *)
+                                                                                OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
+                ;;
+            esac
+        else
+            OPTIMISE_CFLAGS="-O"
+        fi
      fi
  fi
  
      fi
  fi
  
@@ -43204,7 +43359,7 @@ _ACEOF
    fi
  fi
  
    fi
  fi
  
-if test "$wxUSE_XLOCALE" == "yes" ; then
+if test "$wxUSE_XLOCALE" = "yes" ; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_XLOCALE 1
  _ACEOF
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_XLOCALE 1
  _ACEOF
@@ -43651,239 +43806,6 @@ _ACEOF
  fi
  
  if test "$wxUSE_DATETIME" = "yes"; then
  fi
  
  if test "$wxUSE_DATETIME" = "yes"; then
-        { echo "$as_me:$LINENO: checking for strptime" >&5
-echo $ECHO_N "checking for strptime... $ECHO_C" >&6; }
-if test "${ac_cv_func_strptime+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.  */
-/* Define strptime to an innocuous variant, in case <limits.h> declares strptime.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define strptime innocuous_strptime
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strptime (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef strptime
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strptime ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_strptime || defined __stub___strptime
-choke me
-#endif
-
-int
-main ()
-{
-return strptime ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-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_link") 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_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_strptime=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_func_strptime=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5
-echo "${ECHO_T}$ac_cv_func_strptime" >&6; }
-
-    if test "$ac_cv_func_strptime" = "yes"; then
-        { echo "$as_me:$LINENO: checking for strptime declaration" >&5
-echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6; }
-if test "${wx_cv_func_strptime_decl+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 <time.h>
-
-int
-main ()
-{
-
-                        struct tm t;
-                        strptime("foo", "bar", &t);
-
-  ;
-  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_func_strptime_decl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       wx_cv_func_strptime_decl=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_func_strptime_decl" >&5
-echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6; }
-    fi
-    if test "$wx_cv_func_strptime_decl" = "yes"; then
-        cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRPTIME_DECL 1
-_ACEOF
-
-    else
-        wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
-    fi
-    if test "$ac_cv_func_strptime" = "yes"; then
-                                        { echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5
-echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6; }
-if test "${wx_cv_func_strptime_ok+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-                  wx_cv_func_strptime_ok=no
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-
-                    #include <stdlib.h>
-                    #include <time.h>
-                    #include "confdefs.h"
-
-                    $wx_strptime_decl
-
-                    int main()
-                    {
-                        struct tm t;
-                        return !!strptime("", "%x", &t);
-                    }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-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_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (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_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  wx_cv_func_strptime_ok=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-wx_cv_func_strptime_ok=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5
-echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; }
-
-        if test "$wx_cv_func_strptime_ok" = "yes"; then
-            cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRPTIME 1
-_ACEOF
-
-        fi
-    fi
-
              { echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
  echo $ECHO_N "checking for timezone variable in <time.h>... $ECHO_C" >&6; }
  if test "${wx_cv_var_timezone+set}" = set; then
              { echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
  echo $ECHO_N "checking for timezone variable in <time.h>... $ECHO_C" >&6; }
  if test "${wx_cv_var_timezone+set}" = set; then
@@ -45252,15 +45174,10 @@ echo "$as_me: WARNING: Cannot use wxHTML-based help without wxHTML so it won't b
  fi
  
  if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
  fi
  
  if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-        { echo "$as_me:$LINENO: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&5
-echo "$as_me: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&2;}
-    else
-        cat >>confdefs.h <<\_ACEOF
+    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_PRINTING_ARCHITECTURE 1
  _ACEOF
  
  #define wxUSE_PRINTING_ARCHITECTURE 1
  _ACEOF
  
-    fi
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
  fi
  
@@ -45518,6 +45435,10 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" -o "$wxUSE_CLIPBOARD" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
  fi
  
+if test "$wxUSE_CLIPBOARD" = "yes"; then
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS clipboard"
+fi
+
  if test "$wxUSE_SPLINES" = "yes" ; then
    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_SPLINES 1
  if test "$wxUSE_SPLINES" = "yes" ; then
    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_SPLINES 1
@@ -45732,6 +45653,14 @@ _ACEOF
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
  fi
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
  fi
  
+if test "$wxUSE_HEADERCTRL" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_HEADERCTRL 1
+_ACEOF
+
+  USES_CONTROLS=1
+fi
+
  if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_HYPERLINKCTRL 1
  if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_HYPERLINKCTRL 1
@@ -45800,7 +45729,6 @@ if test "$wxUSE_EDITABLELISTBOX" = "yes"; then
  _ACEOF
  
      USES_CONTROLS=1
  _ACEOF
  
      USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox"
  fi
  
  if test "$wxUSE_NOTEBOOK" = "yes"; then
  fi
  
  if test "$wxUSE_NOTEBOOK" = "yes"; then
@@ -45844,6 +45772,13 @@ _ACEOF
      USES_CONTROLS=1
  fi
  
      USES_CONTROLS=1
  fi
  
+if test "$wxUSE_REARRANGECTRL" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_REARRANGECTRL 1
+_ACEOF
+
+fi
+
  if test "$wxUSE_SASH" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_SASH 1
  if test "$wxUSE_SASH" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_SASH 1
@@ -45858,7 +45793,7 @@ if test "$wxUSE_SCROLLBAR" = "yes"; then
  _ACEOF
  
      USES_CONTROLS=1
  _ACEOF
  
      USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll"
  fi
  
  if test "$wxUSE_SEARCHCTRL" = "yes"; then
  fi
  
  if test "$wxUSE_SEARCHCTRL" = "yes"; then
@@ -45947,13 +45882,6 @@ _ACEOF
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
  fi
  
-if test "$wxUSE_TAB_DIALOG" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TAB_DIALOG 1
-_ACEOF
-
-fi
-
  if test "$wxUSE_TEXTCTRL" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_TEXTCTRL 1
  if test "$wxUSE_TEXTCTRL" = "yes"; then
      cat >>confdefs.h <<\_ACEOF
  #define wxUSE_TEXTCTRL 1
@@ -46481,15 +46409,10 @@ _ACEOF
  fi
  
  if test "$wxUSE_PROGRESSDLG" = "yes"; then
  fi
  
  if test "$wxUSE_PROGRESSDLG" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       { echo "$as_me:$LINENO: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&5
-echo "$as_me: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&2;}
-    else
-        cat >>confdefs.h <<\_ACEOF
+    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_PROGRESSDLG 1
  _ACEOF
  
  #define wxUSE_PROGRESSDLG 1
  _ACEOF
  
-    fi
  fi
  
  if test "$wxUSE_SPLASH" = "yes"; then
  fi
  
  if test "$wxUSE_SPLASH" = "yes"; then
@@ -46501,15 +46424,10 @@ _ACEOF
  fi
  
  if test "$wxUSE_STARTUP_TIPS" = "yes"; then
  fi
  
  if test "$wxUSE_STARTUP_TIPS" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       { echo "$as_me:$LINENO: WARNING: Startup tips requires constraints and won't be compiled without them" >&5
-echo "$as_me: WARNING: Startup tips requires constraints and won't be compiled without them" >&2;}
-    else
-        cat >>confdefs.h <<\_ACEOF
+    cat >>confdefs.h <<\_ACEOF
  #define wxUSE_STARTUP_TIPS 1
  _ACEOF
  
  #define wxUSE_STARTUP_TIPS 1
  _ACEOF
  
-    fi
  fi
  
  if test "$wxUSE_TEXTDLG" = "yes"; then
  fi
  
  if test "$wxUSE_TEXTDLG" = "yes"; then
@@ -46692,7 +46610,7 @@ fi
  
  USE_MEDIA=0
  
  
  USE_MEDIA=0
  
-if test "$wxUSE_MEDIACTRL" = "yes"; then
+if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
      USE_MEDIA=1
  
                  if test "$wxUSE_GTK" = 1; then
      USE_MEDIA=1
  
                  if test "$wxUSE_GTK" = 1; then
@@ -46888,11 +46806,20 @@ _ACEOF
  #define wxUSE_MEDIACTRL 1
  _ACEOF
  
  #define wxUSE_MEDIACTRL 1
  _ACEOF
  
+    else
+        if test "$wxUSE_MEDIACTRL" = "yes"; then
+            { { echo "$as_me:$LINENO: error: GStreamer not available" >&5
+echo "$as_me: error: GStreamer not available" >&2;}
+   { (exit 1); exit 1; }; }
+        else
+                        { echo "$as_me:$LINENO: WARNING: GStreamer not available... disabling wxMediaCtrl" >&5
+echo "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2;}
+        fi
      fi
  fi
  
  
      fi
  fi
  
  
-if test "$cross_compiling" = "yes"; then
+if test "$cross_compiling" != "no"; then
          OSINFO="\"$host\""
  else
          OSINFO=`uname -s -r -m`
          OSINFO="\"$host\""
  else
          OSINFO=`uname -s -r -m`
@@ -46956,6 +46883,9 @@ if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_PROPGRID" = "yes" ; then
          BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
      fi
      if test "$wxUSE_PROPGRID" = "yes" ; then
          BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
      fi
+    if test "$wxUSE_RICHTEXT" = "yes" ; then
+        BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
+    fi
      if test "$wxUSE_STC" = "yes" ; then
          BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
      fi
      if test "$wxUSE_STC" = "yes" ; then
          BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
      fi
@@ -46998,9 +46928,8 @@ if test "$wxUSE_GUI" = "yes"; then
  
  
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
  
  
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
-                     erase event exec font image minimal mobile \
-                     mobile/wxedit mobile/styles render \
-                     shaped svg taborder vscroll widgets"
+                     erase event exec font image minimal render \
+                     shaped svg taborder vscroll widgets wrapsizer"
  
      if test "$wxUSE_MONOLITHIC" != "yes"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
  
      if test "$wxUSE_MONOLITHIC" != "yes"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
@@ -47026,15 +46955,104 @@ fi
  
  
  if test "x$INTELCC" = "xyes" ; then
  
  
  if test "x$INTELCC" = "xyes" ; then
-                                        CWARNINGS="-Wall -wd810,869,981,1418,1572,1684"
+                                        CWARNINGS="-Wall -wd810,869,981,1418,1572,1684,2259"
  elif test "$GCC" = yes ; then
      CWARNINGS="-Wall -Wundef"
  fi
  
  if test "x$INTELCXX" = "xyes" ; then
  elif test "$GCC" = yes ; then
      CWARNINGS="-Wall -Wundef"
  fi
  
  if test "x$INTELCXX" = "xyes" ; then
-                                                            CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
+                                                                CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419,1881,2259"
  elif test "$GXX" = yes ; then
  elif test "$GXX" = yes ; then
-        CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
+    CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
+    { echo "$as_me:$LINENO: checking CXXWARNINGS for gcc -Woverloaded-virtual" >&5
+echo $ECHO_N "checking CXXWARNINGS for gcc -Woverloaded-virtual... $ECHO_C" >&6; }
+if test "${ac_cv_cxxflags_gcc_option__Woverloaded_virtual+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_cxxflags_gcc_option__Woverloaded_virtual="no, unknown"
+
+ 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
+
+ ac_save_CXXFLAGS="$CXXFLAGS"
+for ac_arg in "-pedantic -Werror % -Woverloaded-virtual"     "-pedantic % -Woverloaded-virtual %% no, obsolete"     #
+do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+   cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+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_cxxflags_gcc_option__Woverloaded_virtual=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ 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: $ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&5
+echo "${ECHO_T}$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&6; }
+case ".$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" in
+     .ok|.ok,*)  ;;
+   .|.no|.no,*)  ;;
+   *)
+   if echo " $CXXWARNINGS " | grep " $ac_cv_cxxflags_gcc_option__Woverloaded_virtual " 2>&1 >/dev/null
+   then { (echo "$as_me:$LINENO: : CXXWARNINGS does contain \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual") >&5
+  (: CXXWARNINGS does contain $ac_cv_cxxflags_gcc_option__Woverloaded_virtual) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+   else { (echo "$as_me:$LINENO: : CXXWARNINGS=\"\$CXXWARNINGS \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual\"") >&5
+  (: CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+                      CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual"
+   fi
+ ;;
+esac
+
  fi
  
  
  fi
  
  
@@ -47185,9 +47203,17 @@ fi
  
  
  
  
  
  
+TOOLKIT_LOWERCASE=xxx
  if test "$TOOLKIT" = "MAC"; then
  if test "$TOOLKIT" = "MAC"; then
-    TOOLKIT_LOWERCASE=osx
-else
+    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]'`
  fi
  
@@ -47198,6 +47224,8 @@ fi
  
  
  
  
  
  
+
+
  case "$TOOLKIT" in
      GTK)
          TOOLKIT_DESC="GTK+"
  case "$TOOLKIT" in
      GTK)
          TOOLKIT_DESC="GTK+"
@@ -47929,7 +47957,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
                  PLATFORM_BEOS=1
              ;;
              * )
                  PLATFORM_BEOS=1
              ;;
              * )
-                                           ;;
+                                            ;;
          esac
      fi
  
          esac
      fi
  
@@ -47991,6 +48019,8 @@ fi
      dlldir="$libdir"
  
      case "${BAKEFILE_HOST}" in
      dlldir="$libdir"
  
      case "${BAKEFILE_HOST}" in
+                        ia64-hp-hpux* )
+        ;;
          *-hp-hpux* )
              SO_SUFFIX="sl"
              SO_SUFFIX_MODULE="sl"
          *-hp-hpux* )
              SO_SUFFIX="sl"
              SO_SUFFIX_MODULE="sl"
@@ -48072,7 +48102,7 @@ fi
        ;;
  
        *-*-linux* )
        ;;
  
        *-*-linux* )
-        if test "$INTELCC" = "yes"; then
+                        if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then
              PIC_FLAG="-KPIC"
          elif test "x$SUNCXX" = "xyes"; then
              SHARED_LD_CC="${CC} -G -o"
              PIC_FLAG="-KPIC"
          elif test "x$SUNCXX" = "xyes"; then
              SHARED_LD_CC="${CC} -G -o"
@@ -48993,10 +49023,8 @@ cat <<EOF >bk-deps
  # Permission is given to use this file in any way.
  
  DEPSMODE=${DEPSMODE}
  # Permission is given to use this file in any way.
  
  DEPSMODE=${DEPSMODE}
-DEPSDIR=.deps
  DEPSFLAG="${DEPSFLAG}"
  DEPSFLAG="${DEPSFLAG}"
-
-mkdir -p ${D}DEPSDIR
+DEPSDIRBASE=.deps
  
  if test ${D}DEPSMODE = gcc ; then
      ${D}* ${D}{DEPSFLAG}
  
  if test ${D}DEPSMODE = gcc ; then
      ${D}* ${D}{DEPSFLAG}
@@ -49017,8 +49045,12 @@ if test ${D}DEPSMODE = gcc ; then
          esac
          shift
      done
          esac
          shift
      done
+    objfilebase=\`basename ${D}objfile\`
+    builddir=\`dirname ${D}objfile\`
      depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
      depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
      depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
      depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
+    depsdir=${D}builddir/${D}DEPSDIRBASE
+    mkdir -p ${D}depsdir
  
      # if the compiler failed, we're done:
      if test ${D}{status} != 0 ; then
  
      # if the compiler failed, we're done:
      if test ${D}{status} != 0 ; then
@@ -49028,21 +49060,22 @@ if test ${D}DEPSMODE = gcc ; then
  
      # move created file to the location we want it in:
      if test -f ${D}depfile ; then
  
      # move created file to the location we want it in:
      if test -f ${D}depfile ; then
-        sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+        sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
          rm -f ${D}depfile
      else
          # "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
          rm -f ${D}depfile
      else
          # "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
-        depfile=\`basename ${D}objfile | sed -e 's/\\..*${D}/.d/g'\`
+        depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\`
          if test ! -f ${D}depfile ; then
              # "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
              depfile="${D}objfile.d"
          fi
          if test -f ${D}depfile ; then
          if test ! -f ${D}depfile ; then
              # "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
              depfile="${D}objfile.d"
          fi
          if test -f ${D}depfile ; then
-            sed -e "/^${D}objfile/!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+            sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
              rm -f ${D}depfile
          fi
      fi
      exit 0
              rm -f ${D}depfile
          fi
      fi
      exit 0
+
  elif test ${D}DEPSMODE = mwcc ; then
      ${D}* || exit ${D}?
      # Run mwcc again with -MM and redirect into the dep file we want
  elif test ${D}DEPSMODE = mwcc ; then
      ${D}* || exit ${D}?
      # Run mwcc again with -MM and redirect into the dep file we want
@@ -49062,8 +49095,15 @@ elif test ${D}DEPSMODE = mwcc ; then
          fi
          prevarg="${D}arg"
      done
          fi
          prevarg="${D}arg"
      done
-    ${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.d
+
+    objfilebase=\`basename ${D}objfile\`
+    builddir=\`dirname ${D}objfile\`
+    depsdir=${D}builddir/${D}DEPSDIRBASE
+    mkdir -p ${D}depsdir
+
+    ${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d
      exit 0
      exit 0
+
  elif test ${D}DEPSMODE = unixcc; then
      ${D}* || exit ${D}?
      # Run compiler again with deps flag and redirect into the dep file.
  elif test ${D}DEPSMODE = unixcc; then
      ${D}* || exit ${D}?
      # Run compiler again with deps flag and redirect into the dep file.
@@ -49084,8 +49124,15 @@ elif test ${D}DEPSMODE = unixcc; then
          esac
          shift
      done
          esac
          shift
      done
-    eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d
+
+    objfilebase=\`basename ${D}objfile\`
+    builddir=\`dirname ${D}objfile\`
+    depsdir=${D}builddir/${D}DEPSDIRBASE
+    mkdir -p ${D}depsdir
+
+    eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{depsdir}/${D}{objfilebase}.d
      exit 0
      exit 0
+
  else
      ${D}*
      exit ${D}?
  else
      ${D}*
      exit ${D}?
@@ -49286,10 +49333,13 @@ fi
  
  
  
  
  
  
-    BAKEFILE_BAKEFILE_M4_VERSION="0.2.3"
  
  
  
  
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3"
+
+    BAKEFILE_BAKEFILE_M4_VERSION="0.2.5"
+
+
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.5"
  
  
  
  
  
  
@@ -49369,59 +49419,21 @@ else
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-                    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-                            #if !defined(__INTEL_COMPILER) || \
-                                (__INTEL_COMPILER < 800)
-                                There is no PCH support
-                            #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
-
-                            { echo "$as_me:$LINENO: result: yes" >&5
+                    if test "$INTELCXX8" = "yes"; then
+                        { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
  echo "${ECHO_T}yes" >&6; }
-                            ICC_PCH=1
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                            { echo "$as_me:$LINENO: result: no" >&5
+                        ICC_PCH=1
+                        if test "$INTELCXX10" = "yes"; then
+                            ICC_PCH_CREATE_SWITCH="-pch-create"
+                            ICC_PCH_USE_SWITCH="-pch-use"
+                        else
+                            ICC_PCH_CREATE_SWITCH="-create-pch"
+                            ICC_PCH_USE_SWITCH="-use-pch"
+                        fi
+                    else
+                        { echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6; }
  echo "${ECHO_T}no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+                    fi
  
  fi
  
  
  fi
  
@@ -49443,6 +49455,8 @@ header="${D}{2}"
  shift
  shift
  
  shift
  shift
  
+builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\`
+
  compiler=""
  headerfile=""
  
  compiler=""
  headerfile=""
  
@@ -49455,7 +49469,7 @@ while test ${D}{#} -gt 0; do
                  headerfile="${D}{incdir}/${D}{header}"
              fi
          ;;
                  headerfile="${D}{incdir}/${D}{header}"
              fi
          ;;
-        -use-pch|-use_pch )
+        -use-pch|-use_pch|-pch-use )
              shift
              add_to_cmdline=0
          ;;
              shift
              add_to_cmdline=0
          ;;
@@ -49474,8 +49488,8 @@ else
      else
          mkdir -p \`dirname ${D}{outfile}\`
      fi
      else
          mkdir -p \`dirname ${D}{outfile}\`
      fi
-    depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
-    mkdir -p .deps
+    depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
+    mkdir -p ${D}{builddir}/.deps
      if test "x${GCC_PCH}" = "x1" ; then
          # can do this because gcc is >= 3.4:
          ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
      if test "x${GCC_PCH}" = "x1" ; then
          # can do this because gcc is >= 3.4:
          ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
@@ -49487,7 +49501,7 @@ else
  #include "${D}header"
  EOT
          # using -MF icc complains about differing command lines in creation/use
  #include "${D}header"
  EOT
          # using -MF icc complains about differing command lines in creation/use
-        ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\
+        ${D}compiler -c ${ICC_PCH_CREATE_SWITCH} ${D}outfile -MMD ${D}file && \\
            sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
            rm -f ${D}file ${D}dfile ${D}{filename}.o
      fi
            sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
            rm -f ${D}file ${D}dfile ${D}{filename}.o
      fi
@@ -49505,6 +49519,8 @@ EOF
  
  
  
  
  
  
+
+
      COND_BUILD_DEBUG="#"
      if test "x$BUILD" = "xdebug" ; then
          COND_BUILD_DEBUG=""
      COND_BUILD_DEBUG="#"
      if test "x$BUILD" = "xdebug" ; then
          COND_BUILD_DEBUG=""
@@ -49550,6 +49566,51 @@ EOF
          COND_BUILD_RELEASE_UNICODE_1=""
      fi
  
          COND_BUILD_RELEASE_UNICODE_1=""
      fi
  
+    COND_BUILD_debug="#"
+    if test "x$BUILD" = "xdebug" ; then
+        COND_BUILD_debug=""
+    fi
+
+    COND_BUILD_debug_DEBUG_FLAG_default="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+        COND_BUILD_debug_DEBUG_FLAG_default=""
+    fi
+
+    COND_BUILD_debug_DEBUG_INFO_default="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_debug_DEBUG_INFO_default=""
+    fi
+
+    COND_BUILD_debug_UNICODE_0="#"
+    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
+        COND_BUILD_debug_UNICODE_0=""
+    fi
+
+    COND_BUILD_debug_UNICODE_1="#"
+    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
+        COND_BUILD_debug_UNICODE_1=""
+    fi
+
+    COND_BUILD_release="#"
+    if test "x$BUILD" = "xrelease" ; then
+        COND_BUILD_release=""
+    fi
+
+    COND_BUILD_release_DEBUG_INFO_default="#"
+    if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_release_DEBUG_INFO_default=""
+    fi
+
+    COND_BUILD_release_UNICODE_0="#"
+    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
+        COND_BUILD_release_UNICODE_0=""
+    fi
+
+    COND_BUILD_release_UNICODE_1="#"
+    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
+        COND_BUILD_release_UNICODE_1=""
+    fi
+
      COND_DEBUG_FLAG_1="#"
      if test "x$DEBUG_FLAG" = "x1" ; then
          COND_DEBUG_FLAG_1=""
      COND_DEBUG_FLAG_1="#"
      if test "x$DEBUG_FLAG" = "x1" ; then
          COND_DEBUG_FLAG_1=""
@@ -49915,19 +49976,19 @@ EOF
          COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
      fi
  
          COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
      fi
  
-    COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+    COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+        COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
      fi
  
      fi
  
-    COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+    COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+        COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin=""
      fi
  
      fi
  
-    COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+    COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+        COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
      fi
  
      COND_SHARED_0_USE_STC_1="#"
      fi
  
      COND_SHARED_0_USE_STC_1="#"
@@ -49935,19 +49996,19 @@ EOF
          COND_SHARED_0_USE_STC_1=""
      fi
  
          COND_SHARED_0_USE_STC_1=""
      fi
  
-    COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
+    COND_SHARED_0_wxUSE_EXPAT_builtin="#"
      if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
+        COND_SHARED_0_wxUSE_EXPAT_builtin=""
      fi
  
      fi
  
-    COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
+    COND_SHARED_0_wxUSE_REGEX_builtin="#"
      if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
+        COND_SHARED_0_wxUSE_REGEX_builtin=""
      fi
  
      fi
  
-    COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#"
+    COND_SHARED_0_wxUSE_ZLIB_builtin="#"
      if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
      if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
+        COND_SHARED_0_wxUSE_ZLIB_builtin=""
      fi
  
      COND_SHARED_1="#"
      fi
  
      COND_SHARED_1="#"
@@ -50015,11 +50076,6 @@ EOF
          COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
      fi
  
          COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
      fi
  
-    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
-    fi
-
      COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
      if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
          COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
      COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
      if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
          COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
@@ -50220,6 +50276,21 @@ EOF
          COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
      fi
  
          COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
      fi
  
+    COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
+    fi
+
+    COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
+    fi
+
+    COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
+    fi
+
      COND_USE_OPENGL_1="#"
      if test "x$USE_OPENGL" = "x1" ; then
          COND_USE_OPENGL_1=""
      COND_USE_OPENGL_1="#"
      if test "x$USE_OPENGL" = "x1" ; then
          COND_USE_OPENGL_1=""
@@ -50340,6 +50411,36 @@ EOF
          COND_WXUSE_ZLIB_BUILTIN=""
      fi
  
          COND_WXUSE_ZLIB_BUILTIN=""
      fi
  
+    COND_wxUSE_EXPAT_builtin="#"
+    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+        COND_wxUSE_EXPAT_builtin=""
+    fi
+
+    COND_wxUSE_LIBJPEG_builtin="#"
+    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_wxUSE_LIBJPEG_builtin=""
+    fi
+
+    COND_wxUSE_LIBPNG_builtin="#"
+    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_wxUSE_LIBPNG_builtin=""
+    fi
+
+    COND_wxUSE_LIBTIFF_builtin="#"
+    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_wxUSE_LIBTIFF_builtin=""
+    fi
+
+    COND_wxUSE_REGEX_builtin="#"
+    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+        COND_wxUSE_REGEX_builtin=""
+    fi
+
+    COND_wxUSE_ZLIB_builtin="#"
+    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+        COND_wxUSE_ZLIB_builtin=""
+    fi
+
  
  
      if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
  
  
      if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
@@ -50519,6 +50620,8 @@ esac
  
  CFLAGS="$CFLAGS $CFLAGS_VISIBILITY"
  CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
  
  CFLAGS="$CFLAGS $CFLAGS_VISIBILITY"
  CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+OBJCFLAGS="$OBJCFLAGS $CFLAGS_VISIBILITY"
+OBJCXXFLAGS="$OBJCXXFLAGS $CXXFLAGS_VISIBILITY"
  
  SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
  
  
  SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
  
@@ -51513,10 +51616,6 @@ host!$host$ac_delim
  host_cpu!$host_cpu$ac_delim
  host_vendor!$host_vendor$ac_delim
  host_os!$host_os$ac_delim
  host_cpu!$host_cpu$ac_delim
  host_vendor!$host_vendor$ac_delim
  host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
  wx_top_builddir!$wx_top_builddir$ac_delim
  CC!$CC$ac_delim
  CFLAGS!$CFLAGS$ac_delim
  wx_top_builddir!$wx_top_builddir$ac_delim
  CC!$CC$ac_delim
  CFLAGS!$CFLAGS$ac_delim
@@ -51553,6 +51652,7 @@ PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim
  CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim
  CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim
  LIBICONV!$LIBICONV$ac_delim
  CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim
  CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim
  LIBICONV!$LIBICONV$ac_delim
+GXX_VERSION!$GXX_VERSION$ac_delim
  SDL_CONFIG!$SDL_CONFIG$ac_delim
  SDL_CFLAGS!$SDL_CFLAGS$ac_delim
  SDL_LIBS!$SDL_LIBS$ac_delim
  SDL_CONFIG!$SDL_CONFIG$ac_delim
  SDL_CFLAGS!$SDL_CFLAGS$ac_delim
  SDL_LIBS!$SDL_LIBS$ac_delim
@@ -51565,6 +51665,9 @@ GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
  HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
  HILDON_LIBS!$HILDON_LIBS$ac_delim
  CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
  HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
  HILDON_LIBS!$HILDON_LIBS$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
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -51606,9 +51709,6 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
-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
  BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim
  STD_BASE_LIBS!$STD_BASE_LIBS$ac_delim
  ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim
  BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim
  STD_BASE_LIBS!$STD_BASE_LIBS$ac_delim
@@ -51646,8 +51746,10 @@ DEBUG_INFO!$DEBUG_INFO$ac_delim
  DEBUG_FLAG!$DEBUG_FLAG$ac_delim
  TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
  TOOLKIT_VERSION!$TOOLKIT_VERSION$ac_delim
  DEBUG_FLAG!$DEBUG_FLAG$ac_delim
  TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
  TOOLKIT_VERSION!$TOOLKIT_VERSION$ac_delim
+DYLIB_RPATH_INSTALL!$DYLIB_RPATH_INSTALL$ac_delim
+DYLIB_RPATH_POSTLINK!$DYLIB_RPATH_POSTLINK$ac_delim
  SAMPLES_RPATH_FLAG!$SAMPLES_RPATH_FLAG$ac_delim
  SAMPLES_RPATH_FLAG!$SAMPLES_RPATH_FLAG$ac_delim
-SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$ac_delim
+HEADER_PAD_OPTION!$HEADER_PAD_OPTION$ac_delim
  HOST_SUFFIX!$HOST_SUFFIX$ac_delim
  CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
  CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim
  HOST_SUFFIX!$HOST_SUFFIX$ac_delim
  CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
  CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim
@@ -51699,10 +51801,11 @@ BK_DEPS!$BK_DEPS$ac_delim
  WINDRES!$WINDRES$ac_delim
  REZ!$REZ$ac_delim
  SETFILE!$SETFILE$ac_delim
  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
  GCC_PCH!$GCC_PCH$ac_delim
  ICC_PCH!$ICC_PCH$ac_delim
-BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
-COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
+ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
+ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -51744,6 +51847,8 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
+COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
  COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
  COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
  COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
  COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
  COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
  COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
@@ -51752,6 +51857,15 @@ 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_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_BUILD_debug!$COND_BUILD_debug$ac_delim
+COND_BUILD_debug_DEBUG_FLAG_default!$COND_BUILD_debug_DEBUG_FLAG_default$ac_delim
+COND_BUILD_debug_DEBUG_INFO_default!$COND_BUILD_debug_DEBUG_INFO_default$ac_delim
+COND_BUILD_debug_UNICODE_0!$COND_BUILD_debug_UNICODE_0$ac_delim
+COND_BUILD_debug_UNICODE_1!$COND_BUILD_debug_UNICODE_1$ac_delim
+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_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
  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
@@ -51825,22 +51939,11 @@ 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_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_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_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
-COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim
-COND_SHARED_1!$COND_SHARED_1$ac_delim
-COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
-COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
-COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
+COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -51882,11 +51985,21 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
+COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim
+COND_SHARED_1!$COND_SHARED_1$ac_delim
+COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
+COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
+COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
+COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
  COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
  COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
@@ -51927,6 +52040,9 @@ COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim
  COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
  COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
  COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
  COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
  COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
  COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
  COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
  COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
  COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
  COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
  COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
  COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
@@ -51951,6 +52067,12 @@ 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
  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
+COND_wxUSE_EXPAT_builtin!$COND_wxUSE_EXPAT_builtin$ac_delim
+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
  DEREZ!$DEREZ$ac_delim
  SHARED!$SHARED$ac_delim
  WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
@@ -51960,25 +52082,6 @@ AFMINSTALL!$AFMINSTALL$ac_delim
  WIN32INSTALL!$WIN32INSTALL$ac_delim
  TOOLKIT!$TOOLKIT$ac_delim
  TOOLKIT_DIR!$TOOLKIT_DIR$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
-WIDGET_SET!$WIDGET_SET$ac_delim
-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_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
-WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
-GUIDIST!$GUIDIST$ac_delim
-DISTDIR!$DISTDIR$ac_delim
-SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -52020,6 +52123,25 @@ _ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
+TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
+TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
+cross_compiling!$cross_compiling$ac_delim
+WIDGET_SET!$WIDGET_SET$ac_delim
+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_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
+WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
+GUIDIST!$GUIDIST$ac_delim
+DISTDIR!$DISTDIR$ac_delim
+SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
  LDFLAGS_GL!$LDFLAGS_GL$ac_delim
  OPENGL_LIBS!$OPENGL_LIBS$ac_delim
  DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
  LDFLAGS_GL!$LDFLAGS_GL$ac_delim
  OPENGL_LIBS!$OPENGL_LIBS$ac_delim
  DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
@@ -52039,7 +52161,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5