updated version in configure to 2.7.0 too

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 62fb6033a3d36cf5a218433fd46f700d73a5a34d..c639a7a89feafd7caa9bd5c501858de6044b8403 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.59 for wxWidgets 2.6.2.
+# Generated by GNU Autoconf 2.59 for wxWidgets 2.7.0.

 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #


@@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'
 # Identity of this package.
 PACKAGE_NAME='wxWidgets'
 PACKAGE_TARNAME='wxwidgets'

-PACKAGE_VERSION='2.6.2'
-PACKAGE_STRING='wxWidgets 2.6.2'
+PACKAGE_VERSION='2.7.0'
+PACKAGE_STRING='wxWidgets 2.7.0'

 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
 
 ac_unique_file="wx-config.in"
 PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
 
 ac_unique_file="wx-config.in"


@@ -313,7 +313,7 @@ ac_includes_default="\
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all src/expat"
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all src/expat"

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP ac_ct_STRIP RESCOMP ac_ct_RESCOMP DLLTOOL ac_ct_DLLTOOL IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS GST_INSPECT CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WX_FLAVOUR WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GNOMEPRINT UNICODE BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH 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_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 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_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_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_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_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 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_ODBC_1 COND_USE_OPENGL_1 COND_USE_PLUGINS_0 COND_USE_RTTI_0 COND_USE_RTTI_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_THREADS_0 COND_USE_THREADS_1 COND_USE_XRC_1 COND_WINDOWS_IMPLIB_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_0 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_EXTRALIBS WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP ac_ct_STRIP RESCOMP ac_ct_RESCOMP DLLTOOL ac_ct_DLLTOOL IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS GST_INSPECT CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WX_FLAVOUR WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GNOMEPRINT UNICODE BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH 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_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 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_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_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_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_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 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_ODBC_1 COND_USE_OPENGL_1 COND_USE_PLUGINS_0 COND_USE_RTTI_0 COND_USE_RTTI_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_THREADS_0 COND_USE_THREADS_1 COND_USE_XRC_1 COND_WINDOWS_IMPLIB_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_0 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_EXTRALIBS WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.
 ac_subst_files=''
 
 # Initialize some variables set by options.


@@ -794,7 +794,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF

-\`configure' configures wxWidgets 2.6.2 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.7.0 to adapt to many kinds of systems.

 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 


@@ -860,7 +860,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in

-     short | recursive ) echo "Configuration of wxWidgets 2.6.2:";;
+     short | recursive ) echo "Configuration of wxWidgets 2.7.0:";;

    esac
   cat <<\_ACEOF
 
    esac
   cat <<\_ACEOF
 


@@ -1054,6 +1054,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)

+  --without-subdirs       don't generate makefiles for samples/demos/...

   --with-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"
   --with-motif            use Motif/Lesstif
   --with-mac              use Mac OS X
   --with-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"
   --with-motif            use Motif/Lesstif
   --with-mac              use Mac OS X


@@ -1198,7 +1199,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF

-wxWidgets configure 2.6.2
+wxWidgets configure 2.7.0

 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.


@@ -1212,7 +1213,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 

-It was created by wxWidgets $as_me 2.6.2, which was
+It was created by wxWidgets $as_me 2.7.0, which was

 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@


@@ -1662,9 +1663,9 @@ test -n "$target_alias" &&
 
 
 wx_major_version_number=2
 
 
 wx_major_version_number=2

-wx_minor_version_number=6
-wx_release_number=2
-wx_subrelease_number=1
+wx_minor_version_number=7
+wx_release_number=0
+wx_subrelease_number=0

 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number


@@ -2565,6 +2566,48 @@ echo "${ECHO_T}no" >&6
           fi
 
 
           fi
 
 

+         withstring=without
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-subdirs" >&5
+echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6
+          no_cache=0
+
+# Check whether --with-subdirs or --without-subdirs was given.
+if test "${with_subdirs+set}" = set; then
+  withval="$with_subdirs"
+
+                        if test "$withval" = yes; then
+                          ac_cv_use_subdirs='wxWITH_SUBDIRS=yes'
+                        else
+                          ac_cv_use_subdirs='wxWITH_SUBDIRS=no'
+                        fi
+
+else
+
+                        LINE=`grep "wxWITH_SUBDIRS" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_subdirs='wxWITH_SUBDIRS='$DEFAULT_wxWITH_SUBDIRS
+
+fi;
+
+          eval "$ac_cv_use_subdirs"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_subdirs >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxWITH_SUBDIRS" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+

 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then
 
 


@@ -2994,8 +3037,9 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or
           fi
 
 
           fi
 
 

-          echo "$as_me:$LINENO: checking for --with-libmspack" >&5
-echo $ECHO_N "checking for --with-libmspack... $ECHO_C" >&6
+         withstring=
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-libmspack" >&5
+echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6

           no_cache=0
 
 # Check whether --with-libmspack or --without-libmspack was given.
           no_cache=0
 
 # Check whether --with-libmspack or --without-libmspack was given.


@@ -3035,8 +3079,9 @@ echo "${ECHO_T}no" >&6
           fi
 
 
           fi
 
 

-          echo "$as_me:$LINENO: checking for --with-sdl" >&5
-echo $ECHO_N "checking for --with-sdl... $ECHO_C" >&6
+         withstring=
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5
+echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6

           no_cache=0
 
 # Check whether --with-sdl or --without-sdl was given.
           no_cache=0
 
 # Check whether --with-sdl or --without-sdl was given.


@@ -3076,8 +3121,9 @@ echo "${ECHO_T}no" >&6
           fi
 
 
           fi
 
 

-          echo "$as_me:$LINENO: checking for --with-gnomeprint" >&5
-echo $ECHO_N "checking for --with-gnomeprint... $ECHO_C" >&6
+         withstring=
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5
+echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6

           no_cache=0
 
 # Check whether --with-gnomeprint or --without-gnomeprint was given.
           no_cache=0
 
 # Check whether --with-gnomeprint or --without-gnomeprint was given.


@@ -3117,8 +3163,9 @@ echo "${ECHO_T}no" >&6
           fi
 
 
           fi
 
 

-          echo "$as_me:$LINENO: checking for --with-opengl" >&5
-echo $ECHO_N "checking for --with-opengl... $ECHO_C" >&6
+         withstring=
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5
+echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6

           no_cache=0
 
 # Check whether --with-opengl or --without-opengl was given.
           no_cache=0
 
 # Check whether --with-opengl or --without-opengl was given.


@@ -3161,8 +3208,9 @@ echo "${ECHO_T}no" >&6
 fi
 
 
 fi
 
 

-          echo "$as_me:$LINENO: checking for --with-dmalloc" >&5
-echo $ECHO_N "checking for --with-dmalloc... $ECHO_C" >&6
+         withstring=
+          echo "$as_me:$LINENO: checking for --${withstring:-with}-dmalloc" >&5
+echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6

           no_cache=0
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
           no_cache=0
 
 # Check whether --with-dmalloc or --without-dmalloc was given.


@@ -11644,7 +11692,88 @@ 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_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 if the C compiler requires -ext o" >&5
+
+
+    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 the Intel C compiler" >&5
+echo $ECHO_N "checking whether we are using the Intel C compiler... $ECHO_C" >&6
+if test "${bakefile_cv_c_compiler___INTEL_COMPILER+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
+                choke me
+             #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+  { (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); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (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
+  bakefile_cv_c_compiler___INTEL_COMPILER=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+bakefile_cv_c_compiler___INTEL_COMPILER=no
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6
+    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 "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
+        :; INTELCC=yes
+    else
+        :;
+    fi
+
+
+        if test "x$GCC" != "xyes"; then
+        echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5

 echo $ECHO_N "checking if the C compiler requires -ext o... $ECHO_C" >&6
 if test "${wx_cv_c_exto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if the C compiler requires -ext o... $ECHO_C" >&6
 if test "${wx_cv_c_exto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -11702,9 +11831,9 @@ if test "x$wx_cv_c_exto" '!=' "x"; then
     fi
 fi
 
     fi
 fi
 

-        if test "x$wx_cv_c_exto" '!=' "x"; then
-        unset ac_cv_prog_cc_g
-        ac_test_CFLAGS=${CFLAGS+set}
+                if test "x$wx_cv_c_exto" '!=' "x"; then
+            unset ac_cv_prog_cc_g
+            ac_test_CFLAGS=${CFLAGS+set}

 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
 echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
 echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5


@@ -11774,8 +11903,8 @@ else
     CFLAGS=
   fi
 fi
     CFLAGS=
   fi
 fi

-    fi
-    ac_ext=c
+        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_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'


@@ -11847,7 +11976,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 

-    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'


@@ -11921,6 +12050,86 @@ 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 the SGI C compiler" >&5
+echo $ECHO_N "checking whether we are using the SGI C compiler... $ECHO_C" >&6
+if test "${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+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 _SGI_COMPILER_VERSION
+                choke me
+             #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+  { (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); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (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
+  bakefile_cv_c_compiler__SGI_COMPILER_VERSION=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+bakefile_cv_c_compiler__SGI_COMPILER_VERSION=no
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6
+    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 "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
+        :; SGICC=yes
+    else
+        :;
+    fi
+
+
+
+

     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'


@@ -11999,6 +12208,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
     fi
 
 
     fi
 
 

+    fi

 
 
 ac_ext=c
 
 
 ac_ext=c


@@ -12665,7 +12875,88 @@ 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_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 if the C++ compiler requires -ext o" >&5
+
+
+    ac_ext=cc
+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 the Intel C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the Intel C++ compiler... $ECHO_C" >&6
+if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER+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
+                choke me
+             #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+  { (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); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (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
+  bakefile_cv_cxx_compiler___INTEL_COMPILER=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+bakefile_cv_cxx_compiler___INTEL_COMPILER=no
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6
+    ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+    if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then
+        :; INTELCXX=yes
+    else
+        :;
+    fi
+
+
+    if test "x$GXX" != "xyes"; then
+        echo "$as_me:$LINENO: checking if the C++ compiler requires -ext o" >&5

 echo $ECHO_N "checking if the C++ compiler requires -ext o... $ECHO_C" >&6
 if test "${wx_cv_cxx_exto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking if the C++ compiler requires -ext o... $ECHO_C" >&6
 if test "${wx_cv_cxx_exto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -12723,9 +13014,9 @@ if test "x$wx_cv_cxx_exto" '!=' "x"; then
     fi
 fi
 
     fi
 fi
 

-        if test "x$wx_cv_cxx_exto" '!=' "x"; then
-        unset ac_cv_prog_cxx_g
-        ac_test_CXXFLAGS=${CXXFLAGS+set}
+                if test "x$wx_cv_cxx_exto" '!=' "x"; then
+            unset ac_cv_prog_cxx_g
+            ac_test_CXXFLAGS=${CXXFLAGS+set}

 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="-g"
 echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
 ac_save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="-g"
 echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5


@@ -12795,8 +13086,8 @@ else
     CXXFLAGS=
   fi
 fi
     CXXFLAGS=
   fi
 fi

-    fi
-    ac_ext=cc
+        fi
+        ac_ext=cc

 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_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'


@@ -12868,7 +13159,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 

-    ac_ext=cc
+        ac_ext=cc

 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_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'


@@ -12948,9 +13239,9 @@ 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_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 the Sun C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6
-if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then
+    echo "$as_me:$LINENO: checking whether we are using the SGI C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the SGI C++ compiler... $ECHO_C" >&6
+if test "${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF


@@ -12964,7 +13255,87 @@ int
 main ()
 {
 
 main ()
 {
 

-             #ifndef __SUNPRO_CC
+             #ifndef _SGI_COMPILER_VERSION
+                choke me
+             #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+  { (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); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (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
+  bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=no
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6
+    ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+    if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then
+        :; SGICXX=yes
+    else
+        :;
+    fi
+
+
+
+
+    ac_ext=cc
+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 the Sun C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6
+if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+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 __SUNPRO_CC

                 choke me
              #endif
 
                 choke me
              #endif
 


@@ -13020,6 +13391,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
     fi
 
 
     fi
 
 

+    fi

 
 
 ac_ext=c
 
 
 ac_ext=c


@@ -13719,7 +14091,6 @@ if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
     CXXFLAGS="$CXXFLAGS -qunique"
 fi
 
     CXXFLAGS="$CXXFLAGS -qunique"
 fi
 

-

 case "${host}" in
   powerpc-*-darwin* )
     echo "$as_me:$LINENO: checking if __POWERPC__ is already defined" >&5
 case "${host}" in
   powerpc-*-darwin* )
     echo "$as_me:$LINENO: checking if __POWERPC__ is already defined" >&5


@@ -21474,6 +21845,13 @@ if test "x$SUNCC" = xyes; then
     CFLAGS="$CFLAGS -erroff=E_NO_EXPLICIT_TYPE_GIVEN"
 fi
 
     CFLAGS="$CFLAGS -erroff=E_NO_EXPLICIT_TYPE_GIVEN"
 fi
 

+if test "x$SGICC" = "xyes"; then
+    CFLAGS="$CFLAGS -woff 3970"
+fi
+if test "x$SGICXX" = "xyes"; then
+    CXXFLAGS="$CXXFLAGS -woff 3970"
+fi
+

 if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
     ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
     ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'


@@ -22331,9 +22709,6 @@ SEARCH_INCLUDE="\
     /usr/Motif-2.1/include    \
     /usr/Motif-1.2/include    \
     /usr/include/Motif1.2     \
     /usr/Motif-2.1/include    \
     /usr/Motif-1.2/include    \
     /usr/include/Motif1.2     \

-    /opt/xpm/include/X11      \
-    /opt/GBxpm/include/       \
-    /opt/GBxpm/X11/include/   \

                               \
     /usr/dt/include           \
     /usr/openwin/include      \
                               \
     /usr/dt/include           \
     /usr/openwin/include      \


@@ -22362,37 +22737,100 @@ SEARCH_INCLUDE="\
     /usr/local/X11/include    \
     /usr/local/include/X11    \
                               \
     /usr/local/X11/include    \
     /usr/local/include/X11    \
                               \

-    /usr/X386/include         \
-    /usr/x386/include         \

     /usr/XFree86/include/X11  \
     /usr/XFree86/include/X11  \

-                              \

     /usr/pkg/include          \
                               \
     /usr/pkg/include          \
                               \

-    X:/XFree86/include        \
-    X:/XFree86/include/X11    \
-                              \
-    /usr/include/gtk          \
-    /usr/local/include/gtk    \
-    /usr/include/glib         \
-    /usr/local/include/glib   \
-                              \
-    /usr/include/qt           \
-    /usr/local/include/qt     \
-                              \
-    /usr/local/arm/3.3.2/include     \
-                              \
-    /usr/include/windows      \
-    /usr/include/wine         \
-    /usr/local/include/wine   \
-                              \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \

     /usr/openwin/share/include"
 
     /usr/openwin/share/include"
 

-SEARCH_LIB="/usr/lib /usr/lib32 /usr/lib64 /usr/X11R6/lib64 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g`"
+echo "$as_me:$LINENO: checking for libraries directory" >&5
+echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6
+
+case "${host}" in
+    *-*-irix6* )
+        if test "${wx_cv_std_libpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+                for d in /usr/lib /usr/lib32 /usr/lib/64 /usr/lib64; do
+                    for e in a so sl dylib dll.a; do
+                        libc="$d/libc.$e"
+                        if test -f $libc; then
+                            save_LIBS="$LIBS"
+                            LIBS="$libc"
+                            cat >conftest.$ac_ext <<_ACEOF
+int main() { return 0; }
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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); } &&
+        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+  { (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); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (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
+  wx_cv_std_libpath=`echo $d | sed s@/usr/@@`
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+                            LIBS="$save_LIBS"
+                            if test "x$wx_cv_std_libpath" != "x"; then
+                                break 2
+                            fi
+                        fi
+                    done
+                done
+                if test "x$wx_cv_std_libpath" = "x"; then
+                    wx_cv_std_libpath="lib"
+                fi
+
+
+fi
+
+        ;;
+
+    *-*-solaris2* )
+                if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then
+            wx_cv_std_libpath="lib/64"
+        else
+            wx_cv_std_libpath="lib"
+        fi
+        ;;
+
+    *-*-linux* )
+                if test "$ac_cv_sizeof_void_p" = 8 -a \
+                -d "/usr/lib64" -a ! -h "/usr/lib64"; then
+            wx_cv_std_libpath="lib64"
+        else
+            wx_cv_std_libpath="lib"
+        fi
+        ;;
+
+    *)
+        wx_cv_std_libpath="lib";
+        ;;
+esac
+
+echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5
+echo "${ECHO_T}$wx_cv_std_libpath" >&6
+
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"

 
 if test "$build" != "$host" -a "$GCC" = yes; then
                     if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
 
 if test "$build" != "$host" -a "$GCC" = yes; then
                     if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then


@@ -22422,8 +22860,8 @@ for ac_dir in $SEARCH_INCLUDE /usr/include;
         fi
         if test -z "$x_libraries" -o "$x_libraries" = NONE; then
 
         fi
         if test -z "$x_libraries" -o "$x_libraries" = NONE; then
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
+  ac_find_libraries=
+  for ac_dir in $SEARCH_LIB;

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXt.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXt.$ac_extension"; then


@@ -24810,7 +25248,15 @@ echo "${ECHO_T}" >&6
                 fi
 
                                 wx_cv_lib_gtk=
                 fi
 
                                 wx_cv_lib_gtk=

-                if test "x$wxGTK_VERSION" != "x1"; then
+                if test "x$wxGTK_VERSION" != "x1"
+                then
+                                                                                case "${host}" in
+                        *-*-solaris2* )
+                            if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
+                               enable_gtktest=no
+                            fi
+                    esac
+

                     # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"
                     # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"


@@ -25113,6 +25559,17 @@ rm -f conftest.err conftest.$ac_objext \
 
   rm -f conf.gtktest
 
 
   rm -f conf.gtktest
 

+
+                                        case "${host}" in
+                        *-*-solaris2* )
+                            if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then
+                                GTK_CFLAGS=`echo $GTK_CFLAGS | sed 's/-mt//'`
+                                GTK_LIBS=`echo $GTK_LIBS | sed 's/-mt//'`
+                            fi
+                                                        if test "$wxUSE_SHARED" != "yes"; then
+                                GTK_LIBS="$GTK_LIBS -lX11"
+                            fi
+                    esac

                 fi
 
                                 if test -z "$wx_cv_lib_gtk"; then
                 fi
 
                                 if test -z "$wx_cv_lib_gtk"; then


@@ -26121,8 +26578,8 @@ fi
             echo "$as_me:$LINENO: checking for gpewidget library" >&5
 echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6
 
             echo "$as_me:$LINENO: checking for gpewidget library" >&5
 echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
+  ac_find_libraries=
+  for ac_dir in $SEARCH_LIB;

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libgpewidget.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libgpewidget.$ac_extension"; then


@@ -26134,18 +26591,22 @@ for ac_dir in $SEARCH_LIB /usr/lib;
 
             if test "$ac_find_libraries" != "" ; then
 
 
             if test "$ac_find_libraries" != "" ; then
 

-  echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
+    if test "$ac_find_libraries" = "default location"; then

     ac_path_to_link=""
   else
     ac_path_to_link=""
   else

-    ac_path_to_link=" -L$ac_find_libraries"
+    echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
+    else
+      ac_path_to_link=" -L$ac_find_libraries"
+    fi

   fi
 
                                                 GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY"
                 WXGPE=1
   fi
 
                                                 GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY"
                 WXGPE=1

-                echo "$as_me:$LINENO: result: found at $ac_find_libraries" >&5
-echo "${ECHO_T}found at $ac_find_libraries" >&6
+                echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
+echo "${ECHO_T}found in $ac_find_libraries" >&6

             else
                 echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
             else
                 echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6


@@ -28222,12 +28683,12 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
             CFLAGS=$save_CFLAGS
         fi
 
             CFLAGS=$save_CFLAGS
         fi
 

-        if test "$COMPILED_X_PROGRAM" = 0; then
-            echo "$as_me:$LINENO: checking for Motif/Lesstif library" >&5
+
+        echo "$as_me:$LINENO: checking for Motif/Lesstif library" >&5

 echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6
 
 echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
+  ac_find_libraries=
+  for ac_dir in $SEARCH_LIB;

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXm.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXm.$ac_extension"; then


@@ -28237,47 +28698,54 @@ for ac_dir in $SEARCH_LIB /usr/lib;
     done
   done
 
     done
   done
 

-            if test "$ac_find_libraries" != "" ; then
-                echo "$as_me:$LINENO: result: found at $ac_find_libraries" >&5
-echo "${ECHO_T}found at $ac_find_libraries" >&6

 
 

+        if test "x$ac_find_libraries" != "x" ; then
+            echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
+echo "${ECHO_T}found in $ac_find_libraries" >&6

 
 

-  echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
+
+    if test "$ac_find_libraries" = "default location"; then

     ac_path_to_link=""
   else
     ac_path_to_link=""
   else

-    ac_path_to_link=" -L$ac_find_libraries"
+    echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
+    else
+      ac_path_to_link=" -L$ac_find_libraries"
+    fi

   fi
 
   fi
 

-                GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
-            else
-                                                                save_CFLAGS=$CFLAGS
-                CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+        else
+                                                save_CFLAGS=$CFLAGS
+            CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+            save_LIBS="$LIBS"
+            LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11"

 
 

-                cat >conftest.$ac_ext <<_ACEOF
+            cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-                        #include <Xm/Xm.h>
+                    #include <Xm/Xm.h>

 
 int
 main ()
 {
 
 
 int
 main ()
 {
 

-                        int version;
-                        version = xmUseVersion;
+                    int version;
+                    version = xmUseVersion;

 
   ;
   return 0;
 }
 _ACEOF
 
   ;
   return 0;
 }
 _ACEOF

-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1

   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1


@@ -28290,34 +28758,35 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&

-        { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -s conftest$ac_exeext'

   { (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
 
   { (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: found in default search path" >&5
+                    echo "$as_me:$LINENO: result: found in default search path" >&5

 echo "${ECHO_T}found in default search path" >&6
 echo "${ECHO_T}found in default search path" >&6

-                        COMPILED_X_PROGRAM=1
+                    COMPILED_X_PROGRAM=1

 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                        echo "$as_me:$LINENO: result: no" >&5
+                    echo "$as_me:$LINENO: result: no" >&5

 echo "${ECHO_T}no" >&6
 echo "${ECHO_T}no" >&6

-                        { { echo "$as_me:$LINENO: error: please set LDFLAGS to contain the location of libXm" >&5
+                    { { echo "$as_me:$LINENO: error: please set LDFLAGS to contain the location of libXm" >&5

 echo "$as_me: error: please set LDFLAGS to contain the location of libXm" >&2;}
    { (exit 1); exit 1; }; }
 
 
 fi
 echo "$as_me: error: please set LDFLAGS to contain the location of libXm" >&2;}
    { (exit 1); exit 1; }; }
 
 
 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext

 
 

-                CFLAGS=$save_CFLAGS
-            fi
+            CFLAGS=$save_CFLAGS
+            LIBS="$save_LIBS"

         fi
 
         echo "$as_me:$LINENO: checking if we need -lXp and/or -lSM -lICE" >&5
         fi
 
         echo "$as_me:$LINENO: checking if we need -lXp and/or -lSM -lICE" >&5


@@ -28480,24 +28949,28 @@ fi
 
         save_CFLAGS=$CFLAGS
         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
 
         save_CFLAGS=$CFLAGS
         CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"

+

         echo "$as_me:$LINENO: checking for Motif 2" >&5
 echo $ECHO_N "checking for Motif 2... $ECHO_C" >&6
         echo "$as_me:$LINENO: checking for Motif 2" >&5
 echo $ECHO_N "checking for Motif 2... $ECHO_C" >&6

-        cat >conftest.$ac_ext <<_ACEOF
+if test "${wx_cv_lib_motif2+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.  */
 
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-                        #include <Xm/Xm.h>
+                            #include <Xm/Xm.h>

 
 int
 main ()
 {
 
 
 int
 main ()
 {
 

-                        #if XmVersion < 2000
-                        Not Motif 2
-                        #endif
+                            #if XmVersion < 2000
+                            Not Motif 2
+                            #endif

 
   ;
   return 0;
 
   ;
   return 0;


@@ -28524,47 +28997,50 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then

-
-                        cat >>confdefs.h <<\_ACEOF
-#define __WXMOTIF20__ 1
-_ACEOF
-
-                        echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-
+  wx_cv_lib_motif2="yes"

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

+wx_cv_lib_motif2="no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $wx_cv_lib_motif2" >&5
+echo "${ECHO_T}$wx_cv_lib_motif2" >&6
+        if test "$wx_cv_lib_motif2" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define __WXMOTIF20__ 1
+_ACEOF

 
 

-                        cat >>confdefs.h <<\_ACEOF
+        else
+            cat >>confdefs.h <<\_ACEOF

 #define __WXMOTIF20__ 0
 _ACEOF
 
 #define __WXMOTIF20__ 0
 _ACEOF
 

-                        echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+        fi

 
         echo "$as_me:$LINENO: checking whether Motif is Lesstif" >&5
 echo $ECHO_N "checking whether Motif is Lesstif... $ECHO_C" >&6
 
         echo "$as_me:$LINENO: checking whether Motif is Lesstif" >&5
 echo $ECHO_N "checking whether Motif is Lesstif... $ECHO_C" >&6

-        cat >conftest.$ac_ext <<_ACEOF
+if test "${wx_cv_lib_lesstif+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.  */
 
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 

-                        #include <Xm/Xm.h>
+                            #include <Xm/Xm.h>

 
 int
 main ()
 {
 
 
 int
 main ()
 {
 

-                        #if !defined(LesstifVersion) || LesstifVersion <= 0
-                        Not Lesstif
-                        #endif
+                            #if !defined(LesstifVersion) || LesstifVersion <= 0
+                            Not Lesstif
+                            #endif

 
   ;
   return 0;
 
   ;
   return 0;


@@ -28591,28 +29067,30 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then

-
-                        cat >>confdefs.h <<\_ACEOF
-#define __WXLESSTIF__ 1
-_ACEOF
-
-                        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
+  wx_cv_lib_lesstif="yes"

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

+wx_cv_lib_lesstif="no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

 
 

-                        cat >>confdefs.h <<\_ACEOF
+fi
+echo "$as_me:$LINENO: result: $wx_cv_lib_lesstif" >&5
+echo "${ECHO_T}$wx_cv_lib_lesstif" >&6
+        if test "$wx_cv_lib_lesstif" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define __WXLESSTIF__ 1
+_ACEOF
+
+        else
+            cat >>confdefs.h <<\_ACEOF

 #define __WXLESSTIF__ 0
 _ACEOF
 
 #define __WXLESSTIF__ 0
 _ACEOF
 

-                        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+        fi

 
 

-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

         CFLAGS=$save_CFLAGS
 
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
         CFLAGS=$save_CFLAGS
 
         GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"


@@ -28625,8 +29103,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
             echo "$as_me:$LINENO: checking for Xpm library" >&5
 echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6
 
             echo "$as_me:$LINENO: checking for Xpm library" >&5
 echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
+  ac_find_libraries=
+  for ac_dir in $SEARCH_LIB;

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then


@@ -28638,17 +29116,21 @@ for ac_dir in $SEARCH_LIB /usr/lib;
 
             if test "$ac_find_libraries" != "" ; then
 
 
             if test "$ac_find_libraries" != "" ; then
 

-  echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
+    if test "$ac_find_libraries" = "default location"; then

     ac_path_to_link=""
   else
     ac_path_to_link=""
   else

-    ac_path_to_link=" -L$ac_find_libraries"
+    echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
+    else
+      ac_path_to_link=" -L$ac_find_libraries"
+    fi

   fi
 
                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
   fi
 
                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"

-                echo "$as_me:$LINENO: result: found at $ac_find_libraries" >&5
-echo "${ECHO_T}found at $ac_find_libraries" >&6
+                echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5
+echo "${ECHO_T}found in $ac_find_libraries" >&6

 
                 echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
 echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
 
                 echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
 echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6


@@ -29622,8 +30104,8 @@ if test "$wxUSE_DISPLAY" = "yes"; then
         echo "$as_me:$LINENO: checking for Xinerama" >&5
 echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6
 
         echo "$as_me:$LINENO: checking for Xinerama" >&5
 echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
+  ac_find_libraries=
+  for ac_dir in $SEARCH_LIB;

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXinerama.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXinerama.$ac_extension"; then


@@ -29635,12 +30117,16 @@ for ac_dir in $SEARCH_LIB /usr/lib;
 
         if test "$ac_find_libraries" != "" ; then
 
 
         if test "$ac_find_libraries" != "" ; then
 

-  echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
+    if test "$ac_find_libraries" = "default location"; then

     ac_path_to_link=""
   else
     ac_path_to_link=""
   else

-    ac_path_to_link=" -L$ac_find_libraries"
+    echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
+    else
+      ac_path_to_link=" -L$ac_find_libraries"
+    fi

   fi
 
             if test "$ac_path_to_link" != " -L/usr/lib" ; then
   fi
 
             if test "$ac_path_to_link" != " -L/usr/lib" ; then


@@ -29653,8 +30139,8 @@ echo "${ECHO_T}yes" >&6
             echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5
 echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6
 
             echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5
 echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
+  ac_find_libraries=
+  for ac_dir in $SEARCH_LIB;

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXxf86vm.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libXxf86vm.$ac_extension"; then


@@ -29997,8 +30483,8 @@ if test $ac_cv_header_GL_gl_h = yes; then
                 echo "$as_me:$LINENO: checking for -lGL" >&5
 echo $ECHO_N "checking for -lGL... $ECHO_C" >&6
 
                 echo "$as_me:$LINENO: checking for -lGL" >&5
 echo $ECHO_N "checking for -lGL... $ECHO_C" >&6
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
+  ac_find_libraries=
+  for ac_dir in $SEARCH_LIB;

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGL.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGL.$ac_extension"; then


@@ -30013,12 +30499,16 @@ for ac_dir in $SEARCH_LIB /usr/lib;
 echo "${ECHO_T}yes" >&6
 
 
 echo "${ECHO_T}yes" >&6
 
 

-  echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
+    if test "$ac_find_libraries" = "default location"; then

     ac_path_to_link=""
   else
     ac_path_to_link=""
   else

-    ac_path_to_link=" -L$ac_find_libraries"
+    echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
+    else
+      ac_path_to_link=" -L$ac_find_libraries"
+    fi

   fi
 
                     if test "$ac_path_to_link" != " -L/usr/lib" ; then
   fi
 
                     if test "$ac_path_to_link" != " -L/usr/lib" ; then


@@ -30028,8 +30518,8 @@ echo "${ECHO_T}yes" >&6
                                                                                 echo "$as_me:$LINENO: checking for -lGLU" >&5
 echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6
 
                                                                                 echo "$as_me:$LINENO: checking for -lGLU" >&5
 echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
+  ac_find_libraries=
+  for ac_dir in $SEARCH_LIB;

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGLU.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libGLU.$ac_extension"; then


@@ -30041,12 +30531,16 @@ for ac_dir in $SEARCH_LIB /usr/lib;
 
                     if test "$ac_find_libraries" != "" ; then
 
 
                     if test "$ac_find_libraries" != "" ; then
 

-  echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
+    if test "$ac_find_libraries" = "default location"; then

     ac_path_to_link=""
   else
     ac_path_to_link=""
   else

-    ac_path_to_link=" -L$ac_find_libraries"
+    echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
+    else
+      ac_path_to_link=" -L$ac_find_libraries"
+    fi

   fi
 
                         if test "$ac_path_to_link" != " -L/usr/lib" -a \
   fi
 
                         if test "$ac_path_to_link" != " -L/usr/lib" -a \


@@ -30071,8 +30565,8 @@ echo "${ECHO_T}no" >&6
                     echo "$as_me:$LINENO: checking for -lMesaGL" >&5
 echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6
 
                     echo "$as_me:$LINENO: checking for -lMesaGL" >&5
 echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
+  ac_find_libraries=
+  for ac_dir in $SEARCH_LIB;

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then


@@ -30084,12 +30578,16 @@ for ac_dir in $SEARCH_LIB /usr/lib;
 
                     if test "$ac_find_libraries" != "" ; then
 
 
                     if test "$ac_find_libraries" != "" ; then
 

-  echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
+    if test "$ac_find_libraries" = "default location"; then

     ac_path_to_link=""
   else
     ac_path_to_link=""
   else

-    ac_path_to_link=" -L$ac_find_libraries"
+    echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_link=""
+    else
+      ac_path_to_link=" -L$ac_find_libraries"
+    fi

   fi
 
                         LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
   fi
 
                         LDFLAGS_GL="$LDFLAGS$ac_path_to_link"


@@ -36614,16 +37112,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then

-
-               wx_cv_type_pthread_mutexattr_t=yes
-
+  wx_cv_type_pthread_mutexattr_t=yes

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-
-               wx_cv_type_pthread_mutexattr_t=no
-
+wx_cv_type_pthread_mutexattr_t=no

 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext


@@ -36637,6 +37131,71 @@ echo "${ECHO_T}$wx_cv_type_pthread_mutexattr_t" >&6
 #define HAVE_PTHREAD_MUTEXATTR_T 1
 _ACEOF
 
 #define HAVE_PTHREAD_MUTEXATTR_T 1
 _ACEOF
 

+
+                        echo "$as_me:$LINENO: checking for pthread_mutexattr_settype declaration" >&5
+echo $ECHO_N "checking for pthread_mutexattr_settype declaration... $ECHO_C" >&6
+if test "${wx_cv_func_pthread_mutexattr_settype_decl+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+                       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+
+                               pthread_mutexattr_t attr;
+                               pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+  { (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); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (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
+  wx_cv_func_pthread_mutexattr_settype_decl=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_func_pthread_mutexattr_settype_decl=no
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:$LINENO: result: $wx_cv_func_pthread_mutexattr_settype_decl" >&5
+echo "${ECHO_T}$wx_cv_func_pthread_mutexattr_settype_decl" >&6
+        if test "$wx_cv_func_pthread_mutexattr_settype_decl" = "yes"; then
+            cat >>confdefs.h <<\_ACEOF
+#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1
+_ACEOF
+
+        fi

       else
                 echo "$as_me:$LINENO: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
 echo $ECHO_N "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... $ECHO_C" >&6
       else
                 echo "$as_me:$LINENO: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
 echo $ECHO_N "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... $ECHO_C" >&6


@@ -38515,6 +39074,89 @@ _ACEOF
 fi
 done
 
 fi
 done
 

+    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=cc
+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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+  { (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); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (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
+  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 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
+
+    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
 
             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


@@ -39367,9 +40009,9 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                                                                                                                                                                        CFLAGS_OLD="$CFLAGS"
+                                                                                                                                                                        CXXFLAGS_OLD="$CXXFLAGS"

                         if test "$GCC" = yes ; then
                         if test "$GCC" = yes ; then

-                            CFLAGS="$CFLAGS -Werror"
+                            CXXFLAGS="$CXXFLAGS -Werror"

                         fi
 
                         cat >conftest.$ac_ext <<_ACEOF
                         fi
 
                         cat >conftest.$ac_ext <<_ACEOF


@@ -39474,7 +40116,7 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 

-                        CFLAGS="$CFLAGS_OLD"
+                        CXXFLAGS="$CXXFLAGS_OLD"

 
 
 fi
 
 
 fi


@@ -39548,9 +40190,9 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 sed 's/^/| /' conftest.$ac_ext >&5
 
 

-                                                                                                                                                                        CFLAGS_OLD="$CFLAGS"
+                                                                                                                                                                        CXXFLAGS_OLD="$CXXFLAGS"

                         if test "$GCC" = yes ; then
                         if test "$GCC" = yes ; then

-                            CFLAGS="$CFLAGS -Werror"
+                            CXXFLAGS="$CXXFLAGS -Werror"

                         fi
 
                         cat >conftest.$ac_ext <<_ACEOF
                         fi
 
                         cat >conftest.$ac_ext <<_ACEOF


@@ -39655,7 +40297,7 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 

-                        CFLAGS="$CFLAGS_OLD"
+                        CXXFLAGS="$CXXFLAGS_OLD"

 
 
 fi
 
 
 fi


@@ -41596,8 +42238,8 @@ fi
         echo "$as_me:$LINENO: checking for gstplay 0.8" >&5
 echo $ECHO_N "checking for gstplay 0.8... $ECHO_C" >&6
 
         echo "$as_me:$LINENO: checking for gstplay 0.8" >&5
 echo $ECHO_N "checking for gstplay 0.8... $ECHO_C" >&6
 

-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
+  ac_find_libraries=
+  for ac_dir in $SEARCH_LIB;

   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libgstplay-0.8.$ac_extension"; then
   do
     for ac_extension in a so sl dylib dll.a; do
       if test -f "$ac_dir/libgstplay-0.8.$ac_extension"; then


@@ -42176,9 +42818,16 @@ fi
 INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
 -I\${top_srcdir}/include $TOOLKIT_INCLUDE"
 
 INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
 -I\${top_srcdir}/include $TOOLKIT_INCLUDE"
 

-if test "$GXX" = yes ; then
-        CWARNINGS="-Wall -Wundef"
-    CXXWARNINGS="$CWARNINGS -Wno-ctor-dtor-privacy"
+if test "x$INTELCC" = "xyes" ; then
+                                        CWARNINGS="-Wall -wd810,869,981,1418,1572,1684"
+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"
+elif test "$GXX" = yes ; then
+        CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy"

 fi
 
 EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
 fi
 
 EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"


@@ -43291,8 +43940,19 @@ EOF
       ;;
 
       *-*-aix* )
       ;;
 
       *-*-aix* )

-                if test "x$GCC" != "xyes"; then
-                                    # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
+        if test "x$GCC" = "xyes"; then
+                                           PIC_FLAG=""
+
+                                                           case "${BAKEFILE_HOST}" in
+               *-*-aix5* )
+                   LD_EXPFULL="-Wl,-bexpfull"
+                   ;;
+           esac
+
+           SHARED_LD_CC="\$(CC) -shared $LD_EXPFULL -o"
+           SHARED_LD_CXX="\$(CXX) -shared $LD_EXPFULL -o"
+       else
+                               # Extract the first word of "makeC++SharedLib", so it can be a program name with args.

 set dummy makeC++SharedLib; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 set dummy makeC++SharedLib; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6


@@ -43328,7 +43988,7 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
 echo "${ECHO_T}no" >&6
 fi
 

-                        SHARED_LD_CC="$AIX_CC_LD -p 0 -o"
+            SHARED_LD_CC="$AIX_CC_LD -p 0 -o"

             SHARED_LD_CXX="$AIX_CXX_LD -p 0 -o"
         fi
       ;;
             SHARED_LD_CXX="$AIX_CXX_LD -p 0 -o"
         fi
       ;;


@@ -43837,7 +44497,7 @@ EOF
       ;;
 
       powerpc-apple-macos* | \
       ;;
 
       powerpc-apple-macos* | \

-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \

       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \
       *-*-sunos4* | \
       *-*-osf* | \
       *-*-dgux5* | \


@@ -43879,7 +44539,7 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in
     SONAME_FLAG=
 
     case "${BAKEFILE_HOST}" in

-      *-*-linux* | *-*-freebsd* )
+      *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )

         SONAME_FLAG="-Wl,-soname,"
         USE_SOVERSION=1
         USE_SOVERLINUX=1
         SONAME_FLAG="-Wl,-soname,"
         USE_SOVERSION=1
         USE_SOVERLINUX=1


@@ -43916,34 +44576,37 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
 
     echo "$as_me:$LINENO: checking for dependency tracking method" >&5
 echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6
 
     echo "$as_me:$LINENO: checking for dependency tracking method" >&5
 echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6

-    DEPS_TRACKING=0
+    DEPS_TRACKING=1

 
     if test "x$GCC" = "xyes"; then
         DEPSMODE=gcc
 
     if test "x$GCC" = "xyes"; then
         DEPSMODE=gcc

-        DEPS_TRACKING=1

         case "${BAKEFILE_HOST}" in
             *-*-darwin* )
         case "${BAKEFILE_HOST}" in
             *-*-darwin* )

-                                                DEPSFLAG_GCC="-no-cpp-precomp -MMD"
+                                                DEPSFLAG="-no-cpp-precomp -MMD"

             ;;
             * )
             ;;
             * )

-                DEPSFLAG_GCC="-MMD"
+                DEPSFLAG="-MMD"

             ;;
         esac
         echo "$as_me:$LINENO: result: gcc" >&5
 echo "${ECHO_T}gcc" >&6
     elif test "x$MWCC" = "xyes"; then
         DEPSMODE=mwcc
             ;;
         esac
         echo "$as_me:$LINENO: result: gcc" >&5
 echo "${ECHO_T}gcc" >&6
     elif test "x$MWCC" = "xyes"; then
         DEPSMODE=mwcc

-        DEPS_TRACKING=1
-        DEPSFLAG_MWCC="-MM"
+        DEPSFLAG="-MM"

         echo "$as_me:$LINENO: result: mwcc" >&5
 echo "${ECHO_T}mwcc" >&6
     elif test "x$SUNCC" = "xyes"; then
         echo "$as_me:$LINENO: result: mwcc" >&5
 echo "${ECHO_T}mwcc" >&6
     elif test "x$SUNCC" = "xyes"; then

-        DEPSMODE=suncc
-        DEPS_TRACKING=1
-        DEPSFLAG_SUNCC="-xM1"
-        echo "$as_me:$LINENO: result: suncc" >&5
-echo "${ECHO_T}suncc" >&6
+        DEPSMODE=unixcc
+        DEPSFLAG="-xM1"
+        echo "$as_me:$LINENO: result: Sun cc" >&5
+echo "${ECHO_T}Sun cc" >&6
+    elif test "x$SGICC" = "xyes"; then
+        DEPSMODE=unixcc
+        DEPSFLAG="-M"
+        echo "$as_me:$LINENO: result: SGI cc" >&5
+echo "${ECHO_T}SGI cc" >&6

     else
     else

+       DEPS_TRACKING=0

         echo "$as_me:$LINENO: result: none" >&5
 echo "${ECHO_T}none" >&6
     fi
         echo "$as_me:$LINENO: result: none" >&5
 echo "${ECHO_T}none" >&6
     fi


@@ -43961,14 +44624,12 @@ cat <<EOF >bk-deps
 
 DEPSMODE=${DEPSMODE}
 DEPSDIR=.deps
 
 DEPSMODE=${DEPSMODE}
 DEPSDIR=.deps

-DEPSFLAG_GCC="${DEPSFLAG_GCC}"
-DEPSFLAG_MWCC="${DEPSFLAG_MWCC}"
-DEPSFLAG_SUNCC="${DEPSFLAG_SUNCC}"
+DEPSFLAG="${DEPSFLAG}"

 
 mkdir -p ${D}DEPSDIR
 
 if test ${D}DEPSMODE = gcc ; then
 
 mkdir -p ${D}DEPSDIR
 
 if test ${D}DEPSMODE = gcc ; then

-    ${D}* ${D}{DEPSFLAG_GCC}
+    ${D}* ${D}{DEPSFLAG}

     status=${D}?
     if test ${D}{status} != 0 ; then
         exit ${D}{status}
     status=${D}?
     if test ${D}{status} != 0 ; then
         exit ${D}{status}


@@ -44002,11 +44663,7 @@ if test ${D}DEPSMODE = gcc ; then
     fi
     exit 0
 elif test ${D}DEPSMODE = mwcc ; then
     fi
     exit 0
 elif test ${D}DEPSMODE = mwcc ; then

-    ${D}*
-    status=${D}?
-    if test ${D}{status} != 0 ; then
-        exit ${D}{status}
-    fi
+    ${D}* || exit ${D}?

     # Run mwcc again with -MM and redirect into the dep file we want
     # NOTE: We can't use shift here because we need ${D}* to be valid
     prevarg=
     # Run mwcc again with -MM and redirect into the dep file we want
     # NOTE: We can't use shift here because we need ${D}* to be valid
     prevarg=


@@ -44024,10 +44681,10 @@ elif test ${D}DEPSMODE = mwcc ; then
         fi
         prevarg="${D}arg"
     done
         fi
         prevarg="${D}arg"
     done

-    ${D}* ${D}DEPSFLAG_MWCC >${D}{DEPSDIR}/${D}{objfile}.d
+    ${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.d

     exit 0
     exit 0

-elif test ${D}DEPSMODE = suncc; then
-    ${D}* || exit
+elif test ${D}DEPSMODE = unixcc; then
+    ${D}* || exit ${D}?

     # Run compiler again with deps flag and redirect into the dep file.
     # It doesn't work if the '-o FILE' option is used, but without it the
     # dependency file will contain the wrong name for the object. So it is
     # Run compiler again with deps flag and redirect into the dep file.
     # It doesn't work if the '-o FILE' option is used, but without it the
     # dependency file will contain the wrong name for the object. So it is


@@ -44046,7 +44703,7 @@ elif test ${D}DEPSMODE = suncc; then
         esac
         shift
     done
         esac
         shift
     done

-    eval "${D}cmd ${D}DEPSFLAG_SUNCC" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d
+    eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d

     exit 0
 else
     ${D}*
     exit 0
 else
     ${D}*


@@ -44788,6 +45445,11 @@ EOF
         COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
     fi
 
         COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
     fi
 

+    COND_TOOLKIT_MSW_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MSW_WXUNIV_0=""
+    fi
+

     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
         COND_TOOLKIT_PM=""
     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
         COND_TOOLKIT_PM=""


@@ -44818,6 +45480,11 @@ EOF
         COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0=""
     fi
 
         COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0=""
     fi
 

+    COND_TOOLKIT_WINCE_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xWINCE" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_WINCE_WXUNIV_0=""
+    fi
+

     COND_TOOLKIT_X11="#"
     if test "x$TOOLKIT" = "xX11" ; then
         COND_TOOLKIT_X11=""
     COND_TOOLKIT_X11="#"
     if test "x$TOOLKIT" = "xX11" ; then
         COND_TOOLKIT_X11=""


@@ -45041,189 +45708,9 @@ if test "$wxUSE_OMF" = "yes"; then
     esac
 fi
 
     esac
 fi
 

-GCC_PRAGMA_FLAGS=""
-PCH_FLAGS=""
-

 if test $GCC_PCH = 1 ; then
 if test $GCC_PCH = 1 ; then

-    PCH_FLAGS="-DWX_PRECOMP"
-    GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-else
-        if test "$GCC" = yes; then
-        echo "$as_me:$LINENO: checking if this GCC version is >= 4.0 and needs -DNO_GCC_PRAGMA" >&5
-echo $ECHO_N "checking if this GCC version is >= 4.0 and needs -DNO_GCC_PRAGMA... $ECHO_C" >&6
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#if (__GNUC__ < 4)
-             Not GCC 4.0 or greater
-             #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
-  { (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); }; } &&
-        { ac_try='test -s conftest.$ac_objext'
-  { (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
-  GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-             echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-            case "${host}" in
-                *-*-darwin* )
-                                                            GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-                ;;
-                *-*-mingw32* )
-                                                                                                                                            if test "$wxUSE_STL" = "yes" -o \
-                    "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
-                    "$wxUSE_NO_RTTI" != "yes"; then
-                        echo "$as_me:$LINENO: checking if this MinGW version needs -DNO_GCC_PRAGMA" >&5
-echo $ECHO_N "checking if this MinGW version needs -DNO_GCC_PRAGMA... $ECHO_C" >&6
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
-                             Not GCC 3.2 or greater
-                             #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
-  { (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); }; } &&
-        { ac_try='test -s conftest.$ac_objext'
-  { (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
-  GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-                             echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+    CPPFLAGS="-DWX_PRECOMP $CPPFLAGS"

 fi
 fi

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-                    fi
-                    ;;
-                *-pc-os2_emx | *-pc-os2-emx )
-                                                                                if test "$wxUSE_STL" = "yes"; then
-                        echo "$as_me:$LINENO: checking if this gcc version needs -DNO_GCC_PRAGMA" >&5
-echo $ECHO_N "checking if this gcc version needs -DNO_GCC_PRAGMA... $ECHO_C" >&6
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
-                             Not GCC 3.2 or greater
-                             #endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
-  { (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); }; } &&
-        { ac_try='test -s conftest.$ac_objext'
-  { (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
-  GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-                             echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-                    fi
-                    ;;
-            esac
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-fi
-CPPFLAGS="$PCH_FLAGS $GCC_PRAGMA_FLAGS $CPPFLAGS"

 
 
 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'`"


@@ -45338,7 +45825,7 @@ fi
 
 
 
 
 
 

-
+if test "$wxWITH_SUBDIRS" != "no"; then

 if test "$wxUSE_GUI" = "yes"; then
     SUBDIRS="samples demos utils contrib"
 else         SUBDIRS="samples utils"
 if test "$wxUSE_GUI" = "yes"; then
     SUBDIRS="samples demos utils contrib"
 else         SUBDIRS="samples utils"


@@ -45509,8 +45996,7 @@ for subdir in `echo $SUBDIRS`; do
         done
     fi
 done
         done
     fi
 done

-
-
+fi

 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure


@@ -45873,7 +46359,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
 } >&5
 cat >&5 <<_CSEOF
 

-This file was extended by wxWidgets $as_me 2.6.2, which was
+This file was extended by wxWidgets $as_me 2.7.0, which was

 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES


@@ -45936,7 +46422,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\

-wxWidgets config.status 2.6.2
+wxWidgets config.status 2.7.0

 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 


@@ -46376,12 +46862,14 @@ s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0
 s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t
 s,@COND_TOOLKIT_MSW_USE_GUI_1@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t
 s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;t t
 s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t
 s,@COND_TOOLKIT_MSW_USE_GUI_1@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t
 s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;t t

+s,@COND_TOOLKIT_MSW_WXUNIV_0@,$COND_TOOLKIT_MSW_WXUNIV_0,;t t

 s,@COND_TOOLKIT_PM@,$COND_TOOLKIT_PM,;t t
 s,@COND_TOOLKIT_PM_USE_GUI_1@,$COND_TOOLKIT_PM_USE_GUI_1,;t t
 s,@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0,;t t
 s,@COND_TOOLKIT_WINCE@,$COND_TOOLKIT_WINCE,;t t
 s,@COND_TOOLKIT_WINCE_USE_GUI_1@,$COND_TOOLKIT_WINCE_USE_GUI_1,;t t
 s,@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0,;t t
 s,@COND_TOOLKIT_PM@,$COND_TOOLKIT_PM,;t t
 s,@COND_TOOLKIT_PM_USE_GUI_1@,$COND_TOOLKIT_PM_USE_GUI_1,;t t
 s,@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0,;t t
 s,@COND_TOOLKIT_WINCE@,$COND_TOOLKIT_WINCE,;t t
 s,@COND_TOOLKIT_WINCE_USE_GUI_1@,$COND_TOOLKIT_WINCE_USE_GUI_1,;t t
 s,@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0,;t t

+s,@COND_TOOLKIT_WINCE_WXUNIV_0@,$COND_TOOLKIT_WINCE_WXUNIV_0,;t t

 s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t
 s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t
 s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t
 s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t
 s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t
 s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t