X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06629565dcc8eb8cdeb4c8003384eeec90aca8e0..8e10778e0e79ad94ac74da5fd1bb087336be4321:/configure diff --git a/configure b/configure index b7cf1bc96b..de7e55e4b3 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in. +# From configure.in Id: configure.in 47339 2007-07-11 20:03:11Z VZ . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.0. +# Generated by GNU Autoconf 2.59 for wxWidgets 2.9.0. # # Report bugs to . # @@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='2.8.0' -PACKAGE_STRING='wxWidgets 2.8.0' +PACKAGE_VERSION='2.9.0' +PACKAGE_STRING='wxWidgets 2.9.0' 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" -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 wx_top_builddir 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 WINDRES ac_ct_WINDRES DLLTOOL ac_ct_DLLTOOL IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG ac_pt_PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS REZ DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS GST_LIBS 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 EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON 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 AROPTIONS 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 BK_DEPS GCC_PCH ICC_PCH BK_MAKE_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_ICC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_AUI_1 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_MEDIA_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_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_AUI_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_MEDIA_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_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_MEDIA_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_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_0 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_TOOLKIT_MGL COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_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_DFB COND_TOOLKIT_DFB_USE_GUI_1 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_TOOLKIT_VERSION_ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1 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_PCH_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 USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_CPPFLAGS WXCONFIG_CFLAGS WXCONFIG_CXXFLAGS WXCONFIG_LIBS WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_RESFLAGS EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESCOMP RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES POSTLINK_COMMAND MACSETFILE 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 wx_top_builddir 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 WINDRES ac_ct_WINDRES DLLTOOL ac_ct_DLLTOOL IF_GNU_MAKE LN_S subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG ac_pt_PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS CFLAGS_VISIBILITY CXXFLAGS_VISIBILITY REZ DEREZ SETFILE LIBICONV SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS GST_LIBS ALL_WX_LIBS BUILT_WX_LIBS STD_BASE_LIBS STD_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 CXXWARNINGS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GNOMEPRINT EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON 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 AROPTIONS 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 BK_DEPS GCC_PCH ICC_PCH BK_MAKE_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_ICC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_AUI_1 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_MEDIA_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_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_0_USE_STC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_AUI_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_MEDIA_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_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_1_USE_STC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_AUI_1 COND_MONOLITHIC_0_USE_GUI_1 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_HTML_1 COND_MONOLITHIC_0_USE_MEDIA_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_0_USE_QA_1 COND_MONOLITHIC_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_USE_STC_1 COND_MONOLITHIC_0_USE_XRC_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_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_0 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_TOOLKIT_MGL COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_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_STC_1 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_DFB COND_TOOLKIT_DFB_USE_GUI_1 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_TOOLKIT_VERSION_ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1 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_USE_OPENGL_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_PCH_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_STC_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 USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_CPPFLAGS WXCONFIG_CFLAGS WXCONFIG_CXXFLAGS WXCONFIG_LIBS WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_RESFLAGS EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESCOMP RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES POSTLINK_COMMAND MACSETFILE GCC CPPUNIT_CONFIG LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -782,10 +782,6 @@ ac_env_CXXFLAGS_set=${CXXFLAGS+set} ac_env_CXXFLAGS_value=$CXXFLAGS ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} ac_env_PKG_CONFIG_value=$PKG_CONFIG ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} @@ -870,7 +866,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 -\`configure' configures wxWidgets 2.8.0 to adapt to many kinds of systems. +\`configure' configures wxWidgets 2.9.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -936,24 +932,34 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.8.0:";; + short | recursive ) echo "Configuration of wxWidgets 2.9.0:";; esac cat <<\_ACEOF Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-gui use GUI classes + --disable-gui don't build GUI parts of the library --enable-monolithic build wxWidgets as single library --enable-plugins build parts of wxWidgets as loadable components + --enable-official_build official build of wxWidgets (win32 DLL only) + --enable-vendor=VENDOR vendor name (win32 DLL only) + --disable-all_features disable all optional features to build minimal library --enable-universal use wxWidgets GUI controls instead of native ones --enable-nanox use NanoX --disable-gtk2 use GTK+ 1.2 instead of 2.0 --enable-gpe use GNOME PDA Environment features if possible - --enable-shared create shared library code + --disable-shared create static library instead of shared --enable-optimise create optimised code --enable-debug same as debug_flag and debug_info --enable-stl use STL for containers + --enable-std_iostreams use standard C++ stream classes + --enable-std_string use standard C++ string classes + --disable-unicode compile without Unicode support + --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only) + --enable-utf8 use UTF-8 representation for strings (Unix only) + --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only) + --enable-extended_rtti use extended RTTI (XTI) --enable-omf use OMF object format --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!) --enable-debug_info create code with debugging information @@ -967,9 +973,10 @@ Optional Features: --enable-no_deps create code without dependency information --disable-vararg_macros don't use vararg macros, even if they are supported --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working) - --enable-compat24 enable wxWidgets 2.4 compatibility - --disable-compat26 disable wxWidgets 2.6 compatibility + --enable-compat26 enable wxWidgets 2.6 compatibility + --disable-compat28 disable wxWidgets 2.8 compatibility --disable-rpath disable use of rpath for uninstalled builds + --enable-objc_uniquifying enable Objective-C class name uniquifying --enable-intl use internationalization system --enable-config use wxConfig (and derived) classes --enable-protocols use wxProtocol and derived classes @@ -982,6 +989,7 @@ Optional Features: --enable-ipc use interprocess communication (wxSocket etc.) --enable-apple_ieee use the Apple IEEE codec --enable-arcstream use wxArchive streams + --enable-base64 use base64 encoding/decoding functions --enable-backtrace use wxStackWalker class for getting backtraces --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only) --enable-cmdline use wxCmdLineParser class @@ -1002,10 +1010,7 @@ Optional Features: --enable-log use logging system --enable-longlong use wxLongLong class --enable-mimetype use wxMimeTypesManager - --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only) --enable-snglinst use wxSingleInstanceChecker class - --enable-std_iostreams use standard C++ stream classes - --enable-std_string use standard C++ string classes --enable-stdpaths use wxStandardPaths class --enable-stopwatch use wxStopWatch class --enable-streams use wxStream etc classes @@ -1014,7 +1019,6 @@ Optional Features: --enable-textbuf use wxTextBuffer class --enable-textfile use wxTextFile class --enable-timer use wxTimer class - --enable-unicode compile wxString with Unicode support --enable-sound use wxSound class --enable-mediactrl use wxMediaCtrl class --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix @@ -1034,6 +1038,7 @@ Optional Features: --enable-htmlhelp use wxHTML-based help --enable-xrc use XRC resources sub-library --enable-aui use AUI docking library + --enable-stc use wxStyledTextCtrl library --enable-constraints use layout-constraints system --enable-printarch use printing architecture --enable-mdi use multiple document interface architecture @@ -1045,8 +1050,6 @@ Optional Features: --enable-richtext use wxRichTextCtrl --enable-graphics_ctx use graphics context 2D drawing API --enable-postscript use wxPostscriptDC device context (default for gtk+) - --enable-prologio not available; see contrib - --enable-resources not available; see contrib --enable-clipboard use wxClipboard class --enable-dnd use Drag'n'Drop classes --enable-metafile use win32 metafiles @@ -1070,6 +1073,7 @@ Optional Features: --enable-dirpicker use wxDirPickerCtrl class --enable-display use wxDisplay class --enable-detect_sm use code to detect X11 session manager + --enable-editablebox use wxEditableListBox class --enable-filepicker use wxFilePickerCtrl class --enable-fontpicker use wxFontPickerCtrl class --enable-gauge use wxGauge class @@ -1086,6 +1090,7 @@ Optional Features: --enable-radiobtn use wxRadioButton class --enable-sash use wxSashWindow class --enable-scrollbar use wxScrollBar class and scrollable windows + --enable-searchctrl use wxSearchCtrl class --enable-slider use wxSlider class --enable-spinbtn use wxSpinButton class --enable-spinctrl use wxSpinCtrl class @@ -1141,8 +1146,6 @@ Optional Features: --enable-pnm use pnm images (PNM file format) --enable-xpm use xpm images (XPM file format) --enable-icocur use Windows ICO and CUR formats - --enable-official_build official build of wxWidgets (win32 DLL only) - --enable-vendor=VENDOR vendor name (win32 DLL only) --disable-largefile omit support for large files --disable-gtktest do not try to compile and run a test GTK+ program --disable-gtktest Do not try to compile and run a test GTK program @@ -1158,6 +1161,8 @@ 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-flavour=NAME specify a name to identify this build + --with-themes=all|list use only the specified comma-separated list of wxUniversal themes --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any" --with-motif use Motif/Lesstif --with-mac use Mac OS X @@ -1175,17 +1180,15 @@ Optional Packages: --with-libxpm use libxpm (XPM file format) --with-libmspack use libmspack (CHM help files loading) --with-sdl use SDL for audio on Unix - --with-gnomeprint use GNOME print for printing under GNOME + --without-gnomeprint don't use GNOME printing libraries --with-gnomevfs use GNOME VFS for associating MIME types --with-hildon use Hildon framework for Nokia 770 --with-opengl use OpenGL (or Mesa) - --with-themes=all|list use only the specified comma-separated list of wxUniversal themes --with-dmalloc use dmalloc library (http://dmalloc.com/) --with-regex enable support for wxRegEx class --with-zlib use zlib for LZW compression --with-odbc use the IODBC and wxODBC classes --with-expat enable XML support using expat parser - --with-flavour=NAME specify a name to identify this build --with-gtk-prefix=PFX Prefix where GTK is installed (optional) --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) --with-x use the X Window System @@ -1205,7 +1208,6 @@ Some influential environment variables: CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility DIRECTFB_CFLAGS C compiler flags for DIRECTFB, overriding pkg-config @@ -1338,7 +1340,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.8.0 +wxWidgets configure 2.9.0 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1352,7 +1354,7 @@ cat >&5 <<_ACEOF 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.8.0, which was +It was created by wxWidgets $as_me 2.9.0, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1802,7 +1804,7 @@ test -n "$target_alias" && wx_major_version_number=2 -wx_minor_version_number=8 +wx_minor_version_number=9 wx_release_number=0 wx_subrelease_number=0 @@ -2178,458 +2180,22 @@ esac touch ${wx_arg_cache_file} -DEBUG_CONFIGURE=0 -if test $DEBUG_CONFIGURE = 1; then - DEFAULT_wxUSE_UNIVERSAL=no - DEFAULT_wxUSE_STL=no - - DEFAULT_wxUSE_NANOX=no - - DEFAULT_wxUSE_THREADS=yes - - DEFAULT_wxUSE_SHARED=${DEFAULT_wxUSE_SHARED:-yes} - DEFAULT_wxUSE_OPTIMISE=no - DEFAULT_wxUSE_PROFILE=no - DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_VARARG_MACROS=no - DEFAULT_wxUSE_NO_RTTI=no - DEFAULT_wxUSE_NO_EXCEPTIONS=no - DEFAULT_wxUSE_UNIVERSAL_BINARY=no - DEFAULT_wxUSE_RPATH=yes - DEFAULT_wxUSE_PERMISSIVE=no - DEFAULT_wxUSE_DEBUG_FLAG=yes - DEFAULT_wxUSE_DEBUG_INFO=yes - DEFAULT_wxUSE_DEBUG_GDB=yes - DEFAULT_wxUSE_MEM_TRACING=no - DEFAULT_wxUSE_DEBUG_CONTEXT=no - DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_APPLE_IEEE=no - - DEFAULT_wxUSE_EXCEPTIONS=no - DEFAULT_wxUSE_LOG=yes - DEFAULT_wxUSE_LOGWINDOW=no - DEFAULT_wxUSE_LOGGUI=no - DEFAULT_wxUSE_LOGDIALOG=no - - DEFAULT_wxUSE_GUI=yes - DEFAULT_wxUSE_CONTROLS=no - - DEFAULT_wxUSE_REGEX=no - DEFAULT_wxUSE_XML=no - DEFAULT_wxUSE_EXPAT=no - DEFAULT_wxUSE_ZLIB=no - DEFAULT_wxUSE_LIBPNG=no - DEFAULT_wxUSE_LIBJPEG=no - DEFAULT_wxUSE_LIBTIFF=no - DEFAULT_wxUSE_LIBXPM=no - DEFAULT_wxUSE_LIBMSPACK=no - DEFAULT_wxUSE_LIBSDL=no - DEFAULT_wxUSE_LIBGNOMEPRINT=no - DEFAULT_wxUSE_LIBGNOMEVFS=no - DEFAULT_wxUSE_LIBHILDON=no - DEFAULT_wxUSE_ODBC=no - DEFAULT_wxUSE_OPENGL=no - - DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no - DEFAULT_wxUSE_STACKWALKER=no - DEFAULT_wxUSE_DEBUGREPORT=no - DEFAULT_wxUSE_SNGLINST_CHECKER=no - DEFAULT_wxUSE_STD_IOSTREAM=no - DEFAULT_wxUSE_STD_STRING=no - DEFAULT_wxUSE_CMDLINE_PARSER=no - DEFAULT_wxUSE_DATETIME=no - DEFAULT_wxUSE_TIMER=no - DEFAULT_wxUSE_STOPWATCH=no - DEFAULT_wxUSE_FILE=no - DEFAULT_wxUSE_FFILE=no - DEFAULT_wxUSE_STDPATHS=no - DEFAULT_wxUSE_TEXTBUFFER=no - DEFAULT_wxUSE_TEXTFILE=no - DEFAULT_wxUSE_SOUND=no - DEFAULT_wxUSE_MEDIACTRL=no - DEFAULT_wxUSE_GSTREAMER8=no - DEFAULT_wxUSE_PRINTF_POS_PARAMS=no - DEFAULT_wxUSE_INTL=no - DEFAULT_wxUSE_CONFIG=no - DEFAULT_wxUSE_FONTMAP=no - DEFAULT_wxUSE_STREAMS=no - DEFAULT_wxUSE_SOCKETS=no - DEFAULT_wxUSE_OLE=no - DEFAULT_wxUSE_DATAOBJ=no - DEFAULT_wxUSE_DIALUP_MANAGER=no - DEFAULT_wxUSE_JOYSTICK=no - DEFAULT_wxUSE_DYNLIB_CLASS=no - DEFAULT_wxUSE_DYNAMIC_LOADER=no - DEFAULT_wxUSE_LONGLONG=no - DEFAULT_wxUSE_GEOMETRY=no - - DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no - DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no - DEFAULT_wxUSE_POSTSCRIPT=no - - DEFAULT_wxUSE_CLIPBOARD=no - DEFAULT_wxUSE_TOOLTIPS=no - DEFAULT_wxUSE_DRAG_AND_DROP=no - DEFAULT_wxUSE_DRAGIMAGE=no - DEFAULT_wxUSE_SPLINES=no - DEFAULT_wxUSE_MOUSEWHEEL=no - - DEFAULT_wxUSE_MDI=no - DEFAULT_wxUSE_MDI_ARCHITECTURE=no - DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no - DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no - - DEFAULT_wxUSE_RESOURCES=no - DEFAULT_wxUSE_CONSTRAINTS=no - DEFAULT_wxUSE_IPC=no - DEFAULT_wxUSE_HELP=no - DEFAULT_wxUSE_MS_HTML_HELP=no - DEFAULT_wxUSE_WXHTML_HELP=no - DEFAULT_wxUSE_TREELAYOUT=no - DEFAULT_wxUSE_METAFILE=no - DEFAULT_wxUSE_MIMETYPE=no - DEFAULT_wxUSE_SYSTEM_OPTIONS=no - DEFAULT_wxUSE_PROTOCOL=no - DEFAULT_wxUSE_PROTOCOL_HTTP=no - DEFAULT_wxUSE_PROTOCOL_FTP=no - DEFAULT_wxUSE_PROTOCOL_FILE=no - DEFAULT_wxUSE_URL=no - DEFAULT_wxUSE_VARIANT=no - - DEFAULT_wxUSE_ABOUTDLG=no - DEFAULT_wxUSE_COMMONDLGS=no - DEFAULT_wxUSE_CHOICEDLG=no - DEFAULT_wxUSE_COLOURDLG=no - DEFAULT_wxUSE_DIRDLG=no - DEFAULT_wxUSE_FILEDLG=no - DEFAULT_wxUSE_FINDREPLDLG=no - DEFAULT_wxUSE_FONTDLG=no - DEFAULT_wxUSE_MSGDLG=no - DEFAULT_wxUSE_NUMBERDLG=no - DEFAULT_wxUSE_TEXTDLG=no - DEFAULT_wxUSE_SPLASH=no - DEFAULT_wxUSE_STARTUP_TIPS=no - DEFAULT_wxUSE_PROGRESSDLG=no - DEFAULT_wxUSE_WIZARDDLG=no - - DEFAULT_wxUSE_MENUS=no - DEFAULT_wxUSE_MINIFRAME=no - DEFAULT_wxUSE_HTML=no - DEFAULT_wxUSE_RICHTEXT=no - DEFAULT_wxUSE_XRC=no - DEFAULT_wxUSE_AUI=no - DEFAULT_wxUSE_WEBKIT=no - DEFAULT_wxUSE_FILESYSTEM=no - DEFAULT_wxUSE_FS_INET=no - DEFAULT_wxUSE_FS_ZIP=no - DEFAULT_wxUSE_FS_ARCHIVE=no - DEFAULT_wxUSE_BUSYINFO=no - DEFAULT_wxUSE_ARCHIVE_STREAMS=no - DEFAULT_wxUSE_ZIPSTREAM=no - DEFAULT_wxUSE_TARSTREAM=no - DEFAULT_wxUSE_VALIDATORS=no - - DEFAULT_wxUSE_ACCEL=no - DEFAULT_wxUSE_ANIMATIONCTRL=no - DEFAULT_wxUSE_BUTTON=no - DEFAULT_wxUSE_BMPBUTTON=no - DEFAULT_wxUSE_BITMAPCOMBOBOX=no - DEFAULT_wxUSE_CALCTRL=no - DEFAULT_wxUSE_CARET=no - DEFAULT_wxUSE_CHECKBOX=no - DEFAULT_wxUSE_CHECKLST=no - DEFAULT_wxUSE_CHOICE=no - DEFAULT_wxUSE_CHOICEBOOK=no - DEFAULT_wxUSE_COLLPANE=no - DEFAULT_wxUSE_COLOURPICKERCTRL=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_COMBOCTRL=no - DEFAULT_wxUSE_DATEPICKCTRL=no - DEFAULT_wxUSE_DISPLAY=no - DEFAULT_wxUSE_DETECT_SM=no - DEFAULT_wxUSE_DIRPICKERCTRL=no - DEFAULT_wxUSE_FILEPICKERCTRL=no - DEFAULT_wxUSE_FONTPICKERCTRL=no - DEFAULT_wxUSE_GAUGE=no - DEFAULT_wxUSE_GRAPHICS_CONTEXT=no - DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_HYPERLINKCTRL=no - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=no - DEFAULT_wxUSE_LISTBOOK=no - DEFAULT_wxUSE_LISTBOX=no - DEFAULT_wxUSE_LISTCTRL=no - DEFAULT_wxUSE_NOTEBOOK=no - DEFAULT_wxUSE_ODCOMBOBOX=no - DEFAULT_wxUSE_RADIOBOX=no - DEFAULT_wxUSE_RADIOBTN=no - DEFAULT_wxUSE_SASH=no - DEFAULT_wxUSE_SCROLLBAR=no - DEFAULT_wxUSE_SLIDER=no - DEFAULT_wxUSE_SPINBTN=no - DEFAULT_wxUSE_SPINCTRL=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_STATBMP=no - DEFAULT_wxUSE_STATBOX=no - DEFAULT_wxUSE_STATLINE=no - DEFAULT_wxUSE_STATTEXT=no - DEFAULT_wxUSE_STATUSBAR=yes - DEFAULT_wxUSE_TAB_DIALOG=no - DEFAULT_wxUSE_TEXTCTRL=no - DEFAULT_wxUSE_TOGGLEBTN=no - DEFAULT_wxUSE_TOOLBAR=no - DEFAULT_wxUSE_TOOLBAR_NATIVE=no - DEFAULT_wxUSE_TREEBOOK=no - DEFAULT_wxUSE_TOOLBOOK=no - DEFAULT_wxUSE_TREECTRL=no - DEFAULT_wxUSE_POPUPWIN=no - DEFAULT_wxUSE_TIPWINDOW=no - - DEFAULT_wxUSE_UNICODE=no - DEFAULT_wxUSE_UNICODE_MSLU=no - DEFAULT_wxUSE_WCSRTOMBS=no - - DEFAULT_wxUSE_PALETTE=no - DEFAULT_wxUSE_IMAGE=no - DEFAULT_wxUSE_GIF=no - DEFAULT_wxUSE_PCX=no - DEFAULT_wxUSE_TGA=no - DEFAULT_wxUSE_PNM=no - DEFAULT_wxUSE_IFF=no - DEFAULT_wxUSE_XPM=no - DEFAULT_wxUSE_ICO_CUR=no - DEFAULT_wxUSE_ACCESSIBILITY=no - - DEFAULT_wxUSE_MONOLITHIC=no - DEFAULT_wxUSE_PLUGINS=no - DEFAULT_wxUSE_OFFICIAL_BUILD=no -else - DEFAULT_wxUSE_UNIVERSAL=no - DEFAULT_wxUSE_STL=no - - DEFAULT_wxUSE_NANOX=no - - DEFAULT_wxUSE_THREADS=yes - - DEFAULT_wxUSE_SHARED=${DEFAULT_wxUSE_SHARED:-yes} - DEFAULT_wxUSE_OPTIMISE=yes - DEFAULT_wxUSE_PROFILE=no - DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_VARARG_MACROS=yes - DEFAULT_wxUSE_NO_RTTI=no - DEFAULT_wxUSE_NO_EXCEPTIONS=no - DEFAULT_wxUSE_UNIVERSAL_BINARY=no - DEFAULT_wxUSE_RPATH=yes - DEFAULT_wxUSE_PERMISSIVE=no - DEFAULT_wxUSE_DEBUG_FLAG=no - DEFAULT_wxUSE_DEBUG_INFO=no - DEFAULT_wxUSE_DEBUG_GDB=no - DEFAULT_wxUSE_MEM_TRACING=no - DEFAULT_wxUSE_DEBUG_CONTEXT=no - DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_APPLE_IEEE=yes - - DEFAULT_wxUSE_EXCEPTIONS=yes - DEFAULT_wxUSE_LOG=yes - DEFAULT_wxUSE_LOGWINDOW=yes - DEFAULT_wxUSE_LOGGUI=yes - DEFAULT_wxUSE_LOGDIALOG=yes - - DEFAULT_wxUSE_GUI=yes - - DEFAULT_wxUSE_REGEX=yes - DEFAULT_wxUSE_XML=yes - DEFAULT_wxUSE_EXPAT=yes - DEFAULT_wxUSE_ZLIB=yes - DEFAULT_wxUSE_LIBPNG=yes - DEFAULT_wxUSE_LIBJPEG=yes - DEFAULT_wxUSE_LIBTIFF=yes - DEFAULT_wxUSE_LIBXPM=yes - DEFAULT_wxUSE_LIBMSPACK=yes - DEFAULT_wxUSE_LIBSDL=no - DEFAULT_wxUSE_LIBGNOMEPRINT=yes - DEFAULT_wxUSE_LIBGNOMEVFS=no - DEFAULT_wxUSE_LIBHILDON=no - DEFAULT_wxUSE_ODBC=no - DEFAULT_wxUSE_OPENGL=no - - DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes - DEFAULT_wxUSE_STACKWALKER=yes - DEFAULT_wxUSE_DEBUGREPORT=yes - DEFAULT_wxUSE_SNGLINST_CHECKER=yes - DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG - DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG - DEFAULT_wxUSE_CMDLINE_PARSER=yes - DEFAULT_wxUSE_DATETIME=yes - DEFAULT_wxUSE_TIMER=yes - DEFAULT_wxUSE_STOPWATCH=yes - DEFAULT_wxUSE_FILE=yes - DEFAULT_wxUSE_FFILE=yes - DEFAULT_wxUSE_STDPATHS=yes - DEFAULT_wxUSE_TEXTBUFFER=yes - DEFAULT_wxUSE_TEXTFILE=yes - DEFAULT_wxUSE_SOUND=yes - DEFAULT_wxUSE_MEDIACTRL=no - DEFAULT_wxUSE_GSTREAMER8=no - DEFAULT_wxUSE_PRINTF_POS_PARAMS=yes - DEFAULT_wxUSE_INTL=yes - DEFAULT_wxUSE_CONFIG=yes - DEFAULT_wxUSE_FONTMAP=yes - DEFAULT_wxUSE_STREAMS=yes - DEFAULT_wxUSE_SOCKETS=yes - DEFAULT_wxUSE_OLE=yes - DEFAULT_wxUSE_DATAOBJ=yes - DEFAULT_wxUSE_DIALUP_MANAGER=yes - DEFAULT_wxUSE_JOYSTICK=yes - DEFAULT_wxUSE_DYNLIB_CLASS=yes - DEFAULT_wxUSE_DYNAMIC_LOADER=yes - DEFAULT_wxUSE_LONGLONG=yes - DEFAULT_wxUSE_GEOMETRY=yes - - DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes - DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes - DEFAULT_wxUSE_POSTSCRIPT=yes - - DEFAULT_wxUSE_CLIPBOARD=yes - DEFAULT_wxUSE_TOOLTIPS=yes - DEFAULT_wxUSE_DRAG_AND_DROP=yes - DEFAULT_wxUSE_DRAGIMAGE=yes - DEFAULT_wxUSE_SPLINES=yes - DEFAULT_wxUSE_MOUSEWHEEL=yes - - DEFAULT_wxUSE_MDI=yes - DEFAULT_wxUSE_MDI_ARCHITECTURE=yes - DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes - DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes - - DEFAULT_wxUSE_RESOURCES=no - DEFAULT_wxUSE_CONSTRAINTS=yes - DEFAULT_wxUSE_IPC=yes - DEFAULT_wxUSE_HELP=yes - DEFAULT_wxUSE_MS_HTML_HELP=yes - DEFAULT_wxUSE_WXHTML_HELP=yes - DEFAULT_wxUSE_TREELAYOUT=yes - DEFAULT_wxUSE_METAFILE=yes - DEFAULT_wxUSE_MIMETYPE=yes - DEFAULT_wxUSE_SYSTEM_OPTIONS=yes - DEFAULT_wxUSE_PROTOCOL=yes - DEFAULT_wxUSE_PROTOCOL_HTTP=yes - DEFAULT_wxUSE_PROTOCOL_FTP=yes - DEFAULT_wxUSE_PROTOCOL_FILE=yes - DEFAULT_wxUSE_URL=yes - DEFAULT_wxUSE_VARIANT=yes - - DEFAULT_wxUSE_ABOUTDLG=yes - DEFAULT_wxUSE_COMMONDLGS=yes - DEFAULT_wxUSE_CHOICEDLG=yes - DEFAULT_wxUSE_COLOURDLG=yes - DEFAULT_wxUSE_DIRDLG=yes - DEFAULT_wxUSE_FILEDLG=yes - DEFAULT_wxUSE_FINDREPLDLG=yes - DEFAULT_wxUSE_FONTDLG=yes - DEFAULT_wxUSE_MSGDLG=yes - DEFAULT_wxUSE_NUMBERDLG=yes - DEFAULT_wxUSE_TEXTDLG=yes - DEFAULT_wxUSE_SPLASH=yes - DEFAULT_wxUSE_STARTUP_TIPS=yes - DEFAULT_wxUSE_PROGRESSDLG=yes - DEFAULT_wxUSE_WIZARDDLG=yes - - DEFAULT_wxUSE_MENUS=yes - DEFAULT_wxUSE_MINIFRAME=yes - DEFAULT_wxUSE_HTML=yes - DEFAULT_wxUSE_RICHTEXT=yes - DEFAULT_wxUSE_XRC=yes - DEFAULT_wxUSE_AUI=yes - DEFAULT_wxUSE_WEBKIT=yes - DEFAULT_wxUSE_FILESYSTEM=yes - DEFAULT_wxUSE_FS_INET=yes - DEFAULT_wxUSE_FS_ZIP=yes - DEFAULT_wxUSE_FS_ARCHIVE=yes - DEFAULT_wxUSE_BUSYINFO=yes - DEFAULT_wxUSE_ARCHIVE_STREAMS=yes - DEFAULT_wxUSE_ZIPSTREAM=yes - DEFAULT_wxUSE_TARSTREAM=yes - DEFAULT_wxUSE_VALIDATORS=yes - - DEFAULT_wxUSE_ACCEL=yes - DEFAULT_wxUSE_ANIMATIONCTRL=yes - DEFAULT_wxUSE_BUTTON=yes - DEFAULT_wxUSE_BMPBUTTON=yes - DEFAULT_wxUSE_BITMAPCOMBOBOX=yes - DEFAULT_wxUSE_CALCTRL=yes - DEFAULT_wxUSE_CARET=yes - DEFAULT_wxUSE_CHECKBOX=yes - DEFAULT_wxUSE_CHECKLST=yes - DEFAULT_wxUSE_CHOICE=yes - DEFAULT_wxUSE_CHOICEBOOK=yes - DEFAULT_wxUSE_COLLPANE=yes - DEFAULT_wxUSE_COLOURPICKERCTRL=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_COMBOCTRL=yes - DEFAULT_wxUSE_DATEPICKCTRL=yes - DEFAULT_wxUSE_DISPLAY=yes - DEFAULT_wxUSE_DETECT_SM=yes - DEFAULT_wxUSE_DIRPICKERCTRL=yes - DEFAULT_wxUSE_FILEPICKERCTRL=yes - DEFAULT_wxUSE_FONTPICKERCTRL=yes - DEFAULT_wxUSE_GAUGE=yes - DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_GRAPHICS_CONTEXT=no - DEFAULT_wxUSE_HYPERLINKCTRL=yes - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=yes - DEFAULT_wxUSE_LISTBOOK=yes - DEFAULT_wxUSE_LISTBOX=yes - DEFAULT_wxUSE_LISTCTRL=yes - DEFAULT_wxUSE_NOTEBOOK=yes - DEFAULT_wxUSE_ODCOMBOBOX=yes - DEFAULT_wxUSE_RADIOBOX=yes - DEFAULT_wxUSE_RADIOBTN=yes - DEFAULT_wxUSE_SASH=yes - DEFAULT_wxUSE_SCROLLBAR=yes - DEFAULT_wxUSE_SLIDER=yes - DEFAULT_wxUSE_SPINBTN=yes - DEFAULT_wxUSE_SPINCTRL=yes - DEFAULT_wxUSE_SPLITTER=yes - DEFAULT_wxUSE_STATBMP=yes - DEFAULT_wxUSE_STATBOX=yes - DEFAULT_wxUSE_STATLINE=yes - DEFAULT_wxUSE_STATTEXT=yes - DEFAULT_wxUSE_STATUSBAR=yes - DEFAULT_wxUSE_TAB_DIALOG=no - DEFAULT_wxUSE_TEXTCTRL=yes - DEFAULT_wxUSE_TOGGLEBTN=yes - DEFAULT_wxUSE_TOOLBAR=yes - DEFAULT_wxUSE_TOOLBAR_NATIVE=yes - DEFAULT_wxUSE_TREEBOOK=yes - DEFAULT_wxUSE_TOOLBOOK=yes - DEFAULT_wxUSE_TREECTRL=yes - DEFAULT_wxUSE_POPUPWIN=yes - DEFAULT_wxUSE_TIPWINDOW=yes +DEFAULT_wxUSE_ALL_FEATURES=yes - DEFAULT_wxUSE_UNICODE=no - DEFAULT_wxUSE_UNICODE_MSLU=yes - DEFAULT_wxUSE_WCSRTOMBS=no +DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG +DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG - DEFAULT_wxUSE_PALETTE=yes - DEFAULT_wxUSE_IMAGE=yes - DEFAULT_wxUSE_GIF=yes - DEFAULT_wxUSE_PCX=yes - DEFAULT_wxUSE_TGA=yes - DEFAULT_wxUSE_IFF=no DEFAULT_wxUSE_PNM=yes - DEFAULT_wxUSE_XPM=yes - DEFAULT_wxUSE_ICO_CUR=yes - DEFAULT_wxUSE_ACCESSIBILITY=no +DEFAULT_wxUSE_UNICODE_UTF8=auto +DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no +DEFAULT_wxUSE_WCSRTOMBS=no - DEFAULT_wxUSE_MONOLITHIC=no - DEFAULT_wxUSE_PLUGINS=no - DEFAULT_wxUSE_OFFICIAL_BUILD=no +DEFAULT_wxUSE_ACCESSIBILITY=no - DEFAULT_wxUSE_GTK2=yes -fi +DEFAULT_wxUSE_OFFICIAL_BUILD=no +DEFAULT_wxUSE_GTK2=yes +DEFAULT_wxUSE_OBJC_UNIQUIFYING=no for toolkit in `echo $ALL_TOOLKITS`; do @@ -2648,7 +2214,18 @@ done - enablestring= + + + enablestring=disable + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gui" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6 no_cache=0 @@ -2664,14 +2241,14 @@ if test "${enable_gui+set}" = set; then else - LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI + ac_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}" fi; @@ -2680,16 +2257,30 @@ fi; echo $ac_cv_use_gui >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GUI" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_GUI = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_GUI fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-monolithic" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6 no_cache=0 @@ -2705,14 +2296,14 @@ if test "${enable_monolithic+set}" = set; then else - LINE=`grep "wxUSE_MONOLITHIC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_monolithic='wxUSE_MONOLITHIC='$DEFAULT_wxUSE_MONOLITHIC + ac_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}" fi; @@ -2721,16 +2312,30 @@ fi; echo $ac_cv_use_monolithic >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MONOLITHIC" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MONOLITHIC = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MONOLITHIC fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-plugins" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6 no_cache=0 @@ -2746,14 +2351,14 @@ if test "${enable_plugins+set}" = set; then else - LINE=`grep "wxUSE_PLUGINS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_plugins='wxUSE_PLUGINS='$DEFAULT_wxUSE_PLUGINS + ac_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}" fi; @@ -2762,14 +2367,19 @@ fi; echo $ac_cv_use_plugins >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PLUGINS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PLUGINS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PLUGINS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + withstring=without echo "$as_me:$LINENO: checking for --${withstring:-with}-subdirs" >&5 @@ -2788,14 +2398,14 @@ if test "${with_subdirs+set}" = set; then else - LINE=`grep "wxWITH_SUBDIRS" ${wx_arg_cache_file}` + 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 + ac_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$wxUSE_ALL_FEATURES}" fi; @@ -2804,19 +2414,159 @@ fi; 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 + if test x"$withstring" = xwithout; then + if test $wxWITH_SUBDIRS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxWITH_SUBDIRS + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + +# Check whether --with-flavour or --without-flavour was given. +if test "${with_flavour+set}" = set; then + withval="$with_flavour" + WX_FLAVOUR="$withval" +fi; + + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-official_build or --disable-official_build was given. +if test "${enable_official_build+set}" = set; then + enableval="$enable_official_build" + + if test "$enableval" = yes; then + ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes' + else + ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' + fi + +else + + LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}" + +fi; + + eval "$ac_cv_use_official_build" + if test "$no_cache" != 1; then + echo $ac_cv_use_official_build >> ${wx_arg_cache_file}.tmp fi + if test x"$enablestring" = xdisable; then + if test $wxUSE_OFFICIAL_BUILD = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_OFFICIAL_BUILD + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + +# Check whether --enable-vendor or --disable-vendor was given. +if test "${enable_vendor+set}" = set; then + enableval="$enable_vendor" + VENDOR="$enableval" +fi; +if test "x$VENDOR" = "x"; then + VENDOR="custom" +fi + + + enablestring=disable + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-all_features" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-all_features... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-all_features or --disable-all_features was given. +if test "${enable_all_features+set}" = set; then + enableval="$enable_all_features" + + if test "$enableval" = yes; then + ac_cv_use_all_features='wxUSE_ALL_FEATURES=yes' + else + ac_cv_use_all_features='wxUSE_ALL_FEATURES=no' + fi + +else + + LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}" + +fi; + + eval "$ac_cv_use_all_features" + if test "$no_cache" != 1; then + echo $ac_cv_use_all_features >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_ALL_FEATURES = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_ALL_FEATURES + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + if test "$wxUSE_GUI" = "yes"; then enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6 no_cache=0 @@ -2832,14 +2582,14 @@ if test "${enable_universal+set}" = set; then else - LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL + ac_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}" fi; @@ -2848,14 +2598,28 @@ fi; echo $ac_cv_use_universal >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_UNIVERSAL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_UNIVERSAL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_UNIVERSAL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + +if test "$wxUSE_UNIVERSAL" = "yes"; then + +# Check whether --with-themes or --without-themes was given. +if test "${with_themes+set}" = set; then + withval="$with_themes" + wxUNIV_THEMES="$withval" +fi; +fi + # Check whether --with-gtk or --without-gtk was given. if test "${with_gtk+set}" = set; then @@ -2924,6 +2688,15 @@ if test "${with_x11+set}" = set; then fi; enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-nanox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6 no_cache=0 @@ -2939,14 +2712,14 @@ if test "${enable_nanox+set}" = set; then else - LINE=`grep "wxUSE_NANOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_nanox='wxUSE_NANOX='$DEFAULT_wxUSE_NANOX + ac_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}" fi; @@ -2955,14 +2728,19 @@ fi; echo $ac_cv_use_nanox >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NANOX" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_NANOX = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_NANOX fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + # Check whether --enable-gtk2 or --disable-gtk2 was given. if test "${enable_gtk2+set}" = set; then @@ -2971,6 +2749,15 @@ if test "${enable_gtk2+set}" = set; then fi; enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6 no_cache=0 @@ -2986,14 +2773,14 @@ if test "${enable_gpe+set}" = set; then else - LINE=`grep "wxUSE_GPE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_gpe='wxUSE_GPE='$DEFAULT_wxUSE_GPE + ac_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}" fi; @@ -3002,14 +2789,20 @@ fi; echo $ac_cv_use_gpe >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GPE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_GPE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_GPE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + echo "$as_me:$LINENO: checking for --with-libpng" >&5 @@ -3036,14 +2829,14 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or else - LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG + ac_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}" fi; @@ -3095,14 +2888,14 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o else - LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG + ac_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}" fi; @@ -3154,14 +2947,14 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o else - LINE=`grep "wxUSE_LIBTIFF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF + ac_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}" fi; @@ -3213,14 +3006,14 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or else - LINE=`grep "wxUSE_LIBXPM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_libxpm='wxUSE_LIBXPM='$DEFAULT_wxUSE_LIBXPM + ac_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}" fi; @@ -3265,14 +3058,14 @@ if test "${with_libmspack+set}" = set; then else - LINE=`grep "wxUSE_LIBMSPACK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_libmspack='wxUSE_LIBMSPACK='$DEFAULT_wxUSE_LIBMSPACK + ac_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$wxUSE_ALL_FEATURES}" fi; @@ -3281,14 +3074,19 @@ fi; echo $ac_cv_use_libmspack >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBMSPACK" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBMSPACK = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LIBMSPACK fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + withstring= echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5 @@ -3307,14 +3105,14 @@ if test "${with_sdl+set}" = set; then else - LINE=`grep "wxUSE_LIBSDL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_sdl='wxUSE_LIBSDL='$DEFAULT_wxUSE_LIBSDL + ac_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$wxUSE_ALL_FEATURES}" fi; @@ -3323,16 +3121,21 @@ fi; echo $ac_cv_use_sdl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBSDL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBSDL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LIBSDL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - withstring= + + withstring=without echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5 echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6 no_cache=0 @@ -3349,14 +3152,14 @@ if test "${with_gnomeprint+set}" = set; then else - LINE=`grep "wxUSE_LIBGNOMEPRINT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT='$DEFAULT_wxUSE_LIBGNOMEPRINT + ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$wxUSE_ALL_FEATURES}" fi; @@ -3365,14 +3168,19 @@ fi; echo $ac_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBGNOMEPRINT" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBGNOMEPRINT = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LIBGNOMEPRINT fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + withstring= echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomevfs" >&5 @@ -3391,14 +3199,14 @@ if test "${with_gnomevfs+set}" = set; then else - LINE=`grep "wxUSE_LIBGNOMEVFS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS='$DEFAULT_wxUSE_LIBGNOMEVFS + ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$wxUSE_ALL_FEATURES}" fi; @@ -3407,14 +3215,19 @@ fi; echo $ac_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBGNOMEVFS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBGNOMEVFS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LIBGNOMEVFS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + withstring= echo "$as_me:$LINENO: checking for --${withstring:-with}-hildon" >&5 @@ -3433,14 +3246,14 @@ if test "${with_hildon+set}" = set; then else - LINE=`grep "wxUSE_LIBHILDON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_hildon='wxUSE_LIBHILDON='$DEFAULT_wxUSE_LIBHILDON + ac_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$wxUSE_ALL_FEATURES}" fi; @@ -3449,14 +3262,19 @@ fi; echo $ac_cv_use_hildon >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBHILDON" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBHILDON = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LIBHILDON fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + withstring= echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5 @@ -3475,14 +3293,14 @@ if test "${with_opengl+set}" = set; then else - LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL + ac_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$wxUSE_ALL_FEATURES}" fi; @@ -3491,23 +3309,19 @@ fi; echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_OPENGL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$withstring" = xwithout; then + if test $wxUSE_OPENGL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_OPENGL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -if test "$wxUSE_UNIVERSAL" = "yes"; then - -# Check whether --with-themes or --without-themes was given. -if test "${with_themes+set}" = set; then - withval="$with_themes" - wxUNIV_THEMES="$withval" -fi; -fi fi @@ -3529,14 +3343,14 @@ if test "${with_dmalloc+set}" = set; then else - LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC + ac_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$wxUSE_ALL_FEATURES}" fi; @@ -3545,14 +3359,19 @@ fi; echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DMALLOC" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$withstring" = xwithout; then + if test $wxUSE_DMALLOC = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DMALLOC fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + echo "$as_me:$LINENO: checking for --with-regex" >&5 echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6 @@ -3578,14 +3397,14 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or else - LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX + ac_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}" fi; @@ -3637,14 +3456,14 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b else - LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB + ac_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}" fi; @@ -3696,14 +3515,14 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b else - LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC + ac_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}" fi; @@ -3755,14 +3574,14 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or else - LINE=`grep "wxUSE_EXPAT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_expat='wxUSE_EXPAT='$DEFAULT_wxUSE_EXPAT + ac_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}" fi; @@ -3792,7 +3611,16 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or - enablestring= + enablestring=disable + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6 no_cache=0 @@ -3808,14 +3636,14 @@ if test "${enable_shared+set}" = set; then else - LINE=`grep "wxUSE_SHARED" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED + ac_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" fi; @@ -3824,16 +3652,30 @@ fi; echo $ac_cv_use_shared >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SHARED" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SHARED = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SHARED fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6 no_cache=0 @@ -3849,14 +3691,14 @@ if test "${enable_optimise+set}" = set; then else - LINE=`grep "wxUSE_OPTIMISE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE + ac_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" fi; @@ -3865,16 +3707,30 @@ fi; echo $ac_cv_use_optimise >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_OPTIMISE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_OPTIMISE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_OPTIMISE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6 no_cache=0 @@ -3890,14 +3746,14 @@ if test "${enable_debug+set}" = set; then else - LINE=`grep "wxUSE_DEBUG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_debug='wxUSE_DEBUG='$DEFAULT_wxUSE_DEBUG + ac_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}" fi; @@ -3906,16 +3762,30 @@ fi; echo $ac_cv_use_debug >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DEBUG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6 no_cache=0 @@ -3931,14 +3801,14 @@ if test "${enable_stl+set}" = set; then else - LINE=`grep "wxUSE_STL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_stl='wxUSE_STL='$DEFAULT_wxUSE_STL + ac_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}" fi; @@ -3947,18 +3817,394 @@ fi; echo $ac_cv_use_stl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STL + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-std_iostreams or --disable-std_iostreams was given. +if test "${enable_std_iostreams+set}" = set; then + enableval="$enable_std_iostreams" + + if test "$enableval" = yes; then + ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' + else + ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' + fi + +else + + LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}" + +fi; + + eval "$ac_cv_use_std_iostreams" + if test "$no_cache" != 1; then + echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_STD_IOSTREAM = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_STD_IOSTREAM + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-std_string or --disable-std_string was given. +if test "${enable_std_string+set}" = set; then + enableval="$enable_std_string" + + if test "$enableval" = yes; then + ac_cv_use_std_string='wxUSE_STD_STRING=yes' + else + ac_cv_use_std_string='wxUSE_STD_STRING=no' + fi + +else + + LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}" + +fi; + + eval "$ac_cv_use_std_string" + if test "$no_cache" != 1; then + echo $ac_cv_use_std_string >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_STD_STRING = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_STD_STRING + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring=disable + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-unicode or --disable-unicode was given. +if test "${enable_unicode+set}" = set; then + enableval="$enable_unicode" + + if test "$enableval" = yes; then + ac_cv_use_unicode='wxUSE_UNICODE=yes' + else + ac_cv_use_unicode='wxUSE_UNICODE=no' + fi + +else + + LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}" + +fi; + + eval "$ac_cv_use_unicode" + if test "$no_cache" != 1; then + echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_UNICODE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_UNICODE + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-mslu or --disable-mslu was given. +if test "${enable_mslu+set}" = set; then + enableval="$enable_mslu" + + if test "$enableval" = yes; then + ac_cv_use_mslu='wxUSE_UNICODE_MSLU=yes' + else + ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no' + fi + +else + + LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}" + +fi; + + eval "$ac_cv_use_mslu" + if test "$no_cache" != 1; then + echo $ac_cv_use_mslu >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_UNICODE_MSLU = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_UNICODE_MSLU + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring= + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-utf8 or --disable-utf8 was given. +if test "${enable_utf8+set}" = set; then + enableval="$enable_utf8" + + wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'" + +else + + LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8 + +fi; + + eval "$wx_cv_use_utf8" + if test "$no_cache" != 1; then + echo $wx_cv_use_utf8 >> ${wx_arg_cache_file}.tmp + fi + + echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5 +echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6 + + + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8only" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-utf8only or --disable-utf8only was given. +if test "${enable_utf8only+set}" = set; then + enableval="$enable_utf8only" + + if test "$enableval" = yes; then + ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes' + else + ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no' + fi + +else + + LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}" + +fi; + + eval "$ac_cv_use_utf8only" + if test "$no_cache" != 1; then + echo $ac_cv_use_utf8only >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_UNICODE_UTF8_LOCALE + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-extended_rtti" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-extended_rtti or --disable-extended_rtti was given. +if test "${enable_extended_rtti+set}" = set; then + enableval="$enable_extended_rtti" + + if test "$enableval" = yes; then + ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes' + else + ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no' + fi + +else + + LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}" + +fi; + + eval "$ac_cv_use_extended_rtti" + if test "$no_cache" != 1; then + echo $ac_cv_use_extended_rtti >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_EXTENDED_RTTI = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_EXTENDED_RTTI + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + if test "$USE_OS2" = "1"; then DEFAULT_wxUSE_OMF=no enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6 no_cache=0 @@ -3974,14 +4220,14 @@ if test "${enable_omf+set}" = set; then else - LINE=`grep "wxUSE_OMF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_omf='wxUSE_OMF='$DEFAULT_wxUSE_OMF + ac_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}" fi; @@ -3990,14 +4236,19 @@ fi; echo $ac_cv_use_omf >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_OMF" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_OMF = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_OMF fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + fi if test "$wxUSE_DEBUG" = "yes"; then @@ -4012,6 +4263,15 @@ fi enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6 no_cache=0 @@ -4027,14 +4287,14 @@ if test "${enable_debug_flag+set}" = set; then else - LINE=`grep "wxUSE_DEBUG_FLAG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG + ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" fi; @@ -4043,16 +4303,30 @@ fi; echo $ac_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUG_FLAG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_FLAG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DEBUG_FLAG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6 no_cache=0 @@ -4068,14 +4342,14 @@ if test "${enable_debug_info+set}" = set; then else - LINE=`grep "wxUSE_DEBUG_INFO" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO + ac_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" fi; @@ -4084,16 +4358,30 @@ fi; echo $ac_cv_use_debug_info >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUG_INFO" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_INFO = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DEBUG_INFO fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6 no_cache=0 @@ -4109,14 +4397,14 @@ if test "${enable_debug_gdb+set}" = set; then else - LINE=`grep "wxUSE_DEBUG_GDB" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB='$DEFAULT_wxUSE_DEBUG_GDB + ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" fi; @@ -4125,16 +4413,30 @@ fi; echo $ac_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUG_GDB" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_GDB = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DEBUG_GDB fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6 no_cache=0 @@ -4150,14 +4452,14 @@ if test "${enable_debug_cntxt+set}" = set; then else - LINE=`grep "wxUSE_DEBUG_CONTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT='$DEFAULT_wxUSE_DEBUG_CONTEXT + ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" fi; @@ -4166,16 +4468,30 @@ fi; echo $ac_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUG_CONTEXT" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_CONTEXT = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DEBUG_CONTEXT fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6 no_cache=0 @@ -4191,14 +4507,14 @@ if test "${enable_mem_tracing+set}" = set; then else - LINE=`grep "wxUSE_MEM_TRACING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING + ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" fi; @@ -4207,16 +4523,30 @@ fi; echo $ac_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MEM_TRACING" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MEM_TRACING = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MEM_TRACING fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-profile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6 no_cache=0 @@ -4232,14 +4562,14 @@ if test "${enable_profile+set}" = set; then else - LINE=`grep "wxUSE_PROFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE + ac_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}" fi; @@ -4248,16 +4578,30 @@ fi; echo $ac_cv_use_profile >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROFILE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROFILE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PROFILE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_rtti" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6 no_cache=0 @@ -4273,14 +4617,14 @@ if test "${enable_no_rtti+set}" = set; then else - LINE=`grep "wxUSE_NO_RTTI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_no_rtti='wxUSE_NO_RTTI='$DEFAULT_wxUSE_NO_RTTI + ac_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}" fi; @@ -4289,16 +4633,30 @@ fi; echo $ac_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NO_RTTI" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_NO_RTTI = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_NO_RTTI fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_exceptions" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >&6 no_cache=0 @@ -4314,14 +4672,14 @@ if test "${enable_no_exceptions+set}" = set; then else - LINE=`grep "wxUSE_NO_EXCEPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS='$DEFAULT_wxUSE_NO_EXCEPTIONS + ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}" fi; @@ -4330,16 +4688,30 @@ fi; echo $ac_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NO_EXCEPTIONS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_NO_EXCEPTIONS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_NO_EXCEPTIONS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-permissive" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6 no_cache=0 @@ -4355,14 +4727,14 @@ if test "${enable_permissive+set}" = set; then else - LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_permissive='wxUSE_PERMISSIVE='$DEFAULT_wxUSE_PERMISSIVE + ac_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}" fi; @@ -4371,16 +4743,30 @@ fi; echo $ac_cv_use_permissive >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PERMISSIVE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PERMISSIVE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PERMISSIVE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_deps" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6 no_cache=0 @@ -4396,14 +4782,14 @@ if test "${enable_no_deps+set}" = set; then else - LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_no_deps='wxUSE_NO_DEPS='$DEFAULT_wxUSE_NO_DEPS + ac_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}" fi; @@ -4412,16 +4798,30 @@ fi; echo $ac_cv_use_no_deps >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NO_DEPS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_NO_DEPS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_NO_DEPS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring=disable + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-vararg_macros" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6 no_cache=0 @@ -4437,14 +4837,14 @@ if test "${enable_vararg_macros+set}" = set; then else - LINE=`grep "wxUSE_VARARG_MACROS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS='$DEFAULT_wxUSE_VARARG_MACROS + ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}" fi; @@ -4453,14 +4853,19 @@ fi; echo $ac_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_VARARG_MACROS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_VARARG_MACROS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_VARARG_MACROS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5 @@ -4474,15 +4879,15 @@ if test "${enable_universal_binary+set}" = set; then else - LINE=`grep "wxUSE_UNIVERSAL_BINARY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" - wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY else no_cache=1 - wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY=no" fi + wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY + fi; eval "$wx_cv_use_universal_binary" @@ -4495,90 +4900,127 @@ echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6 - enablestring=enable - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat24" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-compat24... $ECHO_C" >&6 + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat26" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6 no_cache=0 - # Check whether --enable-compat24 or --disable-compat24 was given. -if test "${enable_compat24+set}" = set; then - enableval="$enable_compat24" + # Check whether --enable-compat26 or --disable-compat26 was given. +if test "${enable_compat26+set}" = set; then + enableval="$enable_compat26" if test "$enableval" = yes; then - ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=yes' + ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes' else - ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=no' + ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no' fi else - LINE=`grep "WXWIN_COMPATIBILITY_2_4" ${wx_arg_cache_file}` + LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4='$DEFAULT_WXWIN_COMPATIBILITY_2_4 + ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}" fi; - eval "$ac_cv_use_compat24" + eval "$ac_cv_use_compat26" if test "$no_cache" != 1; then - echo $ac_cv_use_compat24 >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_compat26 >> ${wx_arg_cache_file}.tmp fi - if test "$WXWIN_COMPATIBILITY_2_4" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $WXWIN_COMPATIBILITY_2_6 = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$WXWIN_COMPATIBILITY_2_6 fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring=disable - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat26" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6 + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat28" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6 no_cache=0 - # Check whether --enable-compat26 or --disable-compat26 was given. -if test "${enable_compat26+set}" = set; then - enableval="$enable_compat26" + # Check whether --enable-compat28 or --disable-compat28 was given. +if test "${enable_compat28+set}" = set; then + enableval="$enable_compat28" if test "$enableval" = yes; then - ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes' + ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes' else - ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no' + ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no' fi else - LINE=`grep "WXWIN_COMPATIBILITY_2_6" ${wx_arg_cache_file}` + LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6='$DEFAULT_WXWIN_COMPATIBILITY_2_6 + ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" fi; - eval "$ac_cv_use_compat26" + eval "$ac_cv_use_compat28" if test "$no_cache" != 1; then - echo $ac_cv_use_compat26 >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_compat28 >> ${wx_arg_cache_file}.tmp fi - if test "$WXWIN_COMPATIBILITY_2_6" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $WXWIN_COMPATIBILITY_2_8 = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$WXWIN_COMPATIBILITY_2_8 fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= + + enablestring=disable + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6 no_cache=0 @@ -4594,14 +5036,14 @@ if test "${enable_rpath+set}" = set; then else - LINE=`grep "wxUSE_RPATH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_rpath='wxUSE_RPATH='$DEFAULT_wxUSE_RPATH + ac_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}" fi; @@ -4610,19 +5052,88 @@ fi; echo $ac_cv_use_rpath >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_RPATH" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_RPATH = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_RPATH + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + + enablestring= + defaultval= + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-objc_uniquifying" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-objc_uniquifying or --disable-objc_uniquifying was given. +if test "${enable_objc_uniquifying+set}" = set; then + enableval="$enable_objc_uniquifying" + + if test "$enableval" = yes; then + ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes' + else + ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no' + fi + +else + + LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}" + +fi; + + eval "$ac_cv_use_objc_uniquifying" + if test "$no_cache" != 1; then + echo $ac_cv_use_objc_uniquifying >> ${wx_arg_cache_file}.tmp fi + if test x"$enablestring" = xdisable; then + if test $wxUSE_OBJC_UNIQUIFYING = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_OBJC_UNIQUIFYING + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-intl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6 no_cache=0 @@ -4638,14 +5149,14 @@ if test "${enable_intl+set}" = set; then else - LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL + ac_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}" fi; @@ -4654,16 +5165,30 @@ fi; echo $ac_cv_use_intl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_INTL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_INTL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_INTL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-config" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6 no_cache=0 @@ -4679,14 +5204,14 @@ if test "${enable_config+set}" = set; then else - LINE=`grep "wxUSE_CONFIG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG + ac_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}" fi; @@ -4695,17 +5220,31 @@ fi; echo $ac_cv_use_config >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CONFIG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CONFIG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CONFIG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocols" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6 no_cache=0 @@ -4721,14 +5260,14 @@ if test "${enable_protocols+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_protocols='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL + ac_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi; @@ -4737,16 +5276,30 @@ fi; echo $ac_cv_use_protocols >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PROTOCOL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ftp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6 no_cache=0 @@ -4762,14 +5315,14 @@ if test "${enable_ftp+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP + ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi; @@ -4778,16 +5331,30 @@ fi; echo $ac_cv_use_ftp >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_FTP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_FTP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PROTOCOL_FTP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-http" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6 no_cache=0 @@ -4803,14 +5370,14 @@ if test "${enable_http+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP + ac_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi; @@ -4819,16 +5386,30 @@ fi; echo $ac_cv_use_http >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_HTTP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_HTTP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PROTOCOL_HTTP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fileproto" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6 no_cache=0 @@ -4844,14 +5425,14 @@ if test "${enable_fileproto+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE + ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi; @@ -4860,16 +5441,30 @@ fi; echo $ac_cv_use_fileproto >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_FILE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_FILE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PROTOCOL_FILE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sockets" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6 no_cache=0 @@ -4885,14 +5480,14 @@ if test "${enable_sockets+set}" = set; then else - LINE=`grep "wxUSE_SOCKETS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_sockets='wxUSE_SOCKETS='$DEFAULT_wxUSE_SOCKETS + ac_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}" fi; @@ -4901,16 +5496,30 @@ fi; echo $ac_cv_use_sockets >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SOCKETS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SOCKETS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SOCKETS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ole" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6 no_cache=0 @@ -4926,14 +5535,14 @@ if test "${enable_ole+set}" = set; then else - LINE=`grep "wxUSE_OLE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_ole='wxUSE_OLE='$DEFAULT_wxUSE_OLE + ac_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}" fi; @@ -4942,16 +5551,30 @@ fi; echo $ac_cv_use_ole >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_OLE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_OLE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_OLE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataobj" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6 no_cache=0 @@ -4967,14 +5590,14 @@ if test "${enable_dataobj+set}" = set; then else - LINE=`grep "wxUSE_DATAOBJ" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dataobj='wxUSE_DATAOBJ='$DEFAULT_wxUSE_DATAOBJ + ac_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}" fi; @@ -4983,17 +5606,31 @@ fi; echo $ac_cv_use_dataobj >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DATAOBJ" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DATAOBJ = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DATAOBJ fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6 no_cache=0 @@ -5009,14 +5646,14 @@ if test "${enable_ipc+set}" = set; then else - LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC + ac_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}" fi; @@ -5025,17 +5662,31 @@ fi; echo $ac_cv_use_ipc >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_IPC" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_IPC = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_IPC fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6 no_cache=0 @@ -5051,14 +5702,14 @@ if test "${enable_apple_ieee+set}" = set; then else - LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE + ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}" fi; @@ -5067,16 +5718,30 @@ fi; echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_APPLE_IEEE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_APPLE_IEEE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_APPLE_IEEE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arcstream" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6 no_cache=0 @@ -5092,14 +5757,14 @@ if test "${enable_arcstream+set}" = set; then else - LINE=`grep "wxUSE_ARCHIVE_STREAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS='$DEFAULT_wxUSE_ARCHIVE_STREAMS + ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}" fi; @@ -5108,16 +5773,85 @@ fi; echo $ac_cv_use_arcstream >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ARCHIVE_STREAMS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_ARCHIVE_STREAMS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_ARCHIVE_STREAMS + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-base64" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-base64... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-base64 or --disable-base64 was given. +if test "${enable_base64+set}" = set; then + enableval="$enable_base64" + + if test "$enableval" = yes; then + ac_cv_use_base64='wxUSE_BASE64=yes' + else + ac_cv_use_base64='wxUSE_BASE64=no' + fi + +else + + LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}" + +fi; + + eval "$ac_cv_use_base64" + if test "$no_cache" != 1; then + echo $ac_cv_use_base64 >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_BASE64 = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_BASE64 fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6 no_cache=0 @@ -5133,14 +5867,14 @@ if test "${enable_backtrace+set}" = set; then else - LINE=`grep "wxUSE_STACKWALKER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_backtrace='wxUSE_STACKWALKER='$DEFAULT_wxUSE_STACKWALKER + ac_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}" fi; @@ -5149,16 +5883,30 @@ fi; echo $ac_cv_use_backtrace >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STACKWALKER" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STACKWALKER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STACKWALKER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6 no_cache=0 @@ -5174,14 +5922,14 @@ if test "${enable_catch_segvs+set}" = set; then else - LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION + ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}" fi; @@ -5190,16 +5938,30 @@ fi; echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_ON_FATAL_EXCEPTION = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_ON_FATAL_EXCEPTION fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6 no_cache=0 @@ -5215,14 +5977,14 @@ if test "${enable_cmdline+set}" = set; then else - LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER + ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}" fi; @@ -5231,16 +5993,30 @@ fi; echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CMDLINE_PARSER" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CMDLINE_PARSER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CMDLINE_PARSER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6 no_cache=0 @@ -5256,14 +6032,14 @@ if test "${enable_datetime+set}" = set; then else - LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME + ac_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}" fi; @@ -5272,16 +6048,30 @@ fi; echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DATETIME" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DATETIME = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DATETIME fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debugreport" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6 no_cache=0 @@ -5297,14 +6087,14 @@ if test "${enable_debugreport+set}" = set; then else - LINE=`grep "wxUSE_DEBUGREPORT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_debugreport='wxUSE_DEBUGREPORT='$DEFAULT_wxUSE_DEBUGREPORT + ac_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}" fi; @@ -5313,16 +6103,30 @@ fi; echo $ac_cv_use_debugreport >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUGREPORT" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUGREPORT = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DEBUGREPORT fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6 no_cache=0 @@ -5338,14 +6142,14 @@ if test "${enable_dialupman+set}" = set; then else - LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER + ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}" fi; @@ -5354,16 +6158,30 @@ fi; echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DIALUP_MANAGER" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DIALUP_MANAGER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DIALUP_MANAGER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynlib" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6 no_cache=0 @@ -5379,14 +6197,14 @@ if test "${enable_dynlib+set}" = set; then else - LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS + ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}" fi; @@ -5395,16 +6213,30 @@ fi; echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DYNLIB_CLASS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DYNLIB_CLASS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DYNLIB_CLASS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynamicloader" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6 no_cache=0 @@ -5420,14 +6252,14 @@ if test "${enable_dynamicloader+set}" = set; then else - LINE=`grep "wxUSE_DYNAMIC_LOADER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER='$DEFAULT_wxUSE_DYNAMIC_LOADER + ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}" fi; @@ -5436,16 +6268,30 @@ fi; echo $ac_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DYNAMIC_LOADER" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DYNAMIC_LOADER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DYNAMIC_LOADER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-exceptions" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6 no_cache=0 @@ -5461,14 +6307,14 @@ if test "${enable_exceptions+set}" = set; then else - LINE=`grep "wxUSE_EXCEPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_exceptions='wxUSE_EXCEPTIONS='$DEFAULT_wxUSE_EXCEPTIONS + ac_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}" fi; @@ -5477,16 +6323,30 @@ fi; echo $ac_cv_use_exceptions >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_EXCEPTIONS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_EXCEPTIONS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_EXCEPTIONS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6 no_cache=0 @@ -5502,14 +6362,14 @@ if test "${enable_ffile+set}" = set; then else - LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE + ac_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}" fi; @@ -5518,16 +6378,30 @@ fi; echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FFILE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FFILE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FFILE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6 no_cache=0 @@ -5543,14 +6417,14 @@ if test "${enable_file+set}" = set; then else - LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE + ac_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}" fi; @@ -5559,16 +6433,30 @@ fi; echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FILE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FILE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6 no_cache=0 @@ -5584,14 +6472,14 @@ if test "${enable_filesystem+set}" = set; then else - LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM + ac_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}" fi; @@ -5600,16 +6488,30 @@ fi; echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FILESYSTEM" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILESYSTEM = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FILESYSTEM fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6 no_cache=0 @@ -5625,14 +6527,14 @@ if test "${enable_fontmap+set}" = set; then else - LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP + ac_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}" fi; @@ -5641,16 +6543,30 @@ fi; echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FONTMAP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FONTMAP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FONTMAP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_archive" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6 no_cache=0 @@ -5666,14 +6582,14 @@ if test "${enable_fs_archive+set}" = set; then else - LINE=`grep "wxUSE_FS_ARCHIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE='$DEFAULT_wxUSE_FS_ARCHIVE + ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}" fi; @@ -5682,16 +6598,30 @@ fi; echo $ac_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FS_ARCHIVE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FS_ARCHIVE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FS_ARCHIVE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6 no_cache=0 @@ -5707,14 +6637,14 @@ if test "${enable_fs_inet+set}" = set; then else - LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET + ac_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}" fi; @@ -5723,16 +6653,30 @@ fi; echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FS_INET" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FS_INET = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FS_INET fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6 no_cache=0 @@ -5748,14 +6692,14 @@ if test "${enable_fs_zip+set}" = set; then else - LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP + ac_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}" fi; @@ -5764,16 +6708,30 @@ fi; echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FS_ZIP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FS_ZIP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FS_ZIP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6 no_cache=0 @@ -5789,14 +6747,14 @@ if test "${enable_geometry+set}" = set; then else - LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY + ac_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}" fi; @@ -5805,16 +6763,30 @@ fi; echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GEOMETRY" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_GEOMETRY = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_GEOMETRY fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6 no_cache=0 @@ -5830,14 +6802,14 @@ if test "${enable_log+set}" = set; then else - LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG + ac_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}" fi; @@ -5846,16 +6818,30 @@ fi; echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LOG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_LOG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LOG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6 no_cache=0 @@ -5871,14 +6857,14 @@ if test "${enable_longlong+set}" = set; then else - LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG + ac_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}" fi; @@ -5887,16 +6873,30 @@ fi; echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LONGLONG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_LONGLONG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LONGLONG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6 no_cache=0 @@ -5912,14 +6912,14 @@ if test "${enable_mimetype+set}" = set; then else - LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE + ac_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}" fi; @@ -5928,57 +6928,30 @@ fi; echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MIMETYPE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MIMETYPE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MIMETYPE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-mslu or --disable-mslu was given. -if test "${enable_mslu+set}" = set; then - enableval="$enable_mslu" - - if test "$enableval" = yes; then - ac_cv_use_mslu='wxUSE_UNICODE_MSLU=yes' - else - ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no' - fi - -else - - LINE=`grep "wxUSE_UNICODE_MSLU" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_mslu='wxUSE_UNICODE_MSLU='$DEFAULT_wxUSE_UNICODE_MSLU - -fi; - - eval "$ac_cv_use_mslu" - if test "$no_cache" != 1; then - echo $ac_cv_use_mslu >> ${wx_arg_cache_file}.tmp - fi - if test "$wxUSE_UNICODE_MSLU" = 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 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi fi - - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6 no_cache=0 @@ -5994,14 +6967,14 @@ if test "${enable_snglinst+set}" = set; then else - LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER + ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}" fi; @@ -6010,98 +6983,30 @@ fi; echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SNGLINST_CHECKER" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SNGLINST_CHECKER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - - - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-std_iostreams or --disable-std_iostreams was given. -if test "${enable_std_iostreams+set}" = set; then - enableval="$enable_std_iostreams" - - if test "$enableval" = yes; then - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' - else - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' - fi - -else - - LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM - -fi; - - eval "$ac_cv_use_std_iostreams" - if test "$no_cache" != 1; then - echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp + result=$wxUSE_SNGLINST_CHECKER fi - if test "$wxUSE_STD_IOSTREAM" = 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 + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-std_string or --disable-std_string was given. -if test "${enable_std_string+set}" = set; then - enableval="$enable_std_string" - - if test "$enableval" = yes; then - ac_cv_use_std_string='wxUSE_STD_STRING=yes' - else - ac_cv_use_std_string='wxUSE_STD_STRING=no' - fi - -else - - LINE=`grep "wxUSE_STD_STRING" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_std_string='wxUSE_STD_STRING='$DEFAULT_wxUSE_STD_STRING - -fi; - - eval "$ac_cv_use_std_string" - if test "$no_cache" != 1; then - echo $ac_cv_use_std_string >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_STD_STRING" = 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 + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi fi - - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6 no_cache=0 @@ -6117,14 +7022,14 @@ if test "${enable_stdpaths+set}" = set; then else - LINE=`grep "wxUSE_STDPATHS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_stdpaths='wxUSE_STDPATHS='$DEFAULT_wxUSE_STDPATHS + ac_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}" fi; @@ -6133,16 +7038,30 @@ fi; echo $ac_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STDPATHS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STDPATHS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STDPATHS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6 no_cache=0 @@ -6158,14 +7077,14 @@ if test "${enable_stopwatch+set}" = set; then else - LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH + ac_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}" fi; @@ -6174,16 +7093,30 @@ fi; echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STOPWATCH" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STOPWATCH = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STOPWATCH fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6 no_cache=0 @@ -6199,14 +7132,14 @@ if test "${enable_streams+set}" = set; then else - LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS + ac_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}" fi; @@ -6215,16 +7148,30 @@ fi; echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STREAMS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STREAMS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STREAMS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6 no_cache=0 @@ -6240,14 +7187,14 @@ if test "${enable_system_options+set}" = set; then else - LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS + ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" fi; @@ -6256,16 +7203,30 @@ fi; echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SYSTEM_OPTIONS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SYSTEM_OPTIONS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SYSTEM_OPTIONS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tarstream" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6 no_cache=0 @@ -6281,14 +7242,14 @@ if test "${enable_tarstream+set}" = set; then else - LINE=`grep "wxUSE_TARSTREAM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_tarstream='wxUSE_TARSTREAM='$DEFAULT_wxUSE_TARSTREAM + ac_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}" fi; @@ -6297,16 +7258,30 @@ fi; echo $ac_cv_use_tarstream >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TARSTREAM" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TARSTREAM = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TARSTREAM fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6 no_cache=0 @@ -6322,14 +7297,14 @@ if test "${enable_textbuf+set}" = set; then else - LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER + ac_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}" fi; @@ -6338,16 +7313,30 @@ fi; echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TEXTBUFFER" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TEXTBUFFER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TEXTBUFFER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6 no_cache=0 @@ -6363,14 +7352,14 @@ if test "${enable_textfile+set}" = set; then else - LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE + ac_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}" fi; @@ -6379,16 +7368,30 @@ fi; echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TEXTFILE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TEXTFILE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TEXTFILE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6 no_cache=0 @@ -6404,14 +7407,14 @@ if test "${enable_timer+set}" = set; then else - LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER + ac_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}" fi; @@ -6420,57 +7423,30 @@ fi; echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TIMER" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TIMER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TIMER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-unicode or --disable-unicode was given. -if test "${enable_unicode+set}" = set; then - enableval="$enable_unicode" - - if test "$enableval" = yes; then - ac_cv_use_unicode='wxUSE_UNICODE=yes' - else - ac_cv_use_unicode='wxUSE_UNICODE=no' - fi - -else - - LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE - -fi; - - eval "$ac_cv_use_unicode" - if test "$no_cache" != 1; then - echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_UNICODE" = 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 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi fi - - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6 no_cache=0 @@ -6486,14 +7462,14 @@ if test "${enable_sound+set}" = set; then else - LINE=`grep "wxUSE_SOUND" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_sound='wxUSE_SOUND='$DEFAULT_wxUSE_SOUND + ac_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" fi; @@ -6502,16 +7478,30 @@ fi; echo $ac_cv_use_sound >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SOUND" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SOUND = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SOUND fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6 no_cache=0 @@ -6527,14 +7517,14 @@ if test "${enable_mediactrl+set}" = set; then else - LINE=`grep "wxUSE_MEDIACTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_mediactrl='wxUSE_MEDIACTRL='$DEFAULT_wxUSE_MEDIACTRL + ac_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" fi; @@ -6543,16 +7533,30 @@ fi; echo $ac_cv_use_mediactrl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MEDIACTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MEDIACTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MEDIACTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6 no_cache=0 @@ -6568,14 +7572,14 @@ if test "${enable_gstreamer8+set}" = set; then else - LINE=`grep "wxUSE_GSTREAMER8" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_gstreamer8='wxUSE_GSTREAMER8='$DEFAULT_wxUSE_GSTREAMER8 + ac_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" fi; @@ -6584,16 +7588,30 @@ fi; echo $ac_cv_use_gstreamer8 >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GSTREAMER8" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_GSTREAMER8 = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_GSTREAMER8 fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6 no_cache=0 @@ -6609,14 +7627,14 @@ if test "${enable_printfposparam+set}" = set; then else - LINE=`grep "wxUSE_PRINTF_POS_PARAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS='$DEFAULT_wxUSE_PRINTF_POS_PARAMS + ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" fi; @@ -6625,16 +7643,30 @@ fi; echo $ac_cv_use_printfposparam >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PRINTF_POS_PARAMS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PRINTF_POS_PARAMS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PRINTF_POS_PARAMS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-zipstream" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6 no_cache=0 @@ -6650,14 +7682,14 @@ if test "${enable_zipstream+set}" = set; then else - LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM + ac_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}" fi; @@ -6666,17 +7698,31 @@ fi; echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ZIPSTREAM" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_ZIPSTREAM = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_ZIPSTREAM fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-url" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6 no_cache=0 @@ -6692,14 +7738,14 @@ if test "${enable_url+set}" = set; then else - LINE=`grep "wxUSE_URL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_url='wxUSE_URL='$DEFAULT_wxUSE_URL + ac_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}" fi; @@ -6708,16 +7754,30 @@ fi; echo $ac_cv_use_url >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_URL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_URL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_URL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6 no_cache=0 @@ -6733,14 +7793,14 @@ if test "${enable_variant+set}" = set; then else - LINE=`grep "wxUSE_VARIANT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_variant='wxUSE_VARIANT='$DEFAULT_wxUSE_VARIANT + ac_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" fi; @@ -6749,16 +7809,30 @@ fi; echo $ac_cv_use_variant >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_VARIANT" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_VARIANT = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_VARIANT fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6 no_cache=0 @@ -6774,14 +7848,14 @@ if test "${enable_protocol+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_protocol='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL + ac_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi; @@ -6790,16 +7864,30 @@ fi; echo $ac_cv_use_protocol >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PROTOCOL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_http" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >&6 no_cache=0 @@ -6815,14 +7903,14 @@ if test "${enable_protocol_http+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP + ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi; @@ -6831,16 +7919,30 @@ fi; echo $ac_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_HTTP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_HTTP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PROTOCOL_HTTP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_ftp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&6 no_cache=0 @@ -6856,14 +7958,14 @@ if test "${enable_protocol_ftp+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP + ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi; @@ -6872,16 +7974,30 @@ fi; echo $ac_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_FTP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_FTP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PROTOCOL_FTP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_file" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >&6 no_cache=0 @@ -6897,14 +8013,14 @@ if test "${enable_protocol_file+set}" = set; then else - LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE + ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi; @@ -6913,19 +8029,31 @@ fi; echo $ac_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_FILE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_FILE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PROTOCOL_FILE fi - + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-threads" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6 no_cache=0 @@ -6941,14 +8069,14 @@ if test "${enable_threads+set}" = set; then else - LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS + ac_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}" fi; @@ -6957,20 +8085,34 @@ fi; echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_THREADS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_THREADS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_THREADS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + if test "$wxUSE_GUI" = "yes"; then enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-docview" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6 no_cache=0 @@ -6986,14 +8128,14 @@ if test "${enable_docview+set}" = set; then else - LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE + ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}" fi; @@ -7002,16 +8144,30 @@ fi; echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DOC_VIEW_ARCHITECTURE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-help" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6 no_cache=0 @@ -7027,14 +8183,14 @@ if test "${enable_help+set}" = set; then else - LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP + ac_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}" fi; @@ -7043,16 +8199,30 @@ fi; echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_HELP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_HELP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_HELP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mshtmlhelp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6 no_cache=0 @@ -7068,14 +8238,14 @@ if test "${enable_mshtmlhelp+set}" = set; then else - LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP + ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}" fi; @@ -7084,16 +8254,30 @@ fi; echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MS_HTML_HELP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MS_HTML_HELP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MS_HTML_HELP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6 no_cache=0 @@ -7109,14 +8293,14 @@ if test "${enable_html+set}" = set; then else - LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML + ac_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}" fi; @@ -7125,16 +8309,30 @@ fi; echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_HTML" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_HTML = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_HTML fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-htmlhelp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6 no_cache=0 @@ -7150,14 +8348,14 @@ if test "${enable_htmlhelp+set}" = set; then else - LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}" fi; @@ -7166,16 +8364,30 @@ fi; echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_WXHTML_HELP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_WXHTML_HELP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_WXHTML_HELP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xrc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6 no_cache=0 @@ -7191,14 +8403,14 @@ if test "${enable_xrc+set}" = set; then else - LINE=`grep "wxUSE_XRC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_xrc='wxUSE_XRC='$DEFAULT_wxUSE_XRC + ac_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}" fi; @@ -7207,16 +8419,30 @@ fi; echo $ac_cv_use_xrc >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_XRC" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_XRC = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_XRC fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aui" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6 no_cache=0 @@ -7232,14 +8458,14 @@ if test "${enable_aui+set}" = set; then else - LINE=`grep "wxUSE_AUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_aui='wxUSE_AUI='$DEFAULT_wxUSE_AUI + ac_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}" fi; @@ -7248,16 +8474,85 @@ fi; echo $ac_cv_use_aui >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_AUI" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_AUI = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_AUI fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stc" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-stc or --disable-stc was given. +if test "${enable_stc+set}" = set; then + enableval="$enable_stc" + + if test "$enableval" = yes; then + ac_cv_use_stc='wxUSE_STC=yes' + else + ac_cv_use_stc='wxUSE_STC=no' + fi + +else + + LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}" + +fi; + + eval "$ac_cv_use_stc" + if test "$no_cache" != 1; then + echo $ac_cv_use_stc >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_STC = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_STC + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6 no_cache=0 @@ -7273,14 +8568,14 @@ if test "${enable_constraints+set}" = set; then else - LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS + ac_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}" fi; @@ -7289,16 +8584,30 @@ fi; echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CONSTRAINTS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CONSTRAINTS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CONSTRAINTS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6 no_cache=0 @@ -7314,14 +8623,14 @@ if test "${enable_printarch+set}" = set; then else - LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE + ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" fi; @@ -7330,16 +8639,30 @@ fi; echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PRINTING_ARCHITECTURE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PRINTING_ARCHITECTURE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6 no_cache=0 @@ -7355,14 +8678,14 @@ if test "${enable_mdi+set}" = set; then else - LINE=`grep "wxUSE_MDI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_mdi='wxUSE_MDI='$DEFAULT_wxUSE_MDI + ac_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" fi; @@ -7371,16 +8694,30 @@ fi; echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MDI" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MDI = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MDI fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6 no_cache=0 @@ -7396,14 +8733,14 @@ if test "${enable_mdidoc+set}" = set; then else - LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE + ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" fi; @@ -7412,16 +8749,30 @@ fi; echo $ac_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MDI_ARCHITECTURE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MDI_ARCHITECTURE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MDI_ARCHITECTURE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6 no_cache=0 @@ -7437,14 +8788,14 @@ if test "${enable_loggui+set}" = set; then else - LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI + ac_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" fi; @@ -7453,16 +8804,30 @@ fi; echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LOGGUI" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_LOGGUI = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LOGGUI fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6 no_cache=0 @@ -7478,14 +8843,14 @@ if test "${enable_logwin+set}" = set; then else - LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW + ac_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" fi; @@ -7494,16 +8859,30 @@ fi; echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LOGWINDOW" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_LOGWINDOW = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LOGWINDOW fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6 no_cache=0 @@ -7519,14 +8898,14 @@ if test "${enable_logdialog+set}" = set; then else - LINE=`grep "wxUSE_LOGDIALOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_logdialog='wxUSE_LOGDIALOG='$DEFAULT_wxUSE_LOGDIALOG + ac_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" fi; @@ -7535,16 +8914,30 @@ fi; echo $ac_cv_use_logdialog >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LOGDIALOG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_LOGDIALOG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LOGDIALOG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6 no_cache=0 @@ -7560,14 +8953,14 @@ if test "${enable_webkit+set}" = set; then else - LINE=`grep "wxUSE_WEBKIT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_webkit='wxUSE_WEBKIT='$DEFAULT_wxUSE_WEBKIT + ac_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" fi; @@ -7576,16 +8969,30 @@ fi; echo $ac_cv_use_webkit >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_WEBKIT" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_WEBKIT = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_WEBKIT fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richtext" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6 no_cache=0 @@ -7601,14 +9008,14 @@ if test "${enable_richtext+set}" = set; then else - LINE=`grep "wxUSE_RICHTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_richtext='wxUSE_RICHTEXT='$DEFAULT_wxUSE_RICHTEXT + ac_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}" fi; @@ -7617,16 +9024,30 @@ fi; echo $ac_cv_use_richtext >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_RICHTEXT" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_RICHTEXT = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_RICHTEXT fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6 no_cache=0 @@ -7642,14 +9063,14 @@ if test "${enable_graphics_ctx+set}" = set; then else - LINE=`grep "wxUSE_GRAPHICS_CONTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT='$DEFAULT_wxUSE_GRAPHICS_CONTEXT + ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" fi; @@ -7658,17 +9079,30 @@ fi; echo $ac_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GRAPHICS_CONTEXT" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_GRAPHICS_CONTEXT = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_GRAPHICS_CONTEXT fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6 no_cache=0 @@ -7684,14 +9118,14 @@ if test "${enable_postscript+set}" = set; then else - LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT + ac_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" fi; @@ -7700,103 +9134,32 @@ fi; echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_POSTSCRIPT" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_POSTSCRIPT = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_POSTSCRIPT fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-prologio" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-prologio... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-prologio or --disable-prologio was given. -if test "${enable_prologio+set}" = set; then - enableval="$enable_prologio" - - if test "$enableval" = yes; then - ac_cv_use_prologio='wxUSE_PROLOGIO=yes' - else - ac_cv_use_prologio='wxUSE_PROLOGIO=no' - fi - -else - - LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO - -fi; - - eval "$ac_cv_use_prologio" - if test "$no_cache" != 1; then - echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_PROLOGIO" = 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 - - - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-resources" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-resources... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-resources or --disable-resources was given. -if test "${enable_resources+set}" = set; then - enableval="$enable_resources" - - if test "$enableval" = yes; then - ac_cv_use_resources='wxUSE_RESOURCES=yes' - else - ac_cv_use_resources='wxUSE_RESOURCES=no' - fi - -else - - LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES - -fi; - - eval "$ac_cv_use_resources" - if test "$no_cache" != 1; then - echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_RESOURCES" = 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 + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi fi - - - - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-clipboard" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6 no_cache=0 @@ -7812,14 +9175,14 @@ if test "${enable_clipboard+set}" = set; then else - LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD + ac_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}" fi; @@ -7828,16 +9191,30 @@ fi; echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CLIPBOARD" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CLIPBOARD = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CLIPBOARD fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dnd" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6 no_cache=0 @@ -7853,14 +9230,14 @@ if test "${enable_dnd+set}" = set; then else - LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP + ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}" fi; @@ -7869,16 +9246,30 @@ fi; echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DRAG_AND_DROP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DRAG_AND_DROP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DRAG_AND_DROP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6 no_cache=0 @@ -7894,14 +9285,14 @@ if test "${enable_metafile+set}" = set; then else - LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE + ac_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" fi; @@ -7910,19 +9301,32 @@ fi; echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_METAFILE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_METAFILE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_METAFILE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-controls" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6 no_cache=0 @@ -7938,14 +9342,14 @@ if test "${enable_controls+set}" = set; then else - LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS + ac_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}" fi; @@ -7954,14 +9358,19 @@ fi; echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CONTROLS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CONTROLS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CONTROLS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_ACCEL=yes @@ -7997,6 +9406,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_RADIOBTN=yes DEFAULT_wxUSE_SASH=yes DEFAULT_wxUSE_SCROLLBAR=yes + DEFAULT_wxUSE_SEARCHCTRL=yes DEFAULT_wxUSE_SLIDER=yes DEFAULT_wxUSE_SPINBTN=yes DEFAULT_wxUSE_SPINCTRL=yes @@ -8049,6 +9459,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_SASH=no DEFAULT_wxUSE_SCROLLBAR=no + DEFAULT_wxUSE_SEARCHCTRL=no DEFAULT_wxUSE_SLIDER=no DEFAULT_wxUSE_SPINBTN=no DEFAULT_wxUSE_SPINCTRL=no @@ -8071,6 +9482,15 @@ fi enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accel" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6 no_cache=0 @@ -8086,14 +9506,14 @@ if test "${enable_accel+set}" = set; then else - LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL + ac_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}" fi; @@ -8102,16 +9522,30 @@ fi; echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ACCEL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_ACCEL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_ACCEL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-animatectrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6 no_cache=0 @@ -8127,14 +9561,14 @@ if test "${enable_animatectrl+set}" = set; then else - LINE=`grep "wxUSE_ANIMATIONCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL='$DEFAULT_wxUSE_ANIMATIONCTRL + ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}" fi; @@ -8143,16 +9577,30 @@ fi; echo $ac_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ANIMATIONCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_ANIMATIONCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_ANIMATIONCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6 no_cache=0 @@ -8168,14 +9616,14 @@ if test "${enable_button+set}" = set; then else - LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON + ac_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" fi; @@ -8184,16 +9632,30 @@ fi; echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BUTTON" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_BUTTON = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_BUTTON fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6 no_cache=0 @@ -8209,14 +9671,14 @@ if test "${enable_bmpbutton+set}" = set; then else - LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON + ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" fi; @@ -8225,16 +9687,30 @@ fi; echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BMPBUTTON" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_BMPBUTTON = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_BMPBUTTON fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6 no_cache=0 @@ -8250,14 +9726,14 @@ if test "${enable_bmpcombobox+set}" = set; then else - LINE=`grep "wxUSE_BITMAPCOMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX='$DEFAULT_wxUSE_BITMAPCOMBOBOX + ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" fi; @@ -8266,16 +9742,30 @@ fi; echo $ac_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BITMAPCOMBOBOX" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_BITMAPCOMBOBOX = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_BITMAPCOMBOBOX fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-calendar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6 no_cache=0 @@ -8291,14 +9781,14 @@ if test "${enable_calendar+set}" = set; then else - LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL + ac_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}" fi; @@ -8307,16 +9797,30 @@ fi; echo $ac_cv_use_calendar >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CALCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CALCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CALCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-caret" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6 no_cache=0 @@ -8332,14 +9836,14 @@ if test "${enable_caret+set}" = set; then else - LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET + ac_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}" fi; @@ -8348,16 +9852,30 @@ fi; echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CARET" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CARET = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CARET fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checkbox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6 no_cache=0 @@ -8373,14 +9891,14 @@ if test "${enable_checkbox+set}" = set; then else - LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX + ac_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}" fi; @@ -8389,16 +9907,30 @@ fi; echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CHECKBOX" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CHECKBOX = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CHECKBOX fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checklst" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6 no_cache=0 @@ -8414,14 +9946,14 @@ if test "${enable_checklst+set}" = set; then else - LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST + ac_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}" fi; @@ -8430,16 +9962,30 @@ fi; echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CHECKLST" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CHECKLST = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CHECKLST fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choice" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6 no_cache=0 @@ -8455,14 +10001,14 @@ if test "${enable_choice+set}" = set; then else - LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE + ac_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}" fi; @@ -8471,16 +10017,30 @@ fi; echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CHOICE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CHOICE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CHOICE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicebook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6 no_cache=0 @@ -8496,14 +10056,14 @@ if test "${enable_choicebook+set}" = set; then else - LINE=`grep "wxUSE_CHOICEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_choicebook='wxUSE_CHOICEBOOK='$DEFAULT_wxUSE_CHOICEBOOK + ac_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}" fi; @@ -8512,16 +10072,30 @@ fi; echo $ac_cv_use_choicebook >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CHOICEBOOK" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CHOICEBOOK = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CHOICEBOOK fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-collpane" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6 no_cache=0 @@ -8537,14 +10111,14 @@ if test "${enable_collpane+set}" = set; then else - LINE=`grep "wxUSE_COLLPANE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_collpane='wxUSE_COLLPANE='$DEFAULT_wxUSE_COLLPANE + ac_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}" fi; @@ -8553,16 +10127,30 @@ fi; echo $ac_cv_use_collpane >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COLLPANE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_COLLPANE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_COLLPANE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-colourpicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&6 no_cache=0 @@ -8578,14 +10166,14 @@ if test "${enable_colourpicker+set}" = set; then else - LINE=`grep "wxUSE_COLOURPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL='$DEFAULT_wxUSE_COLOURPICKERCTRL + ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}" fi; @@ -8594,16 +10182,30 @@ fi; echo $ac_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COLOURPICKERCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_COLOURPICKERCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_COLOURPICKERCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6 no_cache=0 @@ -8619,14 +10221,14 @@ if test "${enable_combobox+set}" = set; then else - LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX + ac_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}" fi; @@ -8635,16 +10237,30 @@ fi; echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COMBOBOX" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_COMBOBOX = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_COMBOBOX fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-comboctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6 no_cache=0 @@ -8660,14 +10276,14 @@ if test "${enable_comboctrl+set}" = set; then else - LINE=`grep "wxUSE_COMBOCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_comboctrl='wxUSE_COMBOCTRL='$DEFAULT_wxUSE_COMBOCTRL + ac_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}" fi; @@ -8676,16 +10292,30 @@ fi; echo $ac_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COMBOCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_COMBOCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_COMBOCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6 no_cache=0 @@ -8701,14 +10331,14 @@ if test "${enable_datepick+set}" = set; then else - LINE=`grep "wxUSE_DATEPICKCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_datepick='wxUSE_DATEPICKCTRL='$DEFAULT_wxUSE_DATEPICKCTRL + ac_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" fi; @@ -8717,16 +10347,30 @@ fi; echo $ac_cv_use_datepick >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DATEPICKCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DATEPICKCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DATEPICKCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6 no_cache=0 @@ -8742,14 +10386,14 @@ if test "${enable_dirpicker+set}" = set; then else - LINE=`grep "wxUSE_DIRPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL='$DEFAULT_wxUSE_DIRPICKERCTRL + ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" fi; @@ -8758,16 +10402,30 @@ fi; echo $ac_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DIRPICKERCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DIRPICKERCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DIRPICKERCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6 no_cache=0 @@ -8783,14 +10441,14 @@ if test "${enable_display+set}" = set; then else - LINE=`grep "wxUSE_DISPLAY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_display='wxUSE_DISPLAY='$DEFAULT_wxUSE_DISPLAY + ac_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" fi; @@ -8799,16 +10457,30 @@ fi; echo $ac_cv_use_display >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DISPLAY" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DISPLAY = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DISPLAY fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6 no_cache=0 @@ -8824,14 +10496,14 @@ if test "${enable_detect_sm+set}" = set; then else - LINE=`grep "wxUSE_DETECT_SM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_detect_sm='wxUSE_DETECT_SM='$DEFAULT_wxUSE_DETECT_SM + ac_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" fi; @@ -8840,16 +10512,85 @@ fi; echo $ac_cv_use_detect_sm >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DETECT_SM" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DETECT_SM = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DETECT_SM + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-editablebox or --disable-editablebox was given. +if test "${enable_editablebox+set}" = set; then + enableval="$enable_editablebox" + + if test "$enableval" = yes; then + ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes' + else + ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' + fi + +else + + LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" + +fi; + + eval "$ac_cv_use_editablebox" + if test "$no_cache" != 1; then + echo $ac_cv_use_editablebox >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_EDITABLELISTBOX = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_EDITABLELISTBOX + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6 no_cache=0 @@ -8865,14 +10606,14 @@ if test "${enable_filepicker+set}" = set; then else - LINE=`grep "wxUSE_FILEPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL='$DEFAULT_wxUSE_FILEPICKERCTRL + ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" fi; @@ -8881,16 +10622,30 @@ fi; echo $ac_cv_use_filepicker >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FILEPICKERCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILEPICKERCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FILEPICKERCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontpicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6 no_cache=0 @@ -8906,14 +10661,14 @@ if test "${enable_fontpicker+set}" = set; then else - LINE=`grep "wxUSE_FONTPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL='$DEFAULT_wxUSE_FONTPICKERCTRL + ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}" fi; @@ -8922,16 +10677,30 @@ fi; echo $ac_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FONTPICKERCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FONTPICKERCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FONTPICKERCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gauge" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6 no_cache=0 @@ -8947,14 +10716,14 @@ if test "${enable_gauge+set}" = set; then else - LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE + ac_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}" fi; @@ -8963,16 +10732,30 @@ fi; echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GAUGE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_GAUGE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_GAUGE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-grid" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6 no_cache=0 @@ -8988,14 +10771,14 @@ if test "${enable_grid+set}" = set; then else - LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID + ac_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}" fi; @@ -9004,16 +10787,30 @@ fi; echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GRID" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_GRID = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_GRID fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6 no_cache=0 @@ -9029,14 +10826,14 @@ if test "${enable_dataviewctrl+set}" = set; then else - LINE=`grep "wxUSE_DATAVIEWCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL='$DEFAULT_wxUSE_DATAVIEWCTRL + ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" fi; @@ -9045,16 +10842,30 @@ fi; echo $ac_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DATAVIEWCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DATAVIEWCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DATAVIEWCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hyperlink" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6 no_cache=0 @@ -9070,14 +10881,14 @@ if test "${enable_hyperlink+set}" = set; then else - LINE=`grep "wxUSE_HYPERLINKCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL='$DEFAULT_wxUSE_HYPERLINKCTRL + ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}" fi; @@ -9086,16 +10897,30 @@ fi; echo $ac_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_HYPERLINKCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_HYPERLINKCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_HYPERLINKCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6 no_cache=0 @@ -9111,14 +10936,14 @@ if test "${enable_imaglist+set}" = set; then else - LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST + ac_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}" fi; @@ -9127,16 +10952,30 @@ fi; echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_IMAGLIST" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_IMAGLIST = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_IMAGLIST fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6 no_cache=0 @@ -9152,14 +10991,14 @@ if test "${enable_listbook+set}" = set; then else - LINE=`grep "wxUSE_LISTBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_listbook='wxUSE_LISTBOOK='$DEFAULT_wxUSE_LISTBOOK + ac_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}" fi; @@ -9168,16 +11007,30 @@ fi; echo $ac_cv_use_listbook >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LISTBOOK" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_LISTBOOK = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LISTBOOK fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6 no_cache=0 @@ -9193,14 +11046,14 @@ if test "${enable_listbox+set}" = set; then else - LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX + ac_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}" fi; @@ -9209,16 +11062,30 @@ fi; echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LISTBOX" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_LISTBOX = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LISTBOX fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6 no_cache=0 @@ -9234,14 +11101,14 @@ if test "${enable_listctrl+set}" = set; then else - LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL + ac_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}" fi; @@ -9250,16 +11117,30 @@ fi; echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LISTCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_LISTCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_LISTCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notebook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6 no_cache=0 @@ -9275,14 +11156,14 @@ if test "${enable_notebook+set}" = set; then else - LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK + ac_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}" fi; @@ -9291,16 +11172,30 @@ fi; echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NOTEBOOK" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_NOTEBOOK = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_NOTEBOOK fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6 no_cache=0 @@ -9316,14 +11211,14 @@ if test "${enable_odcombobox+set}" = set; then else - LINE=`grep "wxUSE_ODCOMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX='$DEFAULT_wxUSE_ODCOMBOBOX + ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}" fi; @@ -9332,16 +11227,30 @@ fi; echo $ac_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ODCOMBOBOX" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_ODCOMBOBOX = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_ODCOMBOBOX fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6 no_cache=0 @@ -9357,14 +11266,14 @@ if test "${enable_radiobox+set}" = set; then else - LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX + ac_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}" fi; @@ -9373,16 +11282,30 @@ fi; echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_RADIOBOX" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_RADIOBOX = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_RADIOBOX fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobtn" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6 no_cache=0 @@ -9398,14 +11321,14 @@ if test "${enable_radiobtn+set}" = set; then else - LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN + ac_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}" fi; @@ -9414,16 +11337,30 @@ fi; echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_RADIOBTN" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_RADIOBTN = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_RADIOBTN fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sash" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6 no_cache=0 @@ -9439,14 +11376,14 @@ if test "${enable_sash+set}" = set; then else - LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH + ac_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}" fi; @@ -9455,16 +11392,30 @@ fi; echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SASH" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SASH = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SASH fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-scrollbar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6 no_cache=0 @@ -9480,14 +11431,14 @@ if test "${enable_scrollbar+set}" = set; then else - LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR + ac_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}" fi; @@ -9496,16 +11447,85 @@ fi; echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SCROLLBAR" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SCROLLBAR = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SCROLLBAR fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-searchctrl or --disable-searchctrl was given. +if test "${enable_searchctrl+set}" = set; then + enableval="$enable_searchctrl" + + if test "$enableval" = yes; then + ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes' + else + ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=no' + fi + +else + + LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}" + +fi; + + eval "$ac_cv_use_searchctrl" + if test "$no_cache" != 1; then + echo $ac_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_SEARCHCTRL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_SEARCHCTRL + fi + + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6 no_cache=0 @@ -9521,14 +11541,14 @@ if test "${enable_slider+set}" = set; then else - LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER + ac_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}" fi; @@ -9537,16 +11557,30 @@ fi; echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SLIDER" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SLIDER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SLIDER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinbtn" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6 no_cache=0 @@ -9562,14 +11596,14 @@ if test "${enable_spinbtn+set}" = set; then else - LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN + ac_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}" fi; @@ -9578,16 +11612,30 @@ fi; echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPINBTN" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPINBTN = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SPINBTN fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6 no_cache=0 @@ -9603,14 +11651,14 @@ if test "${enable_spinctrl+set}" = set; then else - LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL + ac_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}" fi; @@ -9619,16 +11667,30 @@ fi; echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPINCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPINCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SPINCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splitter" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6 no_cache=0 @@ -9644,14 +11706,14 @@ if test "${enable_splitter+set}" = set; then else - LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER + ac_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}" fi; @@ -9660,16 +11722,30 @@ fi; echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPLITTER" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPLITTER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SPLITTER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbmp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6 no_cache=0 @@ -9685,14 +11761,14 @@ if test "${enable_statbmp+set}" = set; then else - LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP + ac_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}" fi; @@ -9701,16 +11777,30 @@ fi; echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STATBMP" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STATBMP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STATBMP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6 no_cache=0 @@ -9726,14 +11816,14 @@ if test "${enable_statbox+set}" = set; then else - LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX + ac_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}" fi; @@ -9742,16 +11832,30 @@ fi; echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STATBOX" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STATBOX = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STATBOX fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statline" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6 no_cache=0 @@ -9767,14 +11871,14 @@ if test "${enable_statline+set}" = set; then else - LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE + ac_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}" fi; @@ -9783,16 +11887,30 @@ fi; echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STATLINE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STATLINE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STATLINE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stattext" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6 no_cache=0 @@ -9808,14 +11926,14 @@ if test "${enable_stattext+set}" = set; then else - LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT + ac_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}" fi; @@ -9824,16 +11942,30 @@ fi; echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STATTEXT" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STATTEXT = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STATTEXT fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statusbar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6 no_cache=0 @@ -9849,14 +11981,14 @@ if test "${enable_statusbar+set}" = set; then else - LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR + ac_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}" fi; @@ -9865,16 +11997,30 @@ fi; echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STATUSBAR" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STATUSBAR = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STATUSBAR fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tabdialog" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6 no_cache=0 @@ -9890,14 +12036,14 @@ if test "${enable_tabdialog+set}" = set; then else - LINE=`grep "wxUSE_TAB_DIALOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_tabdialog='wxUSE_TAB_DIALOG='$DEFAULT_wxUSE_TAB_DIALOG + ac_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}" fi; @@ -9906,16 +12052,30 @@ fi; echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TAB_DIALOG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TAB_DIALOG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TAB_DIALOG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6 no_cache=0 @@ -9931,14 +12091,14 @@ if test "${enable_textctrl+set}" = set; then else - LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL + ac_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" fi; @@ -9947,16 +12107,30 @@ fi; echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TEXTCTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TEXTCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TEXTCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6 no_cache=0 @@ -9972,14 +12146,14 @@ if test "${enable_togglebtn+set}" = set; then else - LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN + ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" fi; @@ -9988,16 +12162,30 @@ fi; echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOGGLEBTN" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOGGLEBTN = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TOGGLEBTN fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6 no_cache=0 @@ -10013,14 +12201,14 @@ if test "${enable_toolbar+set}" = set; then else - LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR + ac_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" fi; @@ -10029,16 +12217,30 @@ fi; echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOOLBAR" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOOLBAR = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TOOLBAR fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6 no_cache=0 @@ -10054,14 +12256,14 @@ if test "${enable_tbarnative+set}" = set; then else - LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE + ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" fi; @@ -10070,16 +12272,30 @@ fi; echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOOLBAR_NATIVE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOOLBAR_NATIVE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TOOLBAR_NATIVE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6 no_cache=0 @@ -10095,14 +12311,14 @@ if test "${enable_treebook+set}" = set; then else - LINE=`grep "wxUSE_TREEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_treebook='wxUSE_TREEBOOK='$DEFAULT_wxUSE_TREEBOOK + ac_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" fi; @@ -10111,16 +12327,30 @@ fi; echo $ac_cv_use_treebook >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TREEBOOK" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TREEBOOK = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TREEBOOK fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6 no_cache=0 @@ -10136,14 +12366,14 @@ if test "${enable_toolbook+set}" = set; then else - LINE=`grep "wxUSE_TOOLBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_toolbook='wxUSE_TOOLBOOK='$DEFAULT_wxUSE_TOOLBOOK + ac_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}" fi; @@ -10152,16 +12382,30 @@ fi; echo $ac_cv_use_toolbook >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOOLBOOK" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOOLBOOK = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TOOLBOOK fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6 no_cache=0 @@ -10177,14 +12421,14 @@ if test "${enable_treectrl+set}" = set; then else - LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL + ac_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" fi; @@ -10193,16 +12437,30 @@ fi; echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TREECTRL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TREECTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TREECTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6 no_cache=0 @@ -10218,14 +12476,14 @@ if test "${enable_tipwindow+set}" = set; then else - LINE=`grep "wxUSE_TIPWINDOW" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_tipwindow='wxUSE_TIPWINDOW='$DEFAULT_wxUSE_TIPWINDOW + ac_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" fi; @@ -10234,16 +12492,30 @@ fi; echo $ac_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TIPWINDOW" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TIPWINDOW = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TIPWINDOW fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6 no_cache=0 @@ -10259,14 +12531,14 @@ if test "${enable_popupwin+set}" = set; then else - LINE=`grep "wxUSE_POPUPWIN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN + ac_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" fi; @@ -10275,18 +12547,32 @@ fi; echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_POPUPWIN" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_POPUPWIN = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_POPUPWIN fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commondlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6 no_cache=0 @@ -10302,14 +12588,14 @@ if test "${enable_commondlg+set}" = set; then else - LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS + ac_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}" fi; @@ -10318,16 +12604,30 @@ fi; echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COMMONDLGS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_COMMONDLGS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_COMMONDLGS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aboutdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6 no_cache=0 @@ -10343,14 +12643,14 @@ if test "${enable_aboutdlg+set}" = set; then else - LINE=`grep "wxUSE_ABOUTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_aboutdlg='wxUSE_ABOUTDLG='$DEFAULT_wxUSE_ABOUTDLG + ac_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}" fi; @@ -10359,16 +12659,30 @@ fi; echo $ac_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ABOUTDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_ABOUTDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_ABOUTDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicedlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6 no_cache=0 @@ -10384,14 +12698,14 @@ if test "${enable_choicedlg+set}" = set; then else - LINE=`grep "wxUSE_CHOICEDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG + ac_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}" fi; @@ -10400,16 +12714,30 @@ fi; echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CHOICEDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_CHOICEDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CHOICEDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-coldlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6 no_cache=0 @@ -10425,14 +12753,14 @@ if test "${enable_coldlg+set}" = set; then else - LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG + ac_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}" fi; @@ -10441,16 +12769,30 @@ fi; echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COLOURDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_COLOURDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_COLOURDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filedlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6 no_cache=0 @@ -10466,14 +12808,14 @@ if test "${enable_filedlg+set}" = set; then else - LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG + ac_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}" fi; @@ -10482,16 +12824,30 @@ fi; echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FILEDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILEDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FILEDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-finddlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6 no_cache=0 @@ -10507,14 +12863,14 @@ if test "${enable_finddlg+set}" = set; then else - LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_finddlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG + ac_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}" fi; @@ -10523,16 +12879,30 @@ fi; echo $ac_cv_use_finddlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FINDREPLDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FINDREPLDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FINDREPLDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6 no_cache=0 @@ -10548,14 +12918,14 @@ if test "${enable_fontdlg+set}" = set; then else - LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG + ac_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}" fi; @@ -10564,16 +12934,30 @@ fi; echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FONTDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_FONTDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FONTDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6 no_cache=0 @@ -10589,14 +12973,14 @@ if test "${enable_dirdlg+set}" = set; then else - LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG + ac_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}" fi; @@ -10605,16 +12989,30 @@ fi; echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DIRDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DIRDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DIRDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-msgdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6 no_cache=0 @@ -10630,14 +13028,14 @@ if test "${enable_msgdlg+set}" = set; then else - LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG + ac_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}" fi; @@ -10646,16 +13044,30 @@ fi; echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MSGDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MSGDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MSGDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-numberdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6 no_cache=0 @@ -10671,14 +13083,14 @@ if test "${enable_numberdlg+set}" = set; then else - LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG + ac_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}" fi; @@ -10687,16 +13099,30 @@ fi; echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NUMBERDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_NUMBERDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_NUMBERDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splash" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6 no_cache=0 @@ -10712,14 +13138,14 @@ if test "${enable_splash+set}" = set; then else - LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH + ac_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}" fi; @@ -10728,16 +13154,30 @@ fi; echo $ac_cv_use_splash >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPLASH" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPLASH = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SPLASH fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6 no_cache=0 @@ -10753,14 +13193,14 @@ if test "${enable_textdlg+set}" = set; then else - LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG + ac_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}" fi; @@ -10769,16 +13209,30 @@ fi; echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TEXTDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TEXTDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TEXTDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6 no_cache=0 @@ -10794,14 +13248,14 @@ if test "${enable_tipdlg+set}" = set; then else - LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS + ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}" fi; @@ -10810,16 +13264,30 @@ fi; echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STARTUP_TIPS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_STARTUP_TIPS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STARTUP_TIPS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-progressdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6 no_cache=0 @@ -10835,14 +13303,14 @@ if test "${enable_progressdlg+set}" = set; then else - LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG + ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}" fi; @@ -10851,16 +13319,30 @@ fi; echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROGRESSDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROGRESSDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PROGRESSDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wizarddlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6 no_cache=0 @@ -10876,14 +13358,14 @@ if test "${enable_wizarddlg+set}" = set; then else - LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG + ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}" fi; @@ -10892,18 +13374,32 @@ fi; echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_WIZARDDLG" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_WIZARDDLG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_WIZARDDLG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-menus" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6 no_cache=0 @@ -10919,14 +13415,14 @@ if test "${enable_menus+set}" = set; then else - LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS + ac_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}" fi; @@ -10935,16 +13431,30 @@ fi; echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MENUS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MENUS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MENUS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-miniframe" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6 no_cache=0 @@ -10960,14 +13470,14 @@ if test "${enable_miniframe+set}" = set; then else - LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME + ac_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}" fi; @@ -10976,16 +13486,30 @@ fi; echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MINIFRAME" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MINIFRAME = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MINIFRAME fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tooltips" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6 no_cache=0 @@ -11001,14 +13525,14 @@ if test "${enable_tooltips+set}" = set; then else - LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS + ac_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}" fi; @@ -11017,16 +13541,30 @@ fi; echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOOLTIPS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOOLTIPS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TOOLTIPS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splines" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6 no_cache=0 @@ -11042,14 +13580,14 @@ if test "${enable_splines+set}" = set; then else - LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES + ac_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}" fi; @@ -11058,16 +13596,30 @@ fi; echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPLINES" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPLINES = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SPLINES fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6 no_cache=0 @@ -11083,14 +13635,14 @@ if test "${enable_mousewheel+set}" = set; then else - LINE=`grep "wxUSE_MOUSEWHEEL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL='$DEFAULT_wxUSE_MOUSEWHEEL + ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}" fi; @@ -11099,16 +13651,30 @@ fi; echo $ac_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MOUSEWHEEL" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_MOUSEWHEEL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_MOUSEWHEEL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6 no_cache=0 @@ -11124,14 +13690,14 @@ if test "${enable_validators+set}" = set; then else - LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS + ac_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}" fi; @@ -11140,16 +13706,30 @@ fi; echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_VALIDATORS" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_VALIDATORS = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_VALIDATORS fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-busyinfo" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6 no_cache=0 @@ -11165,14 +13745,14 @@ if test "${enable_busyinfo+set}" = set; then else - LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO + ac_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}" fi; @@ -11181,16 +13761,30 @@ fi; echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BUSYINFO" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_BUSYINFO = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_BUSYINFO fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-joystick" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6 no_cache=0 @@ -11206,14 +13800,14 @@ if test "${enable_joystick+set}" = set; then else - LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK + ac_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}" fi; @@ -11222,16 +13816,30 @@ fi; echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_JOYSTICK" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_JOYSTICK = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_JOYSTICK fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6 no_cache=0 @@ -11247,14 +13855,14 @@ if test "${enable_metafile+set}" = set; then else - LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE + ac_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" fi; @@ -11263,16 +13871,30 @@ fi; echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_METAFILE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_METAFILE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_METAFILE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dragimage" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6 no_cache=0 @@ -11288,14 +13910,14 @@ if test "${enable_dragimage+set}" = set; then else - LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE + ac_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}" fi; @@ -11304,16 +13926,30 @@ fi; echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DRAGIMAGE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DRAGIMAGE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DRAGIMAGE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accessibility" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6 no_cache=0 @@ -11329,14 +13965,14 @@ if test "${enable_accessibility+set}" = set; then else - LINE=`grep "wxUSE_ACCESSIBILITY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_accessibility='wxUSE_ACCESSIBILITY='$DEFAULT_wxUSE_ACCESSIBILITY + ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}" fi; @@ -11345,18 +13981,32 @@ fi; echo $ac_cv_use_accessibility >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ACCESSIBILITY" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_ACCESSIBILITY = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_ACCESSIBILITY fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + if test "$wxUSE_MSW" = "1"; then enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dccache" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6 no_cache=0 @@ -11372,14 +14022,14 @@ if test "${enable_dccache+set}" = set; then else - LINE=`grep "wxUSE_DC_CACHEING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dccache='wxUSE_DC_CACHEING='$DEFAULT_wxUSE_DC_CACHEING + ac_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" fi; @@ -11388,19 +14038,33 @@ fi; echo $ac_cv_use_dccache >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DC_CACHEING" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DC_CACHEING = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_DC_CACHEING fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + fi enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6 no_cache=0 @@ -11416,14 +14080,14 @@ if test "${enable_palette+set}" = set; then else - LINE=`grep "wxUSE_PALETTE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_palette='wxUSE_PALETTE='$DEFAULT_wxUSE_PALETTE + ac_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}" fi; @@ -11432,16 +14096,30 @@ fi; echo $ac_cv_use_palette >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PALETTE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PALETTE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PALETTE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-image" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6 no_cache=0 @@ -11457,14 +14135,14 @@ if test "${enable_image+set}" = set; then else - LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE + ac_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}" fi; @@ -11473,16 +14151,30 @@ fi; echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_IMAGE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_IMAGE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_IMAGE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gif" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6 no_cache=0 @@ -11498,14 +14190,14 @@ if test "${enable_gif+set}" = set; then else - LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF + ac_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}" fi; @@ -11514,16 +14206,30 @@ fi; echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GIF" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_GIF = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_GIF fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pcx" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6 no_cache=0 @@ -11539,14 +14245,14 @@ if test "${enable_pcx+set}" = set; then else - LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX + ac_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}" fi; @@ -11555,16 +14261,30 @@ fi; echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PCX" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PCX = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PCX fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tga" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6 no_cache=0 @@ -11580,14 +14300,14 @@ if test "${enable_tga+set}" = set; then else - LINE=`grep "wxUSE_TGA" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_tga='wxUSE_TGA='$DEFAULT_wxUSE_TGA + ac_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}" fi; @@ -11596,16 +14316,30 @@ fi; echo $ac_cv_use_tga >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TGA" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_TGA = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TGA fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iff" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6 no_cache=0 @@ -11621,14 +14355,14 @@ if test "${enable_iff+set}" = set; then else - LINE=`grep "wxUSE_IFF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_iff='wxUSE_IFF='$DEFAULT_wxUSE_IFF + ac_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}" fi; @@ -11637,16 +14371,30 @@ fi; echo $ac_cv_use_iff >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_IFF" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_IFF = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_IFF fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pnm" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6 no_cache=0 @@ -11662,14 +14410,14 @@ if test "${enable_pnm+set}" = set; then else - LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM + ac_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}" fi; @@ -11678,16 +14426,30 @@ fi; echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PNM" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_PNM = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_PNM fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xpm" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6 no_cache=0 @@ -11703,14 +14465,14 @@ if test "${enable_xpm+set}" = set; then else - LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_xpm='wxUSE_XPM='$DEFAULT_wxUSE_XPM + ac_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}" fi; @@ -11719,16 +14481,30 @@ fi; echo $ac_cv_use_xpm >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_XPM" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_XPM = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_XPM fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z"$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ico_cur" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6 no_cache=0 @@ -11744,14 +14520,14 @@ if test "${enable_ico_cur+set}" = set; then else - LINE=`grep "wxUSE_ICO_CUR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_ico_cur='wxUSE_ICO_CUR='$DEFAULT_wxUSE_ICO_CUR + ac_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}" fi; @@ -11760,79 +14536,23 @@ fi; echo $ac_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ICO_CUR" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test x"$enablestring" = xdisable; then + if test $wxUSE_ICO_CUR = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_ICO_CUR fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -fi - - - -# Check whether --with-flavour or --without-flavour was given. -if test "${with_flavour+set}" = set; then - withval="$with_flavour" - WX_FLAVOUR="$withval" -fi; - - - - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-official_build or --disable-official_build was given. -if test "${enable_official_build+set}" = set; then - enableval="$enable_official_build" - - if test "$enableval" = yes; then - ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes' - else - ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' - fi - -else - - LINE=`grep "wxUSE_OFFICIAL_BUILD" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD='$DEFAULT_wxUSE_OFFICIAL_BUILD - -fi; - - eval "$ac_cv_use_official_build" - if test "$no_cache" != 1; then - echo $ac_cv_use_official_build >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_OFFICIAL_BUILD" = 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 -# Check whether --enable-vendor or --disable-vendor was given. -if test "${enable_vendor+set}" = set; then - enableval="$enable_vendor" - VENDOR="$enableval" -fi; -if test "x$VENDOR" = "x"; then - VENDOR="custom" fi - - echo "saving argument cache $wx_arg_cache_file" mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} @@ -12936,6 +15656,7 @@ 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' @@ -13001,17 +15722,18 @@ 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 + if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then + :; INTELCC=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then - :; INTELCC=yes - else - :; - fi + if test "x$GCC" != "xyes"; then @@ -13151,15 +15873,17 @@ fi case `uname -s` in AIX*) - 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_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 + echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6 -if test "${bakefile_cv_c_compiler_xlc+set}" = set; then +if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -13172,9 +15896,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -13201,40 +15926,47 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - bakefile_compiler_xlc=yes + bakefile_cv_c_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_compiler_xlc=no +bakefile_cv_c_compiler___xlC__=no + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_xlc=$bakefile_compiler_xlc -fi -echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_xlc" >&6 -XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes` -ac_ext=c +fi +echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6 + if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then + :; XLCC=yes + else + :; + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + ;; Darwin) - 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_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking whether we are using the Metrowerks C compiler" >&5 + echo "$as_me:$LINENO: checking whether we are using the Metrowerks C compiler" >&5 echo $ECHO_N "checking whether we are using the Metrowerks C compiler... $ECHO_C" >&6 -if test "${bakefile_cv_c_compiler_mwerks+set}" = set; then +if test "${bakefile_cv_c_compiler___MWERKS__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -13247,9 +15979,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __MWERKS__ - choke me -#endif + + #ifndef __MWERKS__ + choke me + #endif ; return 0; @@ -13276,37 +16009,44 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - bakefile_compiler_mwerks=yes + bakefile_cv_c_compiler___MWERKS__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_compiler_mwerks=no +bakefile_cv_c_compiler___MWERKS__=no + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_mwerks=$bakefile_compiler_mwerks -fi -echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_mwerks" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_mwerks" >&6 -MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes` -ac_ext=c +fi +echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___MWERKS__" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___MWERKS__" >&6 + if test "x$bakefile_cv_c_compiler___MWERKS__" = "xyes"; then + :; MWCC=yes + else + :; + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_ext=c + + + + ac_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 IBM xlC C compiler" >&5 + echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6 -if test "${bakefile_cv_c_compiler_xlc+set}" = set; then +if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -13319,9 +16059,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -13348,28 +16089,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - bakefile_compiler_xlc=yes + bakefile_cv_c_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_compiler_xlc=no +bakefile_cv_c_compiler___xlC__=no + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_xlc=$bakefile_compiler_xlc -fi -echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_xlc" >&6 -XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes` -ac_ext=c +fi +echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6 + if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then + :; XLCC=yes + else + :; + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + ;; IRIX*) @@ -13440,17 +16186,100 @@ 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 + 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_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 + + + ;; + + Linux*) + + + 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 Sun C compiler" >&5 +echo $ECHO_N "checking whether we are using the Sun C compiler... $ECHO_C" >&6 +if test "${bakefile_cv_c_compiler___SUNPRO_C+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_C + 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___SUNPRO_C=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +bakefile_cv_c_compiler___SUNPRO_C=no + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6 + if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then + :; SUNCC=yes else :; fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + ;; @@ -13523,17 +16352,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5 echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6 + if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then + :; HPCC=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then - :; HPCC=yes - else - :; - fi ;; @@ -13606,17 +16435,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5 echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6 + if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then + :; COMPAQCC=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then - :; COMPAQCC=yes - else - :; - fi ;; @@ -13689,17 +16518,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6 + if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then + :; SUNCC=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then - :; SUNCC=yes - else - :; - fi ;; @@ -14366,6 +17195,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -14431,17 +17261,18 @@ 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 + if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then + :; INTELCXX=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then - :; INTELCXX=yes - else - :; - fi + if test "x$GCXX" != "xyes"; then @@ -14581,15 +17412,17 @@ fi case `uname -s` in AIX*) - 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_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 + echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6 -if test "${bakefile_cv_cxx_compiler_xlc+set}" = set; then +if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14602,9 +17435,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -14631,40 +17465,47 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - bakefile_compiler_xlc=yes + bakefile_cv_cxx_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_compiler_xlc=no +bakefile_cv_cxx_compiler___xlC__=no + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_cxx_compiler_xlc=$bakefile_compiler_xlc -fi -echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler_xlc" >&6 -XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes` -ac_ext=c +fi +echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6 + if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then + :; XLCXX=yes + else + :; + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + ;; Darwin) - 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_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking whether we are using the Metrowerks C++ compiler" >&5 + echo "$as_me:$LINENO: checking whether we are using the Metrowerks C++ compiler" >&5 echo $ECHO_N "checking whether we are using the Metrowerks C++ compiler... $ECHO_C" >&6 -if test "${bakefile_cv_cxx_compiler_mwerks+set}" = set; then +if test "${bakefile_cv_cxx_compiler___MWERKS__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14677,9 +17518,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __MWERKS__ - choke me -#endif + + #ifndef __MWERKS__ + choke me + #endif ; return 0; @@ -14706,37 +17548,44 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - bakefile_compiler_mwerks=yes + bakefile_cv_cxx_compiler___MWERKS__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_compiler_mwerks=no +bakefile_cv_cxx_compiler___MWERKS__=no + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_cxx_compiler_mwerks=$bakefile_compiler_mwerks -fi -echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_mwerks" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler_mwerks" >&6 -MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes` -ac_ext=c +fi +echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___MWERKS__" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___MWERKS__" >&6 + if test "x$bakefile_cv_cxx_compiler___MWERKS__" = "xyes"; then + :; MWCXX=yes + else + :; + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_ext=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_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 + echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6 -if test "${bakefile_cv_cxx_compiler_xlc+set}" = set; then +if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14749,9 +17598,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -14778,28 +17628,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - bakefile_compiler_xlc=yes + bakefile_cv_cxx_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_compiler_xlc=no +bakefile_cv_cxx_compiler___xlC__=no + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_cxx_compiler_xlc=$bakefile_compiler_xlc -fi -echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler_xlc" >&6 -XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes` -ac_ext=c +fi +echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6 + if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then + :; XLCXX=yes + else + :; + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + ;; IRIX*) @@ -14870,22 +17725,22 @@ 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 + if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then + :; SGICXX=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then - :; SGICXX=yes - else - :; - fi ;; - HP-UX*) + Linux*) ac_ext=cc @@ -14894,9 +17749,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 - echo "$as_me:$LINENO: checking whether we are using the HP C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the HP C++ compiler... $ECHO_C" >&6 -if test "${bakefile_cv_cxx_compiler___HP_aCC+set}" = set; then + 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 @@ -14910,7 +17765,7 @@ int main () { - #ifndef __HP_aCC + #ifndef __SUNPRO_CC choke me #endif @@ -14939,31 +17794,114 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - bakefile_cv_cxx_compiler___HP_aCC=yes + bakefile_cv_cxx_compiler___SUNPRO_CC=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_cv_cxx_compiler___HP_aCC=no +bakefile_cv_cxx_compiler___SUNPRO_CC=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6 +echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6 + if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then + :; SUNCXX=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___HP_aCC" = "xyes"; then + + + ;; + + HP-UX*) + + + 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 HP C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the HP C++ compiler... $ECHO_C" >&6 +if test "${bakefile_cv_cxx_compiler___HP_aCC+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 __HP_aCC + 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___HP_aCC=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +bakefile_cv_cxx_compiler___HP_aCC=no + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6 + if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then :; HPCXX=yes else :; fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + ;; @@ -15036,17 +17974,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5 echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6 + if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then + :; COMPAQCXX=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___DECCXX" = "xyes"; then - :; COMPAQCXX=yes - else - :; - fi ;; @@ -15119,17 +18057,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6 + if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then + :; SUNCXX=yes + else + :; + fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler___SUNPRO_CC" = "xyes"; then - :; SUNCXX=yes - else - :; - fi ;; @@ -15138,6 +18076,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test "$CXX" = "g++" -a "$GXX" != "yes"; then + { { echo "$as_me:$LINENO: error: C++ compiler is needed to build wxWidgets" >&5 +echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;} + { (exit 1); exit 1; }; } +fi + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -15219,7 +18163,8 @@ else fi -if test -n "$ac_tool_prefix"; then +if test "x$SUNCXX" != xyes; then + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -15298,10 +18243,11 @@ else AR="$ac_cv_prog_AR" fi -if test "x$AR" = "x" ; then - { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5 + if test "x$AR" = "x" ; then + { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5 echo "$as_me: error: ar is needed to build wxWidgets" >&2;} { (exit 1); exit 1; }; } + fi fi # Find a good install program. We prefer a C program (faster), @@ -16674,25 +19620,19 @@ done for ac_header in stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -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. */ $ac_includes_default + #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -16716,135 +19656,105 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +eval "$as_ac_Header=no" fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF +fi + +done + + +if test "$ac_cv_header_wchar_h" != "yes"; then + echo "$as_me:$LINENO: checking for wcstr.h" >&5 +echo $ECHO_N "checking for wcstr.h... $ECHO_C" >&6 +if test "${ac_cv_header_wcstr_h+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 <$ac_header> +$ac_includes_default + +#include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + (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 + ac_cv_header_wcstr_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +ac_cv_header_wcstr_h=no fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_wcstr_h" >&5 +echo "${ECHO_T}$ac_cv_header_wcstr_h" >&6 -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF fi -done - - -if test "$ac_cv_header_wchar_h" != "yes"; then +case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + if test $ac_cv_header_langinfo_h = "yes" \ + -a \( "$wx_cv_gccversion" = "EMX2" \ + -o "$wx_cv_gccversion" = "EMX3" \ + -o "$wx_cv_gccversion" = "Innotek5" \); then + LIBS="$LIBS -lintl" + fi + ;; +esac -for ac_header in wcstr.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if test "$USE_UNIX" = 1 ; then + echo "$as_me:$LINENO: checking for sys/select.h" >&5 +echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6 +if test "${ac_cv_header_sys_select_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -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. */ $ac_includes_default -#include <$ac_header> + +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -16867,125 +19777,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_sys_select_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_sys_select_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_sys_select_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -fi - -case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - if test $ac_cv_header_langinfo_h = "yes" \ - -a \( "$wx_cv_gccversion" = "EMX2" \ - -o "$wx_cv_gccversion" = "EMX3" \ - -o "$wx_cv_gccversion" = "Innotek5" \); then - LIBS="$LIBS -lintl" - fi - ;; -esac - -if test "$USE_UNIX" = 1 ; then -for ac_header in sys/select.h +for ac_header in sys/epoll.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -17133,7 +19941,6 @@ fi done -fi echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 @@ -17313,9 +20120,9 @@ _ACEOF esac -echo "$as_me:$LINENO: checking for char" >&5 -echo $ECHO_N "checking for char... $ECHO_C" >&6 -if test "${ac_cv_type_char+set}" = set; then +echo "$as_me:$LINENO: checking for short" >&5 +echo $ECHO_N "checking for short... $ECHO_C" >&6 +if test "${ac_cv_type_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -17328,9 +20135,9 @@ $ac_includes_default int main () { -if ((char *) 0) +if ((short *) 0) return 0; -if (sizeof (char)) +if (sizeof (short)) return 0; ; return 0; @@ -17357,24 +20164,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_char=yes + ac_cv_type_short=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_char=no +ac_cv_type_short=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 -echo "${ECHO_T}$ac_cv_type_char" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 +echo "${ECHO_T}$ac_cv_type_short" >&6 -echo "$as_me:$LINENO: checking size of char" >&5 -echo $ECHO_N "checking size of char... $ECHO_C" >&6 -if test "${ac_cv_sizeof_char+set}" = set; then +echo "$as_me:$LINENO: checking size of short" >&5 +echo $ECHO_N "checking size of short... $ECHO_C" >&6 +if test "${ac_cv_sizeof_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_char" = yes; then + if test "$ac_cv_type_short" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -17391,7 +20198,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; test_array [0] = 0 ; @@ -17431,7 +20238,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; test_array [0] = 0 ; @@ -17487,7 +20294,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; test_array [0] = 0 ; @@ -17527,7 +20334,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; test_array [0] = 0 ; @@ -17591,7 +20398,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; test_array [0] = 0 ; @@ -17629,10 +20436,10 @@ fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_char=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 +?*) ac_cv_sizeof_short=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char), 77 +echo "$as_me: error: cannot compute sizeof (short), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -17649,8 +20456,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (char)); } -unsigned long ulongval () { return (long) (sizeof (char)); } +long longval () { return (long) (sizeof (short)); } +unsigned long ulongval () { return (long) (sizeof (short)); } #include #include int @@ -17660,17 +20467,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (char))) < 0) + if (((long) (sizeof (short))) < 0) { long i = longval (); - if (i != ((long) (sizeof (char)))) + if (i != ((long) (sizeof (short)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (char)))) + if (i != ((long) (sizeof (short)))) exit (1); fprintf (f, "%lu\n", i); } @@ -17691,16 +20498,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_char=`cat conftest.val` + ac_cv_sizeof_short=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char), 77 +echo "$as_me: error: cannot compute sizeof (short), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -17709,19 +20516,19 @@ fi fi rm -f conftest.val else - ac_cv_sizeof_char=0 + ac_cv_sizeof_short=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 -echo "${ECHO_T}$ac_cv_sizeof_char" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_CHAR $ac_cv_sizeof_char +#define SIZEOF_SHORT $ac_cv_sizeof_short _ACEOF -echo "$as_me:$LINENO: checking for short" >&5 -echo $ECHO_N "checking for short... $ECHO_C" >&6 -if test "${ac_cv_type_short+set}" = set; then +echo "$as_me:$LINENO: checking for void *" >&5 +echo $ECHO_N "checking for void *... $ECHO_C" >&6 +if test "${ac_cv_type_void_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -17734,9 +20541,9 @@ $ac_includes_default int main () { -if ((short *) 0) +if ((void * *) 0) return 0; -if (sizeof (short)) +if (sizeof (void *)) return 0; ; return 0; @@ -17763,24 +20570,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_short=yes + ac_cv_type_void_p=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_short=no +ac_cv_type_void_p=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 -echo "${ECHO_T}$ac_cv_type_short" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 +echo "${ECHO_T}$ac_cv_type_void_p" >&6 -echo "$as_me:$LINENO: checking size of short" >&5 -echo $ECHO_N "checking size of short... $ECHO_C" >&6 -if test "${ac_cv_sizeof_short+set}" = set; then +echo "$as_me:$LINENO: checking size of void *" >&5 +echo $ECHO_N "checking size of void *... $ECHO_C" >&6 +if test "${ac_cv_sizeof_void_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_short" = yes; then + if test "$ac_cv_type_void_p" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -17797,7 +20604,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)]; test_array [0] = 0 ; @@ -17837,7 +20644,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; test_array [0] = 0 ; @@ -17893,7 +20700,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)]; test_array [0] = 0 ; @@ -17933,7 +20740,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)]; test_array [0] = 0 ; @@ -17997,7 +20804,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; test_array [0] = 0 ; @@ -18035,10 +20842,10 @@ fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_short=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +?*) ac_cv_sizeof_void_p=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (void *), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -18055,8 +20862,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (short)); } -unsigned long ulongval () { return (long) (sizeof (short)); } +long longval () { return (long) (sizeof (void *)); } +unsigned long ulongval () { return (long) (sizeof (void *)); } #include #include int @@ -18066,17 +20873,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (short))) < 0) + if (((long) (sizeof (void *))) < 0) { long i = longval (); - if (i != ((long) (sizeof (short)))) + if (i != ((long) (sizeof (void *)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (short)))) + if (i != ((long) (sizeof (void *)))) exit (1); fprintf (f, "%lu\n", i); } @@ -18097,16 +20904,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_short=`cat conftest.val` + ac_cv_sizeof_void_p=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (void *), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -18115,19 +20922,19 @@ fi fi rm -f conftest.val else - ac_cv_sizeof_short=0 + ac_cv_sizeof_void_p=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 +echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_SHORT $ac_cv_sizeof_short +#define SIZEOF_VOID_P $ac_cv_sizeof_void_p _ACEOF -echo "$as_me:$LINENO: checking for void *" >&5 -echo $ECHO_N "checking for void *... $ECHO_C" >&6 -if test "${ac_cv_type_void_p+set}" = set; then +echo "$as_me:$LINENO: checking for int" >&5 +echo $ECHO_N "checking for int... $ECHO_C" >&6 +if test "${ac_cv_type_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -18140,9 +20947,9 @@ $ac_includes_default int main () { -if ((void * *) 0) +if ((int *) 0) return 0; -if (sizeof (void *)) +if (sizeof (int)) return 0; ; return 0; @@ -18169,24 +20976,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_void_p=yes + ac_cv_type_int=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_void_p=no +ac_cv_type_int=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5 -echo "${ECHO_T}$ac_cv_type_void_p" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 +echo "${ECHO_T}$ac_cv_type_int" >&6 -echo "$as_me:$LINENO: checking size of void *" >&5 -echo $ECHO_N "checking size of void *... $ECHO_C" >&6 -if test "${ac_cv_sizeof_void_p+set}" = set; then +echo "$as_me:$LINENO: checking size of int" >&5 +echo $ECHO_N "checking size of int... $ECHO_C" >&6 +if test "${ac_cv_sizeof_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_void_p" = yes; then + if test "$ac_cv_type_int" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -18203,7 +21010,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; test_array [0] = 0 ; @@ -18243,7 +21050,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; test_array [0] = 0 ; @@ -18299,7 +21106,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (void *))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; test_array [0] = 0 ; @@ -18339,7 +21146,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (void *))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; test_array [0] = 0 ; @@ -18403,7 +21210,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (void *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; test_array [0] = 0 ; @@ -18441,10 +21248,10 @@ fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_void_p=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 +?*) ac_cv_sizeof_int=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (void *), 77 +echo "$as_me: error: cannot compute sizeof (int), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -18461,8 +21268,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (void *)); } -unsigned long ulongval () { return (long) (sizeof (void *)); } +long longval () { return (long) (sizeof (int)); } +unsigned long ulongval () { return (long) (sizeof (int)); } #include #include int @@ -18472,17 +21279,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (void *))) < 0) + if (((long) (sizeof (int))) < 0) { long i = longval (); - if (i != ((long) (sizeof (void *)))) + if (i != ((long) (sizeof (int)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (void *)))) + if (i != ((long) (sizeof (int)))) exit (1); fprintf (f, "%lu\n", i); } @@ -18503,16 +21310,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_void_p=`cat conftest.val` + ac_cv_sizeof_int=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (void *), 77 +echo "$as_me: error: cannot compute sizeof (int), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -18521,19 +21328,19 @@ fi fi rm -f conftest.val else - ac_cv_sizeof_void_p=0 + ac_cv_sizeof_int=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5 -echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_VOID_P $ac_cv_sizeof_void_p +#define SIZEOF_INT $ac_cv_sizeof_int _ACEOF -echo "$as_me:$LINENO: checking for int" >&5 -echo $ECHO_N "checking for int... $ECHO_C" >&6 -if test "${ac_cv_type_int+set}" = set; then +echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6 +if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -18546,9 +21353,9 @@ $ac_includes_default int main () { -if ((int *) 0) +if ((long *) 0) return 0; -if (sizeof (int)) +if (sizeof (long)) return 0; ; return 0; @@ -18575,24 +21382,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_int=yes + ac_cv_type_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_int=no +ac_cv_type_long=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 -echo "${ECHO_T}$ac_cv_type_int" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6 -echo "$as_me:$LINENO: checking size of int" >&5 -echo $ECHO_N "checking size of int... $ECHO_C" >&6 -if test "${ac_cv_sizeof_int+set}" = set; then +echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_int" = yes; then + if test "$ac_cv_type_long" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -18609,7 +21416,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; test_array [0] = 0 ; @@ -18649,7 +21456,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -18705,7 +21512,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; test_array [0] = 0 ; @@ -18745,7 +21552,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; test_array [0] = 0 ; @@ -18809,7 +21616,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -18847,10 +21654,10 @@ fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +?*) ac_cv_sizeof_long=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -18867,8 +21674,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (int)); } -unsigned long ulongval () { return (long) (sizeof (int)); } +long longval () { return (long) (sizeof (long)); } +unsigned long ulongval () { return (long) (sizeof (long)); } #include #include int @@ -18878,17 +21685,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (int))) < 0) + if (((long) (sizeof (long))) < 0) { long i = longval (); - if (i != ((long) (sizeof (int)))) + if (i != ((long) (sizeof (long)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (int)))) + if (i != ((long) (sizeof (long)))) exit (1); fprintf (f, "%lu\n", i); } @@ -18909,16 +21716,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_int=`cat conftest.val` + ac_cv_sizeof_long=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -18927,19 +21734,19 @@ fi fi rm -f conftest.val else - ac_cv_sizeof_int=0 + ac_cv_sizeof_long=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT $ac_cv_sizeof_int +#define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF -echo "$as_me:$LINENO: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6 -if test "${ac_cv_type_long+set}" = set; then +echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -18952,9 +21759,9 @@ $ac_includes_default int main () { -if ((long *) 0) +if ((size_t *) 0) return 0; -if (sizeof (long)) +if (sizeof (size_t)) return 0; ; return 0; @@ -18981,24 +21788,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_long=yes + ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_long=no +ac_cv_type_size_t=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 -echo "$as_me:$LINENO: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6 -if test "${ac_cv_sizeof_long+set}" = set; then +echo "$as_me:$LINENO: checking size of size_t" >&5 +echo $ECHO_N "checking size of size_t... $ECHO_C" >&6 +if test "${ac_cv_sizeof_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_long" = yes; then + if test "$ac_cv_type_size_t" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -19015,7 +21822,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)]; test_array [0] = 0 ; @@ -19055,7 +21862,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; test_array [0] = 0 ; @@ -19111,7 +21918,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)]; test_array [0] = 0 ; @@ -19151,7 +21958,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)]; test_array [0] = 0 ; @@ -19215,7 +22022,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; test_array [0] = 0 ; @@ -19253,10 +22060,10 @@ fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +?*) ac_cv_sizeof_size_t=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (size_t), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -19273,8 +22080,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (long)); } -unsigned long ulongval () { return (long) (sizeof (long)); } +long longval () { return (long) (sizeof (size_t)); } +unsigned long ulongval () { return (long) (sizeof (size_t)); } #include #include int @@ -19284,17 +22091,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (long))) < 0) + if (((long) (sizeof (size_t))) < 0) { long i = longval (); - if (i != ((long) (sizeof (long)))) + if (i != ((long) (sizeof (size_t)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (long)))) + if (i != ((long) (sizeof (size_t)))) exit (1); fprintf (f, "%lu\n", i); } @@ -19315,16 +22122,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_long=`cat conftest.val` + ac_cv_sizeof_size_t=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (size_t), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -19333,19 +22140,22 @@ fi fi rm -f conftest.val else - ac_cv_sizeof_long=0 + ac_cv_sizeof_size_t=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long +#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t _ACEOF -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then + +case "${host}" in + arm-*-linux* ) + echo "$as_me:$LINENO: checking for long long" >&5 +echo $ECHO_N "checking for long long... $ECHO_C" >&6 +if test "${ac_cv_type_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -19358,9 +22168,9 @@ $ac_includes_default int main () { -if ((size_t *) 0) +if ((long long *) 0) return 0; -if (sizeof (size_t)) +if (sizeof (long long)) return 0; ; return 0; @@ -19387,24 +22197,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_size_t=yes + ac_cv_type_long_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no +ac_cv_type_long_long=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 +echo "${ECHO_T}$ac_cv_type_long_long" >&6 -echo "$as_me:$LINENO: checking size of size_t" >&5 -echo $ECHO_N "checking size of size_t... $ECHO_C" >&6 -if test "${ac_cv_sizeof_size_t+set}" = set; then +echo "$as_me:$LINENO: checking size of long long" >&5 +echo $ECHO_N "checking size of long long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_long_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_size_t" = yes; then + if test "$ac_cv_type_long_long" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -19421,7 +22231,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)]; test_array [0] = 0 ; @@ -19461,7 +22271,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -19517,7 +22327,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)]; test_array [0] = 0 ; @@ -19557,7 +22367,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)]; test_array [0] = 0 ; @@ -19621,7 +22431,7 @@ $ac_includes_default int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; test_array [0] = 0 ; @@ -19659,10 +22469,10 @@ fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in -?*) ac_cv_sizeof_size_t=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +?*) ac_cv_sizeof_long_long=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t), 77 +echo "$as_me: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac @@ -19679,8 +22489,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (size_t)); } -unsigned long ulongval () { return (long) (sizeof (size_t)); } +long longval () { return (long) (sizeof (long long)); } +unsigned long ulongval () { return (long) (sizeof (long long)); } #include #include int @@ -19690,17 +22500,17 @@ main () FILE *f = fopen ("conftest.val", "w"); if (! f) exit (1); - if (((long) (sizeof (size_t))) < 0) + if (((long) (sizeof (long long))) < 0) { long i = longval (); - if (i != ((long) (sizeof (size_t)))) + if (i != ((long) (sizeof (long long)))) exit (1); fprintf (f, "%ld\n", i); } else { unsigned long i = ulongval (); - if (i != ((long) (sizeof (size_t)))) + if (i != ((long) (sizeof (long long)))) exit (1); fprintf (f, "%lu\n", i); } @@ -19721,16 +22531,16 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_sizeof_size_t=`cat conftest.val` + ac_cv_sizeof_long_long=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t), 77 +echo "$as_me: error: cannot compute sizeof (long long), 77 See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi @@ -19739,19 +22549,18 @@ fi fi rm -f conftest.val else - ac_cv_sizeof_size_t=0 + ac_cv_sizeof_long_long=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6 cat >>confdefs.h <<_ACEOF -#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t +#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long _ACEOF - -case "${host}" in - arm-*-linux* ) + ;; + *-hp-hpux* ) echo "$as_me:$LINENO: checking for long long" >&5 echo $ECHO_N "checking for long long... $ECHO_C" >&6 if test "${ac_cv_type_long_long+set}" = set; then @@ -20158,8 +22967,11 @@ cat >>confdefs.h <<_ACEOF _ACEOF + if test "$ac_cv_sizeof_long_long" != "0"; then + CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS" + fi ;; - *-hp-hpux* ) + * ) echo "$as_me:$LINENO: checking for long long" >&5 echo $ECHO_N "checking for long long... $ECHO_C" >&6 if test "${ac_cv_type_long_long+set}" = set; then @@ -20566,14 +23378,11 @@ cat >>confdefs.h <<_ACEOF _ACEOF - if test "$ac_cv_sizeof_long_long" != "0"; then - CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS" - fi - ;; - * ) - echo "$as_me:$LINENO: checking for long long" >&5 -echo $ECHO_N "checking for long long... $ECHO_C" >&6 -if test "${ac_cv_type_long_long+set}" = set; then +esac + +echo "$as_me:$LINENO: checking for wchar_t" >&5 +echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 +if test "${ac_cv_type_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -20582,13 +23391,30 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + + /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */ + #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 ) + # error "fake wchar_t" + #endif + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + + + int main () { -if ((long long *) 0) +if ((wchar_t *) 0) return 0; -if (sizeof (long long)) +if (sizeof (wchar_t)) return 0; ; return 0; @@ -20615,24 +23441,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_long_long=yes + ac_cv_type_wchar_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_long_long=no +ac_cv_type_wchar_t=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5 -echo "${ECHO_T}$ac_cv_type_long_long" >&6 +echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5 +echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:$LINENO: checking size of long long" >&5 -echo $ECHO_N "checking size of long long... $ECHO_C" >&6 -if test "${ac_cv_sizeof_long_long+set}" = set; then +echo "$as_me:$LINENO: checking size of wchar_t" >&5 +echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 +if test "${ac_cv_sizeof_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_long_long" = yes; then + if test "$ac_cv_type_wchar_t" = yes; then # The cast to unsigned long works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -20645,453 +23471,28 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + + /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */ + #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 ) + # error "fake wchar_t" + #endif + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + + + int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)]; -test_array [0] = 0 - - ; - 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 - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; -test_array [0] = 0 - - ; - 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 - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)]; -test_array [0] = 0 - - ; - 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 - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)]; -test_array [0] = 0 - - ; - 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 - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_lo= ac_hi= -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)]; -test_array [0] = 0 - - ; - 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 - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_lo=`expr '(' $ac_mid ')' + 1` -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in -?*) ac_cv_sizeof_long_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long long), 77 -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; -esac -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -long longval () { return (long) (sizeof (long long)); } -unsigned long ulongval () { return (long) (sizeof (long long)); } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); - if (((long) (sizeof (long long))) < 0) - { - long i = longval (); - if (i != ((long) (sizeof (long long)))) - exit (1); - fprintf (f, "%ld\n", i); - } - else - { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (long long)))) - exit (1); - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./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 - ac_cv_sizeof_long_long=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long long), 77 -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -rm -f conftest.val -else - ac_cv_sizeof_long_long=0 -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6 -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long -_ACEOF - - -esac - -echo "$as_me:$LINENO: checking for wchar_t" >&5 -echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 -if test "${ac_cv_type_wchar_t+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. */ - - /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */ - #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 ) - # error "fake wchar_t" - #endif - #ifdef HAVE_WCHAR_H - # ifdef __CYGWIN__ - # include - # endif - # include - #endif - #ifdef HAVE_STDLIB_H - # include - #endif - #include - - - -int -main () -{ -if ((wchar_t *) 0) - return 0; -if (sizeof (wchar_t)) - return 0; - ; - 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 - ac_cv_type_wchar_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_wchar_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5 -echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 - -echo "$as_me:$LINENO: checking size of wchar_t" >&5 -echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 -if test "${ac_cv_sizeof_wchar_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$ac_cv_type_wchar_t" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */ - #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 ) - # error "fake wchar_t" - #endif - #ifdef HAVE_WCHAR_H - # ifdef __CYGWIN__ - # include - # endif - # include - #endif - #ifdef HAVE_STDLIB_H - # include - #endif - #include - - - -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) >= 0)]; +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) >= 0)]; test_array [0] = 0 ; @@ -21516,6 +23917,12 @@ if test "${wx_cv_func_va_copy+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 #include @@ -21542,7 +23949,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -21564,6 +23971,12 @@ wx_cv_func_va_copy=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext 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 @@ -22309,237 +24722,6 @@ _ACEOF 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 how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -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 - - @@ -22550,30 +24732,20 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -for ac_header in iostream -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for iostream" >&5 +echo $ECHO_N "checking for iostream... $ECHO_C" >&6 +if test "${ac_cv_header_iostream+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -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. */ -$ac_includes_default -#include <$ac_header> + + +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -22596,108 +24768,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_iostream=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_iostream=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_iostream" >&5 +echo "${ECHO_T}$ac_cv_header_iostream" >&6 -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done if test "$ac_cv_header_iostream" = "yes" ; then @@ -23659,25 +25741,20 @@ _ACEOF fi - if test "${ac_cv_header_hash_map+set}" = set; then - echo "$as_me:$LINENO: checking for hash_map" >&5 + echo "$as_me:$LINENO: checking for hash_map" >&5 echo $ECHO_N "checking for hash_map... $ECHO_C" >&6 if test "${ac_cv_header_hash_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_hash_map" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking hash_map usability" >&5 -echo $ECHO_N "checking hash_map usability... $ECHO_C" >&6 -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. */ -$ac_includes_default + + + #include _ACEOF rm -f conftest.$ac_objext @@ -23701,100 +25778,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_hash_map=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_hash_map=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking hash_map presence" >&5 -echo $ECHO_N "checking hash_map presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: hash_map: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: hash_map: present but cannot be compiled" >&5 -echo "$as_me: WARNING: hash_map: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: hash_map: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: hash_map: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: hash_map: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: hash_map: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for hash_map" >&5 -echo $ECHO_N "checking for hash_map... $ECHO_C" >&6 -if test "${ac_cv_header_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_hash_map=$ac_header_preproc fi echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 echo "${ECHO_T}$ac_cv_header_hash_map" >&6 - -fi if test $ac_cv_header_hash_map = yes; then echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5 echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6 @@ -23852,7 +25846,6 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5 echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6 - fi @@ -23868,25 +25861,20 @@ _ACEOF fi - if test "${ac_cv_header_ext_hash_map+set}" = set; then - echo "$as_me:$LINENO: checking for ext/hash_map" >&5 + echo "$as_me:$LINENO: checking for ext/hash_map" >&5 echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6 if test "${ac_cv_header_ext_hash_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking ext/hash_map usability" >&5 -echo $ECHO_N "checking ext/hash_map usability... $ECHO_C" >&6 -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. */ -$ac_includes_default + + + #include _ACEOF rm -f conftest.$ac_objext @@ -23910,100 +25898,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_ext_hash_map=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_ext_hash_map=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking ext/hash_map presence" >&5 -echo $ECHO_N "checking ext/hash_map presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ext/hash_map: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ext/hash_map: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ext/hash_map: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ext/hash_map: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ext/hash_map: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for ext/hash_map" >&5 -echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6 -if test "${ac_cv_header_ext_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_ext_hash_map=$ac_header_preproc fi echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6 - -fi if test $ac_cv_header_ext_hash_map = yes; then echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5 echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6 @@ -24061,7 +25966,6 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5 echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6 - fi @@ -24827,6 +26731,12 @@ echo "${ECHO_T}no" >&6 fi 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 + if test "wxUSE_UNICODE" = "yes"; then for wx_func in wcstoull @@ -24871,7 +26781,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -24954,7 +26864,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -24994,6 +26904,12 @@ _ACEOF done fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + @@ -25010,25 +26926,19 @@ echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode b fi if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then - if test "${ac_cv_header_regex_h+set}" = set; then - echo "$as_me:$LINENO: checking for regex.h" >&5 + echo "$as_me:$LINENO: checking for regex.h" >&5 echo $ECHO_N "checking for regex.h... $ECHO_C" >&6 if test "${ac_cv_header_regex_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5 -echo "${ECHO_T}$ac_cv_header_regex_h" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking regex.h usability" >&5 -echo $ECHO_N "checking regex.h usability... $ECHO_C" >&6 -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. */ -$ac_includes_default + + #include _ACEOF rm -f conftest.$ac_objext @@ -25052,100 +26962,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_regex_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_regex_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking regex.h presence" >&5 -echo $ECHO_N "checking regex.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: regex.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: regex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: regex.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: regex.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: regex.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: regex.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: regex.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: regex.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: regex.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: regex.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for regex.h" >&5 -echo $ECHO_N "checking for regex.h... $ECHO_C" >&6 -if test "${ac_cv_header_regex_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_regex_h=$ac_header_preproc fi echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5 echo "${ECHO_T}$ac_cv_header_regex_h" >&6 - -fi if test $ac_cv_header_regex_h = yes; then @@ -25343,25 +27170,19 @@ fi fi echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 - if test "${ac_cv_header_zlib_h+set}" = set; then - echo "$as_me:$LINENO: checking for zlib.h" >&5 + echo "$as_me:$LINENO: checking for zlib.h" >&5 echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 if test "${ac_cv_header_zlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking zlib.h usability" >&5 -echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6 -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. */ -$ac_includes_default + + #include _ACEOF rm -f conftest.$ac_objext @@ -25385,101 +27206,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_zlib_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_zlib_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking zlib.h presence" >&5 -echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 -if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_zlib_h=$ac_header_preproc fi echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 -fi - system_zlib_h_ok=$ac_cv_header_zlib_h @@ -25648,25 +27386,19 @@ fi fi echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 echo "${ECHO_T}$ac_cv_header_png_h" >&6 - if test "${ac_cv_header_png_h+set}" = set; then - echo "$as_me:$LINENO: checking for png.h" >&5 + echo "$as_me:$LINENO: checking for png.h" >&5 echo $ECHO_N "checking for png.h... $ECHO_C" >&6 if test "${ac_cv_header_png_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking png.h usability" >&5 -echo $ECHO_N "checking png.h usability... $ECHO_C" >&6 -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. */ -$ac_includes_default + + #include _ACEOF rm -f conftest.$ac_objext @@ -25690,101 +27422,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_png_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_png_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking png.h presence" >&5 -echo $ECHO_N "checking png.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6 -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_png_h=$ac_header_preproc fi echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 echo "${ECHO_T}$ac_cv_header_png_h" >&6 -fi - if test "$ac_cv_header_png_h" = "yes"; then @@ -26570,25 +28219,20 @@ _ACEOF if test "$wxUSE_ZLIB" = "sys"; then TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" fi - if test "${ac_cv_header_tiffio_h+set}" = set; then - echo "$as_me:$LINENO: checking for tiffio.h" >&5 + echo "$as_me:$LINENO: checking for tiffio.h" >&5 echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 if test "${ac_cv_header_tiffio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6 -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. */ -$ac_includes_default + + + #include _ACEOF rm -f conftest.$ac_objext @@ -26612,100 +28256,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_tiffio_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_tiffio_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 -if test "${ac_cv_header_tiffio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_tiffio_h=$ac_header_preproc fi echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 - -fi if test $ac_cv_header_tiffio_h = yes; then echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5 @@ -26776,7 +28337,6 @@ if test $ac_cv_lib_tiff_TIFFError = yes; then fi - fi @@ -26823,25 +28383,19 @@ _ACEOF if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then - if test "${ac_cv_header_expat_h+set}" = set; then - echo "$as_me:$LINENO: checking for expat.h" >&5 + echo "$as_me:$LINENO: checking for expat.h" >&5 echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 if test "${ac_cv_header_expat_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 -echo "${ECHO_T}$ac_cv_header_expat_h" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking expat.h usability" >&5 -echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6 -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. */ -$ac_includes_default + + #include _ACEOF rm -f conftest.$ac_objext @@ -26865,100 +28419,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_expat_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_expat_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking expat.h presence" >&5 -echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for expat.h" >&5 -echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 -if test "${ac_cv_header_expat_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_expat_h=$ac_header_preproc fi echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 echo "${ECHO_T}$ac_cv_header_expat_h" >&6 - -fi if test $ac_cv_header_expat_h = yes; then found_expat_h=1 fi @@ -27128,25 +28599,19 @@ fi if test "$wxUSE_LIBMSPACK" != "no"; then - if test "${ac_cv_header_mspack_h+set}" = set; then - echo "$as_me:$LINENO: checking for mspack.h" >&5 + echo "$as_me:$LINENO: checking for mspack.h" >&5 echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6 if test "${ac_cv_header_mspack_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 -echo "${ECHO_T}$ac_cv_header_mspack_h" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking mspack.h usability" >&5 -echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6 -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. */ -$ac_includes_default + + #include _ACEOF rm -f conftest.$ac_objext @@ -27170,100 +28635,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_mspack_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_mspack_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking mspack.h presence" >&5 -echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: mspack.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: mspack.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for mspack.h" >&5 -echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6 -if test "${ac_cv_header_mspack_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_mspack_h=$ac_header_preproc fi echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 echo "${ECHO_T}$ac_cv_header_mspack_h" >&6 - -fi if test $ac_cv_header_mspack_h = yes; then found_mspack_h=1 fi @@ -27360,356 +28742,20 @@ TOOLKIT_INCLUDE= WIDGET_SET= if test "$USE_WIN32" = 1 ; then - -for ac_header in w32api.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $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. */ -$ac_includes_default -#include <$ac_header> -_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 - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for w32api.h" >&5 +echo $ECHO_N "checking for w32api.h... $ECHO_C" >&6 +if test "${ac_cv_header_w32api_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - if test "${ac_cv_header_windows_h+set}" = set; then - echo "$as_me:$LINENO: checking for windows.h" >&5 -echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 -if test "${ac_cv_header_windows_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -echo "${ECHO_T}$ac_cv_header_windows_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking windows.h usability" >&5 -echo $ECHO_N "checking windows.h usability... $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. */ -$ac_includes_default -#include -_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 - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking windows.h presence" >&5 -echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: windows.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: windows.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for windows.h" >&5 -echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 -if test "${ac_cv_header_windows_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_windows_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -echo "${ECHO_T}$ac_cv_header_windows_h" >&6 - -fi -if test $ac_cv_header_windows_h = yes; then - : -else - { { echo "$as_me:$LINENO: error: please set CFLAGS to contain the location of windows.h" >&5 -echo "$as_me: error: please set CFLAGS to contain the location of windows.h" >&2;} - { (exit 1); exit 1; }; } - -fi - - - - LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" - - if test "$wxUSE_ACCESSIBILITY" = "yes" ; then - LIBS="$LIBS -loleacc" - fi - - case "${host}" in - *-*-cygwin* ) - LIBS="$LIBS -lkernel32 -luser32" - esac - if test "$wxUSE_ODBC" = "sys" ; then - wxUSE_ODBC = "yes" - fi - if test "$wxUSE_ODBC" = "yes" ; then - LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS" - cat >>confdefs.h <<\_ACEOF -#define wxUSE_ODBC 1 -_ACEOF - - fi - - RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" - RESPROGRAMOBJ="\$(PROGRAM)_resources.o" - - WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__" - - WIN32INSTALL=win32install - - -for ac_header in pbt.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $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. */ -$ac_includes_default -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -27732,105 +28778,156 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_w32api_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_w32api_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_w32api_h" >&5 +echo "${ECHO_T}$ac_cv_header_w32api_h" >&6 -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF + + echo "$as_me:$LINENO: checking for windows.h" >&5 +echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 +if test "${ac_cv_header_windows_h+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 <$ac_header> + + +#include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + (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 + ac_cv_header_windows_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +ac_cv_header_windows_h=no fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +echo "${ECHO_T}$ac_cv_header_windows_h" >&6 +if test $ac_cv_header_windows_h = yes; then + : +else -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + { { echo "$as_me:$LINENO: error: please set CFLAGS to contain the location of windows.h" >&5 +echo "$as_me: error: please set CFLAGS to contain the location of windows.h" >&2;} + { (exit 1); exit 1; }; } + +fi + + + + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" + + if test "$wxUSE_ACCESSIBILITY" = "yes" ; then + LIBS="$LIBS -loleacc" + fi + + case "${host}" in + *-*-cygwin* ) + LIBS="$LIBS -lkernel32 -luser32" + esac + + if test "$wxUSE_ODBC" = "sys" ; then + wxUSE_ODBC = "yes" + fi + if test "$wxUSE_ODBC" = "yes" ; then + LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS" + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ODBC 1 +_ACEOF + + fi + + RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + RESPROGRAMOBJ="\$(PROGRAM)_resources.o" + + WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + + WIN32INSTALL=win32install + + echo "$as_me:$LINENO: checking for pbt.h" >&5 +echo $ECHO_N "checking for pbt.h... $ECHO_C" >&6 +if test "${ac_cv_header_pbt_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 + +#include _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 + ac_cv_header_pbt_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_header_pbt_h=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_header_pbt_h" >&5 +echo "${ECHO_T}$ac_cv_header_pbt_h" >&6 +if test $ac_cv_header_pbt_h = yes; then + : else cat >>confdefs.h <<\_ACEOF #define NEED_PBT_H 1 @@ -27838,7 +28935,6 @@ _ACEOF fi -done fi @@ -27864,8 +28960,8 @@ echo "$as_me: WARNING: Drag and Drop not supported under wxCocoa yet, disabled" wxUSE_DRAG_AND_DROP=no fi if test "$wxUSE_DRAGIMAGE" = "yes"; then - { echo "$as_me:$LINENO: WARNING: Drag Image and DandD not supported under wxCocoa yet, disabled" >&5 -echo "$as_me: WARNING: Drag Image and DandD not supported under wxCocoa yet, disabled" >&2;} + { echo "$as_me:$LINENO: WARNING: wxDragImage not supported under wxCocoa yet, disabled" >&5 +echo "$as_me: WARNING: wxDragImage not supported under wxCocoa yet, disabled" >&2;} wxUSE_DRAGIMAGE=no fi fi @@ -27904,7 +29000,7 @@ echo "${ECHO_T}" >&6 case "${host}" in *-*-solaris2* ) if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then - enable_gtktest=no + enable_gtktest=no fi esac @@ -28213,11 +29309,7 @@ rm -f conftest.err conftest.$ac_objext \ 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 + if test "$wxUSE_SHARED" != "yes"; then GTK_LIBS="$GTK_LIBS -lX11" fi esac @@ -28984,8 +30076,9 @@ fi - echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5 -echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6 + + echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5 +echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -28999,8 +30092,8 @@ int main () { - #if !GTK_CHECK_VERSION(2,6,0) - Not GTK+ 2.6 + #if !GTK_CHECK_VERSION(2,10,0) + Not GTK+ 2.10 #endif ; @@ -29029,6 +30122,10 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF +#define __WXGTK210__ 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF #define __WXGTK26__ 1 _ACEOF @@ -29039,7 +30136,7 @@ _ACEOF echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - ac_wxgtk26=1 + ac_wxgtk210=1 else echo "$as_me: failed program was:" >&5 @@ -29048,30 +30145,101 @@ sed 's/^/| /' conftest.$ac_ext >&5 echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - ac_wxgtk26=0 + ac_wxgtk210=0 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + if test "$ac_wxgtk210" = 0; then + echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5 +echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + #if !GTK_CHECK_VERSION(2,6,0) + Not GTK+ 2.6 + #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 + + cat >>confdefs.h <<\_ACEOF +#define __WXGTK26__ 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define __WXGTK24__ 1 +_ACEOF + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + ac_wxgtk26=1 + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + ac_wxgtk26=0 fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi if test "$ac_wxgtk26" = 0; then - echo "$as_me:$LINENO: checking if GTK+ is version >= 2.4" >&5 + echo "$as_me:$LINENO: checking if GTK+ is version >= 2.4" >&5 echo $ECHO_N "checking if GTK+ is version >= 2.4... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main () { - #if !GTK_CHECK_VERSION(2,4,0) - Not GTK+ 2.4 - #endif + #if !GTK_CHECK_VERSION(2,4,0) + Not GTK+ 2.4 + #endif ; return 0; @@ -29099,11 +30267,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define __WXGTK24__ 1 _ACEOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else @@ -29111,7 +30279,7 @@ else 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 fi @@ -29197,9 +30365,8 @@ _ACEOF fi - fi - if test "$USE_DARWIN" != 1; then + if test "$USE_DARWIN" != 1; then for ac_func in poll do @@ -29301,6 +30468,7 @@ _ACEOF fi done + fi fi TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" @@ -32457,32 +33625,36 @@ else fi + +if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then + if test "$TOOLKIT" = "DFB" ; then + wxUSE_UNICODE_UTF8=yes + elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "1" ; then + wxUSE_UNICODE_UTF8=yes + elif test "$USE_OS2" = "1" ; then + wxUSE_UNICODE_UTF8=yes + else + wxUSE_UNICODE_UTF8=no + fi +fi + + if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then - -for ac_header in X11/Xlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 +echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_Xlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -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. */ -$ac_includes_default -#include <$ac_header> + + +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -32505,116 +33677,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_X11_Xlib_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_X11_Xlib_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -for ac_header in X11/XKBlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5 +echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -32629,7 +33707,7 @@ cat >>conftest.$ac_ext <<_ACEOF #endif -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -32652,25 +33730,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + ac_cv_header_X11_XKBlib_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" +ac_cv_header_X11_XKBlib_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6 -fi - -done fi fi @@ -32684,25 +33755,19 @@ if test "$TOOLKIT" != "MSW" ; then if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then - if test "${ac_cv_header_sql_h+set}" = set; then - echo "$as_me:$LINENO: checking for sql.h" >&5 + echo "$as_me:$LINENO: checking for sql.h" >&5 echo $ECHO_N "checking for sql.h... $ECHO_C" >&6 if test "${ac_cv_header_sql_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5 -echo "${ECHO_T}$ac_cv_header_sql_h" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking sql.h usability" >&5 -echo $ECHO_N "checking sql.h usability... $ECHO_C" >&6 -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. */ -$ac_includes_default + + #include _ACEOF rm -f conftest.$ac_objext @@ -32726,100 +33791,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_sql_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_sql_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking sql.h presence" >&5 -echo $ECHO_N "checking sql.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: sql.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sql.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sql.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sql.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sql.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sql.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sql.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sql.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sql.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sql.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for sql.h" >&5 -echo $ECHO_N "checking for sql.h... $ECHO_C" >&6 -if test "${ac_cv_header_sql_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sql_h=$ac_header_preproc fi echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5 echo "${ECHO_T}$ac_cv_header_sql_h" >&6 - -fi if test $ac_cv_header_sql_h = yes; then found_sql_h=1 fi @@ -33122,13 +34104,9 @@ echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6 if test "$ac_find_libraries" != "" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - -for ac_header in X11/extensions/xf86vmode.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 +echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33143,7 +34121,7 @@ cat >>conftest.$ac_ext <<_ACEOF #endif -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -33166,27 +34144,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + ac_cv_header_X11_extensions_xf86vmode_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" +ac_cv_header_X11_extensions_xf86vmode_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6 +if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" fi -done else echo "$as_me:$LINENO: result: no" >&5 @@ -33201,13 +34175,9 @@ echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} wxUSE_DISPLAY="no" fi elif test "$wxUSE_MSW" = 1; then - -for ac_header in ddraw.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for ddraw.h" >&5 +echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6 +if test "${ac_cv_header_ddraw_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33218,7 +34188,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -33241,25 +34211,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + ac_cv_header_ddraw_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" +ac_cv_header_ddraw_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi +echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5 +echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6 -done fi fi @@ -33359,25 +34322,19 @@ echo "${ECHO_T}found in $ac_find_includes" >&6 echo "${ECHO_T}not found" >&6 fi - if test "${ac_cv_header_GL_gl_h+set}" = set; then - echo "$as_me:$LINENO: checking for GL/gl.h" >&5 + echo "$as_me:$LINENO: checking for GL/gl.h" >&5 echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 if test "${ac_cv_header_GL_gl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 -echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6 -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. */ -$ac_includes_default + + #include _ACEOF rm -f conftest.$ac_objext @@ -33401,100 +34358,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_GL_gl_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_GL_gl_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 -echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for GL/gl.h" >&5 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 -if test "${ac_cv_header_GL_gl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_GL_gl_h=$ac_header_preproc fi echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 - -fi if test $ac_cv_header_GL_gl_h = yes; then if test "${ac_cv_header_GL_glu_h+set}" = set; then @@ -33891,6 +34765,112 @@ echo "${ECHO_T}$wx_cv_version_script" >&6 esac + + + if test -n "$GCC"; then + CFLAGS_VISIBILITY="-fvisibility=hidden" + CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden" + echo "$as_me:$LINENO: checking for symbols visibility support" >&5 +echo $ECHO_N "checking for symbols visibility support... $ECHO_C" >&6 + if test "${wx_cv_cc_visibility+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + wx_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" + 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. */ + + /* we need gcc >= 4.0, older versions with visibility support + didn't have class visibility: */ + #if defined(__GNUC__) && __GNUC__ < 4 + error this gcc is too old; + #endif + + extern __attribute__((__visibility__("hidden"))) int hiddenvar; + extern __attribute__((__visibility__("default"))) int exportedvar; + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + class __attribute__((__visibility__("default"))) Foo { + Foo() {} + }; + +int +main () +{ + + ; + 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_cc_visibility=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +wx_cv_cc_visibility=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 + + CXXFLAGS="$wx_save_CXXFLAGS" +fi + + echo "$as_me:$LINENO: result: $wx_cv_cc_visibility" >&5 +echo "${ECHO_T}$wx_cv_cc_visibility" >&6 + if test $wx_cv_cc_visibility = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_VISIBILITY 1 +_ACEOF + + else + CFLAGS_VISIBILITY="" + CXXFLAGS_VISIBILITY="" + fi + + + fi + + + if test "x$SUNCXX" = xyes; then + SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib" + WXCONFIG_RPATH="-R\$libdir" + else case "${host}" in *-*-linux* | *-*-gnu* ) SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" @@ -33898,14 +34878,14 @@ echo "${ECHO_T}$wx_cv_version_script" >&6 ;; *-*-solaris2* ) - if test "$GCC" = yes ; then - CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS" - saveLdflags="$LDFLAGS" - LDFLAGS="$saveLdflags -Wl,-rpath,/" - echo "$as_me:$LINENO: checking if the linker accepts -rpath" >&5 + CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS" + + saveLdflags="$LDFLAGS" + LDFLAGS="$saveLdflags -Wl,-rpath,/" + echo "$as_me:$LINENO: checking if the linker accepts -rpath" >&5 echo $ECHO_N "checking if the linker accepts -rpath... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -33942,22 +34922,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-Wl,-rpath,\$libdir" + SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" + WXCONFIG_RPATH="-Wl,-rpath,\$libdir" 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 "$as_me:$LINENO: checking if the linker accepts -R" >&5 + echo "$as_me:$LINENO: checking if the linker accepts -R" >&5 echo $ECHO_N "checking if the linker accepts -R... $ECHO_C" >&6 - LDFLAGS="$saveLdflags -Wl,-R,/" - cat >conftest.$ac_ext <<_ACEOF + LDFLAGS="$saveLdflags -Wl,-R,/" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -33994,17 +34974,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-Wl,-R,\$libdir" + SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib" + WXCONFIG_RPATH="-Wl,-R,\$libdir" 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 fi @@ -34014,11 +34994,7 @@ rm -f conftest.err conftest.$ac_objext \ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$saveLdflags" - else - SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-R\$libdir" - fi + LDFLAGS="$saveLdflags" ;; *-*-darwin* ) @@ -34048,6 +35024,7 @@ EOF ;; esac + fi if test $wxUSE_RPATH = "no"; then SAMPLES_RPATH_FLAG='' @@ -34892,6 +35869,82 @@ _ACEOF fi fi +echo "$as_me:$LINENO: checking if wchar_t is separate type" >&5 +echo $ECHO_N "checking if wchar_t is separate type... $ECHO_C" >&6 +if test "${wx_cv_wchar_t_is_separate_type+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 +int +main () +{ + + return 0; } + + struct Foo { void foo(wchar_t); + void foo(unsigned short); + void foo(unsigned int); + void foo(unsigned long); }; + + int bar() { + + ; + 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_wchar_t_is_separate_type=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +wx_cv_wchar_t_is_separate_type=no + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $wx_cv_wchar_t_is_separate_type" >&5 +echo "${ECHO_T}$wx_cv_wchar_t_is_separate_type" >&6 + +if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxWCHAR_T_IS_REAL_TYPE 1 +_ACEOF + +else + cat >>confdefs.h <<\_ACEOF +#define wxWCHAR_T_IS_REAL_TYPE 0 +_ACEOF + +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -35134,103 +36187,205 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_msvcrt_wcslen=yes + ac_cv_lib_msvcrt_wcslen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_msvcrt_wcslen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_msvcrt_wcslen" >&5 +echo "${ECHO_T}$ac_cv_lib_msvcrt_wcslen" >&6 +if test $ac_cv_lib_msvcrt_wcslen = yes; then + WCHAR_OK=1 +fi + + else + echo "$as_me:$LINENO: checking for wcslen in -lw" >&5 +echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6 +if test "${ac_cv_lib_w_wcslen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lw $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char wcslen (); +int +main () +{ +wcslen (); + ; + 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 + ac_cv_lib_w_wcslen=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_w_wcslen=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_w_wcslen" >&5 +echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6 +if test $ac_cv_lib_w_wcslen = yes; then + + WCHAR_LINK=" -lw" + WCSLEN_FOUND=1 + +fi + + fi + fi + + if test "$WCSLEN_FOUND" = 1; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_WCSLEN 1 +_ACEOF + + fi + + +for ac_func in wcsdup +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + 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 + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_msvcrt_wcslen=no +eval "$as_ac_var=no" fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_msvcrt_wcslen" >&5 -echo "${ECHO_T}$ac_cv_lib_msvcrt_wcslen" >&6 -if test $ac_cv_lib_msvcrt_wcslen = yes; then - WCHAR_OK=1 fi - - else - echo "$as_me:$LINENO: checking for wcslen in -lw" >&5 -echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6 -if test "${ac_cv_lib_w_wcslen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lw $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char wcslen (); -int -main () -{ -wcslen (); - ; - return 0; -} +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _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 - ac_cv_lib_w_wcslen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_w_wcslen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_w_wcslen" >&5 -echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6 -if test $ac_cv_lib_w_wcslen = yes; then - - WCHAR_LINK=" -lw" - WCSLEN_FOUND=1 fi +done - fi - fi - - if test "$WCSLEN_FOUND" = 1; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_WCSLEN 1 -_ACEOF - - fi if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" @@ -35850,7 +37005,7 @@ cat >>conftest.$ac_ext <<_ACEOF int main (void) { char buffer[128]; - snprintf (buffer, 128, "%2\$d %3\$d %1\$d", 1, 2, 3); + snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3); if (strcmp ("2 3 1", buffer) == 0) exit (0); exit (1); @@ -36076,30 +37231,20 @@ _ACEOF #include " case "${host}" in *-*-solaris2* ) - -for ac_header in widec.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for widec.h" >&5 +echo $ECHO_N "checking for widec.h... $ECHO_C" >&6 +if test "${ac_cv_header_widec_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -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. */ $ac_includes_default -#include <$ac_header> + +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -36122,108 +37267,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_widec_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_widec_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - fi +echo "$as_me:$LINENO: result: $ac_cv_header_widec_h" >&5 +echo "${ECHO_T}$ac_cv_header_widec_h" >&6 -done if test "$ac_cv_header_widec_h" = "yes"; then wchar_headers="$wchar_headers @@ -36536,90 +37591,102 @@ _ACEOF fi done -fi - - - for wx_func in round - do - echo "$as_me:$LINENO: checking for $wx_func" >&5 -echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6 -if eval "test \"\${wx_cv_func_$wx_func+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 - $ac_includes_default - -int -main () -{ - - #ifndef $wx_func - &$wx_func; - #endif - - - ; - 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 - eval wx_cv_func_$wx_func=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval wx_cv_func_$wx_func=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5 -echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6 - - if eval test \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 -_ACEOF - - - else - : - - fi - done - +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 + + + for wx_func in round + do + echo "$as_me:$LINENO: checking for $wx_func" >&5 +echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6 +if eval "test \"\${wx_cv_func_$wx_func+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 + $ac_includes_default + +int +main () +{ + + #ifndef $wx_func + &$wx_func; + #endif + + + ; + 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_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_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 wx_cv_func_$wx_func=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval wx_cv_func_$wx_func=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5 +echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6 + + if eval test \$wx_cv_func_$wx_func = yes + then + cat >>confdefs.h <<_ACEOF +#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +_ACEOF + + + else + : + + fi + done + +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 "$TOOLKIT" != "MSW"; then @@ -38939,208 +40006,36 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - cat >>confdefs.h <<\_ACEOF -#define HAVE_INET_ATON 1 -_ACEOF - -else - - as_ac_Lib=`echo "ac_cv_lib_$INET_LINK''_inet_aton" | $as_tr_sh` -echo "$as_me:$LINENO: checking for inet_aton in -l$INET_LINK" >&5 -echo $ECHO_N "checking for inet_aton in -l$INET_LINK... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$INET_LINK $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char inet_aton (); -int -main () -{ -inet_aton (); - ; - 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 - eval "$as_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Lib=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_INET_ATON 1 -_ACEOF - -fi - - -fi -done - - -if test "x$INET_LINK" != "x"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_INET_ADDR 1 -_ACEOF - - INET_LINK=" -l$INET_LINK" -fi - - - for wx_func in fdopen - do - echo "$as_me:$LINENO: checking for $wx_func" >&5 -echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6 -if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF - - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - $ac_includes_default - -int -main () -{ - - #ifndef $wx_func - &$wx_func; - #endif - - - ; - 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 - eval wx_cv_func_$wx_func=yes + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval wx_cv_func_$wx_func=no +eval "$as_ac_var=no" fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - fi -echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5 -echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6 - - if eval test \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_INET_ATON 1 _ACEOF +else - else - : - - fi - done - - -fi - - - - -EXTRALIBS_ESD= -echo "$as_me:$LINENO: checking for esd_close in -lesd" >&5 -echo $ECHO_N "checking for esd_close in -lesd... $ECHO_C" >&6 -if test "${ac_cv_lib_esd_esd_close+set}" = set; then + as_ac_Lib=`echo "ac_cv_lib_$INET_LINK''_inet_aton" | $as_tr_sh` +echo "$as_me:$LINENO: checking for inet_aton in -l$INET_LINK" >&5 +echo $ECHO_N "checking for inet_aton in -l$INET_LINK... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lesd $LIBS" +LIBS="-l$INET_LINK $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -39154,11 +40049,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char esd_close (); +char inet_aton (); int main () { -esd_close (); +inet_aton (); ; return 0; } @@ -39184,203 +40079,76 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_esd_esd_close=yes + eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_esd_esd_close=no +eval "$as_ac_Lib=no" fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_esd_esd_close" >&5 -echo "${ECHO_T}$ac_cv_lib_esd_esd_close" >&6 -if test $ac_cv_lib_esd_esd_close = yes; then - - -for ac_header in esd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $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. */ -$ac_includes_default -#include <$ac_header> +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_INET_ATON 1 _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 - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +done -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +if test "x$INET_LINK" != "x"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_INET_ADDR 1 _ACEOF - EXTRALIBS_ESD="-lesd" - + INET_LINK=" -l$INET_LINK" fi -done - - -fi + for wx_func in fdopen + do + echo "$as_me:$LINENO: checking for $wx_func" >&5 +echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6 +if eval "test \"\${wx_cv_func_$wx_func+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF -echo "$as_me:$LINENO: checking for known CD-ROM interface" >&5 -echo $ECHO_N "checking for known CD-ROM interface... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef __linux__ - #include - #else - /* For Solaris */ - #include - #endif + + + $ac_includes_default int main () { -struct cdrom_tocentry entry, old_entry; + + #ifndef $wx_func + &$wx_func; + #endif + + ; 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 @@ -39393,26 +40161,42 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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 - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF -#define HAVE_KNOWN_CDROM_INTERFACE 1 -_ACEOF - + eval wx_cv_func_$wx_func=yes 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 +eval wx_cv_func_$wx_func=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5 +echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6 + + if eval test \$wx_cv_func_$wx_func = yes + then + cat >>confdefs.h <<_ACEOF +#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +_ACEOF + + + else + : + + fi + done + + +fi + cat >confcache <<\_ACEOF @@ -39489,12 +40273,14 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} THREAD_OPTS="-pthread" + if test "x$SUNCXX" = xyes; then + THREAD_OPTS="-mt lthread $THREAD_OPTS" + fi + case "${host}" in *-*-solaris2* | *-*-sunos4* ) if test "x$GCC" = "xyes"; then THREAD_OPTS="-pthreads $THREAD_OPTS" - else - THREAD_OPTS="-mt $THREAD_OPTS" fi ;; *-*-freebsd*) @@ -39762,6 +40548,12 @@ if test "${wx_cv_func_pthread_cleanup+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 @@ -39792,7 +40584,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -39817,6 +40609,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 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_pthread_cleanup" >&5 @@ -39828,30 +40626,20 @@ _ACEOF fi - -for ac_header in sched.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for sched.h" >&5 +echo $ECHO_N "checking for sched.h... $ECHO_C" >&6 +if test "${ac_cv_header_sched_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -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. */ $ac_includes_default -#include <$ac_header> + +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -39874,108 +40662,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_sched_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_sched_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_sched_h" >&5 +echo "${ECHO_T}$ac_cv_header_sched_h" >&6 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done if test "$ac_cv_header_sched_h" = "yes"; then echo "$as_me:$LINENO: checking for sched_yield" >&5 @@ -40412,114 +41110,214 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_sched_get_priority_max=yes + ac_cv_func_sched_get_priority_max=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_sched_get_priority_max=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_sched_get_priority_max" >&5 +echo "${ECHO_T}$ac_cv_func_sched_get_priority_max" >&6 +if test $ac_cv_func_sched_get_priority_max = yes; then + HAVE_PRIOR_FUNCS=1 +else + echo "$as_me:$LINENO: checking for sched_get_priority_max in -lposix4" >&5 +echo $ECHO_N "checking for sched_get_priority_max in -lposix4... $ECHO_C" >&6 +if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix4 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char sched_get_priority_max (); +int +main () +{ +sched_get_priority_max (); + ; + 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 + ac_cv_lib_posix4_sched_get_priority_max=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_posix4_sched_get_priority_max=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_get_priority_max" >&5 +echo "${ECHO_T}$ac_cv_lib_posix4_sched_get_priority_max" >&6 +if test $ac_cv_lib_posix4_sched_get_priority_max = yes; then + + HAVE_PRIOR_FUNCS=1 + POSIX4_LINK=" -lposix4" + +fi + + +fi + + +fi + + +fi + + + if test "$HAVE_PRIOR_FUNCS" = 1; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: Setting thread priority will not work" >&5 +echo "$as_me: WARNING: Setting thread priority will not work" >&2;} + fi + + echo "$as_me:$LINENO: checking for pthread_cancel" >&5 +echo $ECHO_N "checking for pthread_cancel... $ECHO_C" >&6 +if test "${ac_cv_func_pthread_cancel+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define pthread_cancel to an innocuous variant, in case declares pthread_cancel. + For example, HP-UX 11i declares gettimeofday. */ +#define pthread_cancel innocuous_pthread_cancel + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char pthread_cancel (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef pthread_cancel + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char pthread_cancel (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_pthread_cancel) || defined (__stub___pthread_cancel) +choke me +#else +char (*f) () = pthread_cancel; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != pthread_cancel; + ; + 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 + ac_cv_func_pthread_cancel=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_sched_get_priority_max=no +ac_cv_func_pthread_cancel=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_sched_get_priority_max" >&5 -echo "${ECHO_T}$ac_cv_func_sched_get_priority_max" >&6 -if test $ac_cv_func_sched_get_priority_max = yes; then - HAVE_PRIOR_FUNCS=1 -else - echo "$as_me:$LINENO: checking for sched_get_priority_max in -lposix4" >&5 -echo $ECHO_N "checking for sched_get_priority_max in -lposix4... $ECHO_C" >&6 -if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +echo "$as_me:$LINENO: result: $ac_cv_func_pthread_cancel" >&5 +echo "${ECHO_T}$ac_cv_func_pthread_cancel" >&6 +if test $ac_cv_func_pthread_cancel = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_PTHREAD_CANCEL 1 _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char sched_get_priority_max (); -int -main () -{ -sched_get_priority_max (); - ; - 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 - ac_cv_lib_posix4_sched_get_priority_max=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_posix4_sched_get_priority_max=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_get_priority_max" >&5 -echo "${ECHO_T}$ac_cv_lib_posix4_sched_get_priority_max" >&6 -if test $ac_cv_lib_posix4_sched_get_priority_max = yes; then - - HAVE_PRIOR_FUNCS=1 - POSIX4_LINK=" -lposix4" - -fi - - -fi - - -fi - - + { echo "$as_me:$LINENO: WARNING: wxThread::Kill() will not work properly" >&5 +echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;} fi - if test "$HAVE_PRIOR_FUNCS" = 1; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 -_ACEOF - - else - { echo "$as_me:$LINENO: WARNING: Setting thread priority will not work" >&5 -echo "$as_me: WARNING: Setting thread priority will not work" >&2;} - fi - - echo "$as_me:$LINENO: checking for pthread_cancel" >&5 -echo $ECHO_N "checking for pthread_cancel... $ECHO_C" >&6 -if test "${ac_cv_func_pthread_cancel+set}" = set; then + echo "$as_me:$LINENO: checking for pthread_mutex_timedlock" >&5 +echo $ECHO_N "checking for pthread_mutex_timedlock... $ECHO_C" >&6 +if test "${ac_cv_func_pthread_mutex_timedlock+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -40528,12 +41326,12 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define pthread_cancel to an innocuous variant, in case declares pthread_cancel. +/* Define pthread_mutex_timedlock to an innocuous variant, in case declares pthread_mutex_timedlock. For example, HP-UX 11i declares gettimeofday. */ -#define pthread_cancel innocuous_pthread_cancel +#define pthread_mutex_timedlock innocuous_pthread_mutex_timedlock /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_cancel (); below. + which can conflict with char pthread_mutex_timedlock (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -40543,7 +41341,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif -#undef pthread_cancel +#undef pthread_mutex_timedlock /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -40552,14 +41350,14 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char pthread_cancel (); +char pthread_mutex_timedlock (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_pthread_cancel) || defined (__stub___pthread_cancel) +#if defined (__stub_pthread_mutex_timedlock) || defined (__stub___pthread_mutex_timedlock) choke me #else -char (*f) () = pthread_cancel; +char (*f) () = pthread_mutex_timedlock; #endif #ifdef __cplusplus } @@ -40568,7 +41366,7 @@ char (*f) () = pthread_cancel; int main () { -return f != pthread_cancel; +return f != pthread_mutex_timedlock; ; return 0; } @@ -40594,26 +41392,26 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_pthread_cancel=yes + ac_cv_func_pthread_mutex_timedlock=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_pthread_cancel=no +ac_cv_func_pthread_mutex_timedlock=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_pthread_cancel" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_cancel" >&6 -if test $ac_cv_func_pthread_cancel = yes; then +echo "$as_me:$LINENO: result: $ac_cv_func_pthread_mutex_timedlock" >&5 +echo "${ECHO_T}$ac_cv_func_pthread_mutex_timedlock" >&6 +if test $ac_cv_func_pthread_mutex_timedlock = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_CANCEL 1 +#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1 _ACEOF else - { echo "$as_me:$LINENO: WARNING: wxThread::Kill() will not work properly" >&5 -echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;} + { echo "$as_me:$LINENO: WARNING: wxMutex::LockTimeout() will not work" >&5 +echo "$as_me: WARNING: wxMutex::LockTimeout() will not work" >&2;} fi @@ -42150,18 +42948,18 @@ else fi -if test "x$WXWIN_COMPATIBILITY_2_4" = "xyes"; then +if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then cat >>confdefs.h <<\_ACEOF -#define WXWIN_COMPATIBILITY_2_4 1 +#define WXWIN_COMPATIBILITY_2_6 1 _ACEOF - WXWIN_COMPATIBILITY_2_6="yes" + WXWIN_COMPATIBILITY_2_8="yes" fi -if test "x$WXWIN_COMPATIBILITY_2_6" != "xno"; then +if test "x$WXWIN_COMPATIBILITY_2_8" != "xno"; then cat >>confdefs.h <<\_ACEOF -#define WXWIN_COMPATIBILITY_2_6 1 +#define WXWIN_COMPATIBILITY_2_8 1 _ACEOF fi @@ -42807,6 +43605,13 @@ _ACEOF fi +if test "$wxUSE_EXTENDED_RTTI" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_EXTENDED_RTTI 1 +_ACEOF + +fi + if test "$wxUSE_APPLE_IEEE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_APPLE_IEEE 1 @@ -42948,8 +43753,6 @@ echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6 #define HAVE_SYS_SOUNDCARD_H 1 _ACEOF - else - DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia" fi fi @@ -43941,6 +44744,13 @@ _ACEOF fi +if test "$wxUSE_BASE64" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_BASE64 1 +_ACEOF + +fi + if test "$wxUSE_STREAMS" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_STREAMS 1 @@ -43955,16 +44765,18 @@ _ACEOF fi +if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OBJC_UNIQUIFYING 1 +_ACEOF +fi -if test "$wxUSE_DATETIME" = "yes"; then -for ac_func in strptime -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +if test "$wxUSE_DATETIME" = "yes"; then + echo "$as_me:$LINENO: checking for strptime" >&5 +echo $ECHO_N "checking for strptime... $ECHO_C" >&6 +if test "${ac_cv_func_strptime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -43973,12 +44785,12 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. +/* Define strptime to an innocuous variant, in case declares strptime. For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func +#define strptime innocuous_strptime /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. + which can conflict with char strptime (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -43988,7 +44800,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif -#undef $ac_func +#undef strptime /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -43997,14 +44809,14 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func (); +char strptime (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined (__stub_strptime) || defined (__stub___strptime) choke me #else -char (*f) () = $ac_func; +char (*f) () = strptime; #endif #ifdef __cplusplus } @@ -44013,7 +44825,7 @@ char (*f) () = $ac_func; int main () { -return f != $ac_func; +return f != strptime; ; return 0; } @@ -44039,25 +44851,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_var=yes" + ac_cv_func_strptime=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +ac_cv_func_strptime=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done +echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5 +echo "${ECHO_T}$ac_cv_func_strptime" >&6 if test "$ac_cv_func_strptime" = "yes"; then echo "$as_me:$LINENO: checking for strptime declaration" >&5 @@ -44139,6 +44944,67 @@ echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6 #define HAVE_STRPTIME_DECL 1 _ACEOF + else + wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);" + fi + if test "$ac_cv_func_strptime" = "yes"; then + echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5 +echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6 +if test "${wx_cv_func_strptime_ok+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + wx_cv_func_strptime_ok=no + +else + cat >conftest.$ac_ext <<_ACEOF + + #include + #include + #include "confdefs.h" + + $wx_strptime_decl + + int main() + { + struct tm t; + return !!strptime("", "%x", &t); + } + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./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_func_strptime_ok=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +wx_cv_func_strptime_ok=no +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + +fi +echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5 +echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6 + + if test "$wx_cv_func_strptime_ok" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STRPTIME 1 +_ACEOF + + fi fi echo "$as_me:$LINENO: checking for timezone variable in " >&5 @@ -45128,6 +45994,12 @@ if test "${wx_cv_type_getsockopt5+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 @@ -45158,7 +46030,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -45176,12 +46048,6 @@ else sed 's/^/| /' conftest.$ac_ext >&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 - cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -45283,17 +46149,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c + + +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 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi echo "$as_me:$LINENO: result: $wx_cv_type_getsockopt5" >&5 echo "${ECHO_T}$wx_cv_type_getsockopt5" >&6 @@ -45473,7 +46339,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +$ac_includes_default #include _ACEOF @@ -45626,6 +46492,20 @@ fi fi fi +if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UNICODE_UTF8 1 +_ACEOF + + + if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UTF8_LOCALE_ONLY 1 +_ACEOF + + fi +fi + if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_EXPERIMENTAL_PRINTF 1 @@ -45729,11 +46609,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" fi -if test "$wxUSE_PROLOGIO" = "yes" -o "$wxUSE_RESOURCES" = "yes"; then - { { echo "$as_me:$LINENO: error: wxExpr and old-style resources are now available in contrib only" >&5 -echo "$as_me: error: wxExpr and old-style resources are now available in contrib only" >&2;} - { (exit 1); exit 1; }; } -fi if test "$wxUSE_METAFILE" = "yes"; then @@ -45749,30 +46624,20 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ -o "$wxUSE_CLIPBOARD" = "yes" \ -o "$wxUSE_OLE" = "yes" \ -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then - -for ac_header in ole2.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for ole2.h" >&5 +echo $ECHO_N "checking for ole2.h... $ECHO_C" >&6 +if test "${ac_cv_header_ole2_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -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. */ -$ac_includes_default -#include <$ac_header> + + +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -45795,108 +46660,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_header_compiler=yes + ac_cv_header_ole2_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_ole2_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_ole2_h" >&5 +echo "${ECHO_T}$ac_cv_header_ole2_h" >&6 - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done if test "$ac_cv_header_ole2_h" = "yes" ; then @@ -45962,7 +46737,7 @@ _ACEOF _ACEOF cat >>confdefs.h <<\_ACEOF -#define wxUSE_OLE_ACTIVEX 1 +#define wxUSE_ACTIVEX 1 _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto" @@ -46015,9 +46790,9 @@ _ACEOF fi if test "$wxUSE_DATAOBJ" = "yes"; then - if test "$wxUSE_MGL" = 1; then - { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under MGL... disabled" >&5 -echo "$as_me: WARNING: wxDataObject not yet supported under MGL... disabled" >&2;} + if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then + { echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5 +echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;} wxUSE_DATAOBJ=no else cat >>confdefs.h <<\_ACEOF @@ -46033,9 +46808,9 @@ echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disab fi if test "$wxUSE_CLIPBOARD" = "yes"; then - if test "$wxUSE_MGL" = 1; then - { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under MGL... disabled" >&5 -echo "$as_me: WARNING: Clipboard not yet supported under MGL... disabled" >&2;} + if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then + { echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5 +echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;} wxUSE_CLIPBOARD=no fi @@ -46056,21 +46831,10 @@ echo "$as_me: WARNING: Drag and drop is only supported under GTK+ 1.2... disable fi fi - if test "$wxUSE_MOTIF" = 1; then - { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under Motif... disabled" >&5 -echo "$as_me: WARNING: Drag and drop not yet supported under Motif... disabled" >&2;} - wxUSE_DRAG_AND_DROP=no - fi - - if test "$wxUSE_X11" = 1; then - { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under X11... disabled" >&5 -echo "$as_me: WARNING: Drag and drop not yet supported under X11... disabled" >&2;} - wxUSE_DRAG_AND_DROP=no - fi - - if test "$wxUSE_MGL" = 1; then - { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under MGL... disabled" >&5 -echo "$as_me: WARNING: Drag and drop not yet supported under MGL... disabled" >&2;} + if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \ + "$wxUSE_DFB" = 1; then + { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5 +echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;} wxUSE_DRAG_AND_DROP=no fi @@ -46257,11 +47021,17 @@ _ACEOF fi if test "$wxUSE_DISPLAY" = "yes"; then - cat >>confdefs.h <<\_ACEOF + if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then + { echo "$as_me:$LINENO: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5 +echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;} + wxUSE_DISPLAY=no + else + cat >>confdefs.h <<\_ACEOF #define wxUSE_DISPLAY 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon" + fi fi if test "$wxUSE_DETECT_SM" = "yes"; then @@ -46351,6 +47121,15 @@ echo "$as_me: WARNING: wxListCtrl requires wxImageList and won't be compiled wit fi fi +if test "$wxUSE_EDITABLELISTBOX" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_EDITABLELISTBOX 1 +_ACEOF + + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox" +fi + if test "$wxUSE_NOTEBOOK" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_NOTEBOOK 1 @@ -46403,6 +47182,14 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub" fi +if test "$wxUSE_SEARCHCTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_SEARCHCTRL 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_SLIDER" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SLIDER 1 @@ -46696,7 +47483,10 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + + #include + #include + #include _ACEOF @@ -46786,6 +47576,16 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui" fi +USE_STC=0 +if test "$wxUSE_STC" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_STC 1 +_ACEOF + + USE_STC=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc" +fi + if test "$wxUSE_MENUS" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_MENUS 1 @@ -46837,10 +47637,16 @@ _ACEOF fi if test "$wxUSE_PALETTE" = "yes" ; then - cat >>confdefs.h <<\_ACEOF + if test "$wxUSE_DFB" = 1; then + { echo "$as_me:$LINENO: WARNING: wxPalette not yet supported under DFB... disabled" >&5 +echo "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&2;} + wxUSE_PALETTE=no + else + cat >>confdefs.h <<\_ACEOF #define wxUSE_PALETTE 1 _ACEOF + fi fi if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then @@ -47303,14 +48109,6 @@ fi if test "$wxUSE_GSTREAMER" = "yes"; then - case "${host}" in - *-*-solaris2* ) - if "$GCC" = yes; then - GST_CFLAGS=`echo $GST_CFLAGS | sed 's/-mt//'` - GST_LIBS=`echo $GST_LIBS | sed 's/-mt//'` - fi - esac - CPPFLAGS="$GST_CFLAGS $CPPFLAGS" LIBS="$GST_LIBS $LIBS" @@ -47359,31 +48157,54 @@ _ACEOF -CORE_BASE_LIBS="net base" -CORE_GUI_LIBS="adv core" +STD_BASE_LIBS="base" +STD_GUI_LIBS="" +BUILT_WX_LIBS="base" +ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base" -if test "$wxUSE_XML" = "yes" ; then - CORE_BASE_LIBS="xml $CORE_BASE_LIBS" +if test "$wxUSE_SOCKETS" = "yes" ; then + STD_BASE_LIBS="net $STD_BASE_LIBS" + BUILT_WX_LIBS="net $BUILT_WX_LIBS" fi if test "$wxUSE_ODBC" != "no" ; then - CORE_BASE_LIBS="odbc $CORE_BASE_LIBS" - CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS" + BUILT_WX_LIBS="odbc $BUILT_WX_LIBS" fi -if test "$wxUSE_HTML" = "yes" ; then - CORE_GUI_LIBS="html $CORE_GUI_LIBS" -fi -if test "$wxUSE_DEBUGREPORT" = "yes" ; then - CORE_GUI_LIBS="qa $CORE_GUI_LIBS" -fi -if test "$wxUSE_XRC" = "yes" ; then - CORE_GUI_LIBS="xrc $CORE_GUI_LIBS" -fi -if test "$wxUSE_AUI" = "yes" ; then - CORE_GUI_LIBS="aui $CORE_GUI_LIBS" +if test "$wxUSE_XML" = "yes" ; then + STD_BASE_LIBS="xml $STD_BASE_LIBS" + BUILT_WX_LIBS="xml $BUILT_WX_LIBS" fi -if test "$wxUSE_GUI" != "yes"; then - CORE_GUI_LIBS="" +if test "$wxUSE_GUI" = "yes"; then + STD_GUI_LIBS="adv core" + BUILT_WX_LIBS="$STD_GUI_LIBS $BUILT_WX_LIBS" + + if test "$wxUSE_DEBUGREPORT" = "yes" ; then + STD_GUI_LIBS="qa $STD_GUI_LIBS" + BUILT_WX_LIBS="qa $BUILT_WX_LIBS" + fi + if test "$wxUSE_ODBC" != "no" ; then + BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS" + fi + if test "$wxUSE_HTML" = "yes" ; then + STD_GUI_LIBS="html $STD_GUI_LIBS" + BUILT_WX_LIBS="html $BUILT_WX_LIBS" + fi + if test "$wxUSE_MEDIACTRL" = "yes" ; then + BUILT_WX_LIBS="media $BUILT_WX_LIBS" + fi + if test "$wxUSE_OPENGL" = "yes" ; then + BUILT_WX_LIBS="gl $BUILT_WX_LIBS" + fi + if test "$wxUSE_AUI" = "yes" ; then + BUILT_WX_LIBS="aui $BUILT_WX_LIBS" + fi + if test "$wxUSE_STC" = "yes" ; then + BUILT_WX_LIBS="stc $BUILT_WX_LIBS" + fi + if test "$wxUSE_XRC" = "yes" ; then + STD_GUI_LIBS="xrc $STD_GUI_LIBS" + BUILT_WX_LIBS="xrc $BUILT_WX_LIBS" + fi fi @@ -47391,6 +48212,8 @@ fi + + if test "$wxUSE_MAC" = 1 ; then if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then if test "$USE_DARWIN" = 1; then @@ -47423,7 +48246,7 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ dynamic erase event exec font image minimal mobile \ mobile/wxedit mobile/styles propsize render \ - rotate shaped vscroll widgets" + rotate shaped svg taborder vscroll widgets" if test "$wxUSE_MONOLITHIC" != "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" @@ -47466,7 +48289,7 @@ CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \ C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS" CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS ` -CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $CXXWARNINGS $C_AND_CXX_FLAGS $CXXFLAGS ` +CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS ` WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS` @@ -47483,6 +48306,7 @@ EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_ODBC="$ODBC_LINK" +EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" if test "$wxUSE_GUI" = "yes"; then EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT` fi @@ -47604,6 +48428,7 @@ fi + TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"` @@ -47932,8 +48757,12 @@ fi if test "x$SUNCXX" = "xyes"; then AR=$CXX - AROPTIONS="-xar -o" + + elif test "x$SGICC" = "xyes"; then + AR=$CXX + AROPTIONS="-ar -o" + else if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. @@ -48281,10 +49110,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6 PLATFORM_BEOS=1 ;; * ) - { { echo "$as_me:$LINENO: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&5 -echo "$as_me: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&2;} - { (exit 1); exit 1; }; } - ;; + ;; esac fi @@ -48427,74 +49253,17 @@ fi; ;; *-*-linux* ) - if test "x$GCC" != "xyes"; then - echo "$as_me:$LINENO: checking for Intel compiler" >&5 -echo $ECHO_N "checking for Intel compiler... $ECHO_C" >&6 -if test "${bakefile_cv_prog_icc+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 - This is not ICC - #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_prog_icc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -bakefile_cv_prog_icc=no - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $bakefile_cv_prog_icc" >&5 -echo "${ECHO_T}$bakefile_cv_prog_icc" >&6 - if test "$bakefile_cv_prog_icc" = "yes"; then - PIC_FLAG="-KPIC" - fi + if test "$INTELCC" = "yes"; then + PIC_FLAG="-KPIC" + elif test "x$SUNCXX" = "xyes"; then + SHARED_LD_CC="${CC} -G -o" + SHARED_LD_CXX="${CXX} -G -o" + PIC_FLAG="-KPIC" fi ;; *-*-solaris2* ) - if test "x$GCC" != xyes ; then + if test "x$SUNCXX" = xyes ; then SHARED_LD_CC="${CC} -G -o" SHARED_LD_CXX="${CXX} -G -o" PIC_FLAG="-KPIC" @@ -49251,7 +50020,10 @@ EOF ;; *) - esac + { { echo "$as_me:$LINENO: error: unknown system type $BAKEFILE_HOST." >&5 +echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;} + { (exit 1); exit 1; }; } + esac if test "x$PIC_FLAG" != "x" ; then PIC_FLAG="$PIC_FLAG -DPIC" @@ -49282,7 +50054,11 @@ EOF case "${BAKEFILE_HOST}" in *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) - SONAME_FLAG="-Wl,-soname," + if test "x$SUNCXX" = "xyes"; then + SONAME_FLAG="-h " + else + SONAME_FLAG="-Wl,-soname," + fi USE_SOVERSION=1 USE_SOVERLINUX=1 USE_SOSYMLINKS=1 @@ -49654,10 +50430,10 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.2.1" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.1" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" @@ -50009,6 +50785,11 @@ EOF COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="" fi + COND_MONOLITHIC_0_SHARED_0_USE_STC_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_STC" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_STC_1="" + fi + COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="" @@ -50059,11 +50840,41 @@ EOF COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="" fi + COND_MONOLITHIC_0_SHARED_1_USE_STC_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_STC" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_STC_1="" + fi + COND_MONOLITHIC_0_SHARED_1_USE_XRC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_XRC_1="" fi + COND_MONOLITHIC_0_USE_AUI_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_AUI" = "x1" ; then + COND_MONOLITHIC_0_USE_AUI_1="" + fi + + COND_MONOLITHIC_0_USE_GUI_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" ; then + COND_MONOLITHIC_0_USE_GUI_1="" + fi + + COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_MEDIA" = "x1" ; then + COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1="" + fi + + COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then + COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="" + fi + + COND_MONOLITHIC_0_USE_HTML_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then + COND_MONOLITHIC_0_USE_HTML_1="" + fi + COND_MONOLITHIC_0_USE_MEDIA_1="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then COND_MONOLITHIC_0_USE_MEDIA_1="" @@ -50074,6 +50885,26 @@ EOF COND_MONOLITHIC_0_USE_ODBC_1="" fi + COND_MONOLITHIC_0_USE_QA_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then + COND_MONOLITHIC_0_USE_QA_1="" + fi + + COND_MONOLITHIC_0_USE_RICHTEXT_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then + COND_MONOLITHIC_0_USE_RICHTEXT_1="" + fi + + COND_MONOLITHIC_0_USE_STC_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_STC" = "x1" ; then + COND_MONOLITHIC_0_USE_STC_1="" + fi + + COND_MONOLITHIC_0_USE_XRC_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then + COND_MONOLITHIC_0_USE_XRC_1="" + fi + COND_MONOLITHIC_1="#" if test "x$MONOLITHIC" = "x1" ; then COND_MONOLITHIC_1="" @@ -50264,6 +51095,11 @@ EOF COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" fi + COND_SHARED_0_USE_STC_1="#" + if test "x$SHARED" = "x0" -a "x$USE_STC" = "x1" ; then + COND_SHARED_0_USE_STC_1="" + fi + COND_SHARED_0_USE_XRC_1="#" if test "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then COND_SHARED_0_USE_XRC_1="" @@ -50504,6 +51340,11 @@ EOF COND_USE_GUI_1="" fi + COND_USE_GUI_1_USE_OPENGL_1="#" + if test "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_USE_GUI_1_USE_OPENGL_1="" + fi + COND_USE_GUI_1_WXUNIV_0="#" if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_USE_GUI_1_WXUNIV_0="" @@ -50584,6 +51425,11 @@ EOF COND_USE_SOVERSOLARIS_1="" fi + COND_USE_STC_1="#" + if test "x$USE_STC" = "x1" ; then + COND_USE_STC_1="" + fi + COND_USE_THREADS_0="#" if test "x$USE_THREADS" = "x0" ; then COND_USE_THREADS_0="" @@ -50722,6 +51568,28 @@ fi WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS" + +case "${host}" in + *-*-solaris2* ) + if "$GCC" = yes; then + CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'` + LIBS=`echo $LIBS | sed 's/-mt//'` + EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'` + fi + ;; + + *-*-linux* ) + if test "x$SUNCXX" = xyes; then + CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//'` + LIBS=`echo $LIBS | sed 's/-pthread//'` + EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//'` + fi + ;; +esac + +CFLAGS="$CFLAGS $CFLAGS_VISIBILITY" +CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" + SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" @@ -50844,7 +51712,7 @@ fi if test "$wxWITH_SUBDIRS" != "no"; then if test "$wxUSE_GUI" = "yes"; then - SUBDIRS="samples demos utils contrib" + SUBDIRS="samples demos utils" else SUBDIRS="samples utils" fi @@ -50977,10 +51845,6 @@ echo "${ECHO_T}no" >&6 -if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then - DISABLED_CONTRIB="$DISABLED_CONTRIB net" -fi - for subdir in `echo $SUBDIRS`; do if test -d ${srcdir}/${subdir} ; then if test "$wxUSE_GUI" = "yes"; then @@ -51382,7 +52246,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by wxWidgets $as_me 2.8.0, which was +This file was extended by wxWidgets $as_me 2.9.0, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -51445,7 +52309,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.8.0 +wxWidgets config.status 2.9.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -51698,7 +52562,6 @@ s,@DLLTOOL@,$DLLTOOL,;t t s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t s,@IF_GNU_MAKE@,$IF_GNU_MAKE,;t t s,@LN_S@,$LN_S,;t t -s,@CXXCPP@,$CXXCPP,;t t s,@subdirs@,$subdirs,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t @@ -51717,11 +52580,12 @@ s,@PANGOFT2_CFLAGS@,$PANGOFT2_CFLAGS,;t t s,@PANGOFT2_LIBS@,$PANGOFT2_LIBS,;t t s,@PANGOXFT_CFLAGS@,$PANGOXFT_CFLAGS,;t t s,@PANGOXFT_LIBS@,$PANGOXFT_LIBS,;t t +s,@CFLAGS_VISIBILITY@,$CFLAGS_VISIBILITY,;t t +s,@CXXFLAGS_VISIBILITY@,$CXXFLAGS_VISIBILITY,;t t s,@REZ@,$REZ,;t t s,@DEREZ@,$DEREZ,;t t s,@SETFILE@,$SETFILE,;t t s,@LIBICONV@,$LIBICONV,;t t -s,@EXTRALIBS_ESD@,$EXTRALIBS_ESD,;t t s,@SDL_CONFIG@,$SDL_CONFIG,;t t s,@SDL_CFLAGS@,$SDL_CFLAGS,;t t s,@SDL_LIBS@,$SDL_LIBS,;t t @@ -51735,8 +52599,10 @@ s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t s,@GST_CFLAGS@,$GST_CFLAGS,;t t s,@GST_LIBS@,$GST_LIBS,;t t -s,@CORE_BASE_LIBS@,$CORE_BASE_LIBS,;t t -s,@CORE_GUI_LIBS@,$CORE_GUI_LIBS,;t t +s,@ALL_WX_LIBS@,$ALL_WX_LIBS,;t t +s,@BUILT_WX_LIBS@,$BUILT_WX_LIBS,;t t +s,@STD_BASE_LIBS@,$STD_BASE_LIBS,;t t +s,@STD_GUI_LIBS@,$STD_GUI_LIBS,;t t s,@wxUSE_ZLIB@,$wxUSE_ZLIB,;t t s,@wxUSE_REGEX@,$wxUSE_REGEX,;t t s,@wxUSE_EXPAT@,$wxUSE_EXPAT,;t t @@ -51751,6 +52617,7 @@ s,@WX_LIB_FLAVOUR@,$WX_LIB_FLAVOUR,;t t s,@WXUNIV@,$WXUNIV,;t t s,@MONOLITHIC@,$MONOLITHIC,;t t s,@USE_PLUGINS@,$USE_PLUGINS,;t t +s,@CXXWARNINGS@,$CXXWARNINGS,;t t s,@EXTRALIBS@,$EXTRALIBS,;t t s,@EXTRALIBS_XML@,$EXTRALIBS_XML,;t t s,@EXTRALIBS_HTML@,$EXTRALIBS_HTML,;t t @@ -51841,6 +52708,7 @@ s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_0_ s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1,;t t s,@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1,;t t s,@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@,$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1,;t t +s,@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_STC_1,;t t s,@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1,;t t s,@COND_MONOLITHIC_0_SHARED_1@,$COND_MONOLITHIC_0_SHARED_1,;t t s,@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_AUI_1,;t t @@ -51851,9 +52719,19 @@ s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_1_ s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1,;t t s,@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1,;t t s,@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@,$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1,;t t +s,@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_STC_1,;t t s,@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1,;t t +s,@COND_MONOLITHIC_0_USE_AUI_1@,$COND_MONOLITHIC_0_USE_AUI_1,;t t +s,@COND_MONOLITHIC_0_USE_GUI_1@,$COND_MONOLITHIC_0_USE_GUI_1,;t t +s,@COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1@,$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1,;t t +s,@COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1,;t t +s,@COND_MONOLITHIC_0_USE_HTML_1@,$COND_MONOLITHIC_0_USE_HTML_1,;t t s,@COND_MONOLITHIC_0_USE_MEDIA_1@,$COND_MONOLITHIC_0_USE_MEDIA_1,;t t s,@COND_MONOLITHIC_0_USE_ODBC_1@,$COND_MONOLITHIC_0_USE_ODBC_1,;t t +s,@COND_MONOLITHIC_0_USE_QA_1@,$COND_MONOLITHIC_0_USE_QA_1,;t t +s,@COND_MONOLITHIC_0_USE_RICHTEXT_1@,$COND_MONOLITHIC_0_USE_RICHTEXT_1,;t t +s,@COND_MONOLITHIC_0_USE_STC_1@,$COND_MONOLITHIC_0_USE_STC_1,;t t +s,@COND_MONOLITHIC_0_USE_XRC_1@,$COND_MONOLITHIC_0_USE_XRC_1,;t t s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t s,@COND_MONOLITHIC_1_SHARED_0@,$COND_MONOLITHIC_1_SHARED_0,;t t s,@COND_MONOLITHIC_1_SHARED_1@,$COND_MONOLITHIC_1_SHARED_1,;t t @@ -51892,6 +52770,7 @@ s,@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1,; s,@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t s,@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t s,@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t +s,@COND_SHARED_0_USE_STC_1@,$COND_SHARED_0_USE_STC_1,;t t s,@COND_SHARED_0_USE_XRC_1@,$COND_SHARED_0_USE_XRC_1,;t t s,@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@,$COND_SHARED_0_WXUSE_EXPAT_BUILTIN,;t t s,@COND_SHARED_0_WXUSE_ODBC_BUILTIN@,$COND_SHARED_0_WXUSE_ODBC_BUILTIN,;t t @@ -51940,6 +52819,7 @@ s,@COND_USE_EXCEPTIONS_0@,$COND_USE_EXCEPTIONS_0,;t t s,@COND_USE_EXCEPTIONS_1@,$COND_USE_EXCEPTIONS_1,;t t s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t +s,@COND_USE_GUI_1_USE_OPENGL_1@,$COND_USE_GUI_1_USE_OPENGL_1,;t t s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;t t s,@COND_USE_GUI_1_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t s,@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t @@ -51956,6 +52836,7 @@ s,@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@,$COND_USE_SOVERCYGWIN_1_USE_SOVERSION s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t +s,@COND_USE_STC_1@,$COND_USE_STC_1,;t t s,@COND_USE_THREADS_0@,$COND_USE_THREADS_0,;t t s,@COND_USE_THREADS_1@,$COND_USE_THREADS_1,;t t s,@COND_USE_XRC_1@,$COND_USE_XRC_1,;t t @@ -52821,11 +53702,20 @@ echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITH echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}" echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}" -echo " Should wxWidgets be compiled in Unicode mode? ${wxUSE_UNICODE:-no}" +echo -n " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}" +if test "$wxUSE_UNICODE" = "yes"; then + if test "$wxUSE_UNICODE_UTF8" = "yes"; then + echo " (using UTF-8)" + else + echo " (using wchar_t)" + fi +else + echo +fi echo " What level of wxWidgets compatibility should be enabled?" -echo " wxWidgets 2.4 ${WXWIN_COMPATIBILITY_2_4:-no}" -echo " wxWidgets 2.6 ${WXWIN_COMPATIBILITY_2_6:-yes}" +echo " wxWidgets 2.6 ${WXWIN_COMPATIBILITY_2_6:-no}" +echo " wxWidgets 2.8 ${WXWIN_COMPATIBILITY_2_8:-yes}" echo " Which libraries should wxWidgets use?" echo " jpeg ${wxUSE_LIBJPEG-none}"