X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64b75e644a57565bf6e5c3c701ebc9d581182268..ad91e1ade045fd9bc8ca7159aebf828d719e81ca:/configure diff --git a/configure b/configure index 6d6231db80..b9d6e69580 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in. +# From configure.in Id: configure.in 48569 2007-09-05 18:55:18Z RR . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for wxWidgets 2.7.1. +# 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.7.1' -PACKAGE_STRING='wxWidgets 2.7.1' +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 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 NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH ICC_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_MAC_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_0 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_USE_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_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 AR ac_ct_AR 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 LIBICONV SDL_CONFIG SDL_CFLAGS SDL_LIBS GTKPRINT_CFLAGS GTKPRINT_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_GTKPRINT 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 RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE MAKE_SET AROPTIONS STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE 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 WINDRES ac_ct_WINDRES REZ SETFILE 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 DEREZ 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 DLLTOOL 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} @@ -822,6 +818,14 @@ ac_env_PANGOXFT_LIBS_set=${PANGOXFT_LIBS+set} ac_env_PANGOXFT_LIBS_value=$PANGOXFT_LIBS ac_cv_env_PANGOXFT_LIBS_set=${PANGOXFT_LIBS+set} ac_cv_env_PANGOXFT_LIBS_value=$PANGOXFT_LIBS +ac_env_GTKPRINT_CFLAGS_set=${GTKPRINT_CFLAGS+set} +ac_env_GTKPRINT_CFLAGS_value=$GTKPRINT_CFLAGS +ac_cv_env_GTKPRINT_CFLAGS_set=${GTKPRINT_CFLAGS+set} +ac_cv_env_GTKPRINT_CFLAGS_value=$GTKPRINT_CFLAGS +ac_env_GTKPRINT_LIBS_set=${GTKPRINT_LIBS+set} +ac_env_GTKPRINT_LIBS_value=$GTKPRINT_LIBS +ac_cv_env_GTKPRINT_LIBS_set=${GTKPRINT_LIBS+set} +ac_cv_env_GTKPRINT_LIBS_value=$GTKPRINT_LIBS ac_env_LIBGNOMEPRINTUI_CFLAGS_set=${LIBGNOMEPRINTUI_CFLAGS+set} ac_env_LIBGNOMEPRINTUI_CFLAGS_value=$LIBGNOMEPRINTUI_CFLAGS ac_cv_env_LIBGNOMEPRINTUI_CFLAGS_set=${LIBGNOMEPRINTUI_CFLAGS+set} @@ -870,7 +874,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.7.1 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 +940,34 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.7.1:";; + 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 - --enable-optimise create optimised code + --disable-shared create static library instead of shared + --disable-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 @@ -965,10 +979,13 @@ Optional Features: --enable-no_exceptions create code without C++ exceptions handling --enable-permissive compile code disregarding strict ANSI --enable-no_deps create code without dependency information - --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 + --disable-vararg_macros don't use vararg macros, even if they are supported + --enable-universal_binary create Mac PowerPC and Intel Universal binary (not yet working) + --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 + --disable-visibility disable use of ELF symbols visibility even if supported --enable-intl use internationalization system --enable-config use wxConfig (and derived) classes --enable-protocols use wxProtocol and derived classes @@ -979,8 +996,12 @@ Optional Features: --enable-ole use OLE classes (Win32 only) --enable-dataobj use data object classes --enable-ipc use interprocess communication (wxSocket etc.) + --enable-baseevtloop use event loop in console programs too + --enable-epoolloop use wxEpollDispatcher class (Linux only) + --enable-selectloop use wxSelectDispatcher class --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 @@ -993,25 +1014,24 @@ Optional Features: --enable-ffile use wxFFile class --enable-file use wxFile class --enable-filesystem use virtual file systems classes + --enable-fontenum use wxFontEnumerator class --enable-fontmap use font encodings conversion classes + --enable-fs_archive use virtual archive filesystems --enable-fs_inet use virtual HTTP/FTP filesystems - --enable-fs_zip use virtual ZIP filesystems + --enable-fs_zip now replaced by fs_archive --enable-geometry use geometry class --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 --enable-sysoptions use wxSystemOptions + --enable-tarstream use wxTar streams --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 @@ -1024,6 +1044,8 @@ Optional Features: --enable-protocol-ftp FTP support in wxProtocol --enable-protocol-file FILE support in wxProtocol --enable-threads use threads + --enable-iniconf use wxIniConfig (Win32 only) + --enable-regkey use wxRegKey class (Win32 only) --enable-docview use document view architecture --enable-help use help subsystem --enable-mshtmlhelp use MS HTML Help (win32) @@ -1031,6 +1053,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 @@ -1042,12 +1065,11 @@ 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-svg use wxSVGFileDC device context --enable-clipboard use wxClipboard class --enable-dnd use Drag'n'Drop classes --enable-metafile use win32 metafiles - --enable-controls use all usual controls + --disable-controls disable compilation of all standard controls --enable-accel use accelerators --enable-animatectrl use wxAnimationCtrl class --enable-button use wxButton class @@ -1059,17 +1081,20 @@ Optional Features: --enable-checklst use wxCheckListBox (listbox with checkboxes) class --enable-choice use wxChoice class --enable-choicebook use wxChoicebook class + --enable-collpane use wxCollapsiblePane class --enable-colourpicker use wxColourPickerCtrl class --enable-combobox use wxComboBox class --enable-comboctrl use wxComboCtrl class --enable-datepick use wxDatePickerCtrl class --enable-dirpicker use wxDirPickerCtrl class --enable-display use wxDisplay class + --enable-detect_sm use code to detect X11 session manager + --enable-editablebox use wxEditableListBox class --enable-filepicker use wxFilePickerCtrl class --enable-fontpicker use wxFontPickerCtrl class --enable-gauge use wxGauge class --enable-grid use wxGrid class - --enable-dataviewctrl, use wxDataViewCtrl class + --enable-dataviewctrl use wxDataViewCtrl class --enable-hyperlink use wxHyperlinkCtrl class --enable-imaglist use wxImageList class --enable-listbook use wxListbook class @@ -1081,6 +1106,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 @@ -1091,6 +1117,7 @@ Optional Features: --enable-stattext use wxStaticText class --enable-statusbar use wxStatusBar class --enable-tabdialog use wxTabControl class + --enable-taskbaricon use wxTaskBarIcon class --enable-textctrl use wxTextCtrl class --enable-togglebtn use wxToggleButton class --enable-toolbar use wxToolBar class @@ -1126,17 +1153,20 @@ Optional Features: --enable-metafiles use wxMetaFile (Win32 only) --enable-dragimage use wxDragImage --enable-accessibility enable accessibility support - --enable-dccache cache temporary wxDC objects (Win32 only) --enable-palette use wxPalette class --enable-image use wxImage class --enable-gif use gif images (GIF file format) --enable-pcx use pcx images (PCX file format) + --enable-tga use tga images (TGA file format) --enable-iff use iff images (IFF file format) --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) + --enable-dccache cache temporary wxDC objects (Win32 only) + --enable-ps-in-msw use PS printing in wxMSW (Win32 only) + --enable-ownerdrawn use owner drawn controls (Win32 only) + --enable-uxtheme enable support for Windows XP themed look (Win32 only) + --enable-wxdib use wxDIB class (Win32 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 @@ -1152,6 +1182,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 @@ -1168,18 +1200,19 @@ Optional Packages: --with-libtiff use libtiff (TIFF file format) --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-gtkprint don't use GTK printing support + --without-gnomeprint don't use GNOME printing libraries --with-gnomevfs use GNOME VFS for associating MIME types --with-hildon use Hildon framework for Nokia 770 --with-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-sdl use SDL for audio on Unix --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-macosx-sdk=PATH use an OS X SDK at PATH + --with-macosx-version-min=VER build binaries which require at least this OS X version --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 @@ -1199,7 +1232,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 @@ -1216,6 +1248,10 @@ Some influential environment variables: C compiler flags for PANGOXFT, overriding pkg-config PANGOXFT_LIBS linker flags for PANGOXFT, overriding pkg-config + GTKPRINT_CFLAGS + C compiler flags for GTKPRINT, overriding pkg-config + GTKPRINT_LIBS + linker flags for GTKPRINT, overriding pkg-config LIBGNOMEPRINTUI_CFLAGS C compiler flags for LIBGNOMEPRINTUI, overriding pkg-config LIBGNOMEPRINTUI_LIBS @@ -1325,14 +1361,14 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.7.1 +wxWidgets configure 2.9.0 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1346,7 +1382,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.7.1, 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 $@ @@ -1796,9 +1832,9 @@ test -n "$target_alias" && wx_major_version_number=2 -wx_minor_version_number=7 -wx_release_number=1 -wx_subrelease_number=1 +wx_minor_version_number=9 +wx_release_number=0 +wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number WX_VERSION=$WX_RELEASE.$wx_release_number @@ -1807,6 +1843,9 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number +wx_top_builddir="`pwd`" + + USE_UNIX=1 @@ -2069,7 +2108,6 @@ _ACEOF SO_SUFFIX=dll PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_MSW=1 - DEFAULT_STD_FLAG=no ;; *-pc-msdosdjgpp ) @@ -2170,447 +2208,35 @@ 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_ALL_FEATURES=yes - DEFAULT_wxUSE_NANOX=no +DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG +DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG - DEFAULT_wxUSE_THREADS=yes +DEFAULT_wxUSE_DMALLOC=no +DEFAULT_wxUSE_LIBGNOMEVFS=no +DEFAULT_wxUSE_LIBHILDON=no +DEFAULT_wxUSE_LIBMSPACK=no +DEFAULT_wxUSE_LIBSDL=no +DEFAULT_wxUSE_ODBC=no +DEFAULT_wxUSE_OPENGL=no - DEFAULT_wxUSE_SHARED=${DEFAULT_wxUSE_SHARED:-yes} - DEFAULT_wxUSE_OPTIMISE=no - DEFAULT_wxUSE_PROFILE=no - DEFAULT_wxUSE_NO_DEPS=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_BUSYINFO=no - DEFAULT_wxUSE_ARCHIVE_STREAMS=no - DEFAULT_wxUSE_ZIPSTREAM=no - DEFAULT_wxUSE_VALIDATORS=no +DEFAULT_wxUSE_ACCESSIBILITY=no +DEFAULT_wxUSE_DATAVIEWCTRL=no +DEFAULT_wxUSE_GRAPHICS_CONTEXT=no +DEFAULT_wxUSE_MEDIACTRL=no +DEFAULT_wxUSE_TAB_DIALOG=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_COLOURPICKERCTRL=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_COMBOCTRL=no - DEFAULT_wxUSE_DATEPICKCTRL=no - DEFAULT_wxUSE_DISPLAY=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_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_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=no - 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_BUSYINFO=yes - DEFAULT_wxUSE_ARCHIVE_STREAMS=yes - DEFAULT_wxUSE_ZIPSTREAM=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_COLOURPICKERCTRL=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_COMBOCTRL=yes - DEFAULT_wxUSE_DATEPICKCTRL=yes - DEFAULT_wxUSE_DISPLAY=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_UNICODE=no - DEFAULT_wxUSE_UNICODE_MSLU=yes - DEFAULT_wxUSE_WCSRTOMBS=no +DEFAULT_wxUSE_UNICODE_UTF8=auto +DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no - DEFAULT_wxUSE_PALETTE=yes - DEFAULT_wxUSE_IMAGE=yes - DEFAULT_wxUSE_GIF=yes - DEFAULT_wxUSE_PCX=yes - DEFAULT_wxUSE_IFF=no - DEFAULT_wxUSE_PNM=yes - DEFAULT_wxUSE_XPM=yes - DEFAULT_wxUSE_ICO_CUR=yes - DEFAULT_wxUSE_ACCESSIBILITY=no +DEFAULT_wxUSE_UNIVERSAL_BINARY=no - DEFAULT_wxUSE_MONOLITHIC=no - DEFAULT_wxUSE_PLUGINS=no - DEFAULT_wxUSE_OFFICIAL_BUILD=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 @@ -2629,214 +2255,427 @@ 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 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then enableval="$enable_gui" if test "$enableval" = yes; then - ac_cv_use_gui='wxUSE_GUI=yes' + wx_cv_use_gui='wxUSE_GUI=yes' else - ac_cv_use_gui='wxUSE_GUI=no' + wx_cv_use_gui='wxUSE_GUI=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI + wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}" fi; - eval "$ac_cv_use_gui" - if test "$no_cache" != 1; then - echo $ac_cv_use_gui >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gui" + if test "x$cache" = xyes; then + echo "wxUSE_GUI=$wxUSE_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 - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-monolithic" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6 - no_cache=0 # Check whether --enable-monolithic or --disable-monolithic was given. if test "${enable_monolithic+set}" = set; then enableval="$enable_monolithic" if test "$enableval" = yes; then - ac_cv_use_monolithic='wxUSE_MONOLITHIC=yes' + wx_cv_use_monolithic='wxUSE_MONOLITHIC=yes' else - ac_cv_use_monolithic='wxUSE_MONOLITHIC=no' + wx_cv_use_monolithic='wxUSE_MONOLITHIC=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_monolithic='wxUSE_MONOLITHIC='$DEFAULT_wxUSE_MONOLITHIC + wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}" fi; - eval "$ac_cv_use_monolithic" - if test "$no_cache" != 1; then - echo $ac_cv_use_monolithic >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_monolithic" + if test "x$cache" = xyes; then + echo "wxUSE_MONOLITHIC=$wxUSE_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 - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-plugins" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6 - no_cache=0 # Check whether --enable-plugins or --disable-plugins was given. if test "${enable_plugins+set}" = set; then enableval="$enable_plugins" if test "$enableval" = yes; then - ac_cv_use_plugins='wxUSE_PLUGINS=yes' + wx_cv_use_plugins='wxUSE_PLUGINS=yes' else - ac_cv_use_plugins='wxUSE_PLUGINS=no' + wx_cv_use_plugins='wxUSE_PLUGINS=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_plugins='wxUSE_PLUGINS='$DEFAULT_wxUSE_PLUGINS + wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}" fi; - eval "$ac_cv_use_plugins" - if test "$no_cache" != 1; then - echo $ac_cv_use_plugins >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_plugins" + if test "x$cache" = xyes; then + echo "wxUSE_PLUGINS=$wxUSE_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 + + withstring=without + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi echo "$as_me:$LINENO: checking for --${withstring:-with}-subdirs" >&5 echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6 - no_cache=0 # Check whether --with-subdirs or --without-subdirs was given. if test "${with_subdirs+set}" = set; then withval="$with_subdirs" if test "$withval" = yes; then - ac_cv_use_subdirs='wxWITH_SUBDIRS=yes' + wx_cv_use_subdirs='wxWITH_SUBDIRS=yes' else - ac_cv_use_subdirs='wxWITH_SUBDIRS=no' + wx_cv_use_subdirs='wxWITH_SUBDIRS=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_subdirs='wxWITH_SUBDIRS='$DEFAULT_wxWITH_SUBDIRS + wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}" fi; - eval "$ac_cv_use_subdirs" - if test "$no_cache" != 1; then - echo $ac_cv_use_subdirs >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_subdirs" + if test "x$cache" = xyes; then + echo "wxWITH_SUBDIRS=$wxWITH_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 + # 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 + wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes' + else + wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}" + +fi; + + eval "$wx_cv_use_official_build" + if test "x$cache" = xyes; then + echo "wxUSE_OFFICIAL_BUILD=$wxUSE_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 + # 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 + wx_cv_use_all_features='wxUSE_ALL_FEATURES=yes' + else + wx_cv_use_all_features='wxUSE_ALL_FEATURES=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}" + +fi; + + eval "$wx_cv_use_all_features" + if test "x$cache" = xyes; then + echo "wxUSE_ALL_FEATURES=$wxUSE_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= + 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 # Check whether --enable-universal or --disable-universal was given. if test "${enable_universal+set}" = set; then enableval="$enable_universal" if test "$enableval" = yes; then - ac_cv_use_universal='wxUSE_UNIVERSAL=yes' + wx_cv_use_universal='wxUSE_UNIVERSAL=yes' else - ac_cv_use_universal='wxUSE_UNIVERSAL=no' + wx_cv_use_universal='wxUSE_UNIVERSAL=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL + wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}" fi; - eval "$ac_cv_use_universal" - if test "$no_cache" != 1; then - echo $ac_cv_use_universal >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_universal" + if test "x$cache" = xyes; then + echo "wxUSE_UNIVERSAL=$wxUSE_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 @@ -2904,46 +2743,61 @@ if test "${with_x11+set}" = set; then wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1 fi; - enablestring= + 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 # Check whether --enable-nanox or --disable-nanox was given. if test "${enable_nanox+set}" = set; then enableval="$enable_nanox" if test "$enableval" = yes; then - ac_cv_use_nanox='wxUSE_NANOX=yes' + wx_cv_use_nanox='wxUSE_NANOX=yes' else - ac_cv_use_nanox='wxUSE_NANOX=no' + wx_cv_use_nanox='wxUSE_NANOX=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_nanox='wxUSE_NANOX='$DEFAULT_wxUSE_NANOX + wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}" fi; - eval "$ac_cv_use_nanox" - if test "$no_cache" != 1; then - echo $ac_cv_use_nanox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_nanox" + if test "x$cache" = xyes; then + echo "wxUSE_NANOX=$wxUSE_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 @@ -2951,86 +2805,103 @@ if test "${enable_gtk2+set}" = set; then wxUSE_GTK2="$enableval" fi; - enablestring= + 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 # Check whether --enable-gpe or --disable-gpe was given. if test "${enable_gpe+set}" = set; then enableval="$enable_gpe" if test "$enableval" = yes; then - ac_cv_use_gpe='wxUSE_GPE=yes' + wx_cv_use_gpe='wxUSE_GPE=yes' else - ac_cv_use_gpe='wxUSE_GPE=no' + wx_cv_use_gpe='wxUSE_GPE=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gpe='wxUSE_GPE='$DEFAULT_wxUSE_GPE + wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}" fi; - eval "$ac_cv_use_gpe" - if test "$no_cache" != 1; then - echo $ac_cv_use_gpe >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gpe" + if test "x$cache" = xyes; then + echo "wxUSE_GPE=$wxUSE_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 echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6 - no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then withval="$with_libpng" if test "$withval" = yes; then - ac_cv_use_libpng='wxUSE_LIBPNG=yes' + wx_cv_use_libpng='wxUSE_LIBPNG=yes' elif test "$withval" = no; then - ac_cv_use_libpng='wxUSE_LIBPNG=no' + wx_cv_use_libpng='wxUSE_LIBPNG=no' elif test "$withval" = sys; then - ac_cv_use_libpng='wxUSE_LIBPNG=sys' + wx_cv_use_libpng='wxUSE_LIBPNG=sys' elif test "$withval" = builtin; then - ac_cv_use_libpng='wxUSE_LIBPNG=builtin' + wx_cv_use_libpng='wxUSE_LIBPNG=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG + wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}" fi; - eval "$ac_cv_use_libpng" - if test "$no_cache" != 1; then - echo $ac_cv_use_libpng >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_libpng" + if test "x$cache" = xyes; then + echo "wxUSE_LIBPNG=$wxUSE_LIBPNG" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBPNG" = yes; then @@ -3054,42 +2925,43 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or echo "$as_me:$LINENO: checking for --with-libjpeg" >&5 echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6 - no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then withval="$with_libjpeg" if test "$withval" = yes; then - ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes' + wx_cv_use_libjpeg='wxUSE_LIBJPEG=yes' elif test "$withval" = no; then - ac_cv_use_libjpeg='wxUSE_LIBJPEG=no' + wx_cv_use_libjpeg='wxUSE_LIBJPEG=no' elif test "$withval" = sys; then - ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys' + wx_cv_use_libjpeg='wxUSE_LIBJPEG=sys' elif test "$withval" = builtin; then - ac_cv_use_libjpeg='wxUSE_LIBJPEG=builtin' + wx_cv_use_libjpeg='wxUSE_LIBJPEG=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG + wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}" fi; - eval "$ac_cv_use_libjpeg" - if test "$no_cache" != 1; then - echo $ac_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_libjpeg" + if test "x$cache" = xyes; then + echo "wxUSE_LIBJPEG=$wxUSE_LIBJPEG" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBJPEG" = yes; then @@ -3113,42 +2985,43 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o echo "$as_me:$LINENO: checking for --with-libtiff" >&5 echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6 - no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then withval="$with_libtiff" if test "$withval" = yes; then - ac_cv_use_libtiff='wxUSE_LIBTIFF=yes' + wx_cv_use_libtiff='wxUSE_LIBTIFF=yes' elif test "$withval" = no; then - ac_cv_use_libtiff='wxUSE_LIBTIFF=no' + wx_cv_use_libtiff='wxUSE_LIBTIFF=no' elif test "$withval" = sys; then - ac_cv_use_libtiff='wxUSE_LIBTIFF=sys' + wx_cv_use_libtiff='wxUSE_LIBTIFF=sys' elif test "$withval" = builtin; then - ac_cv_use_libtiff='wxUSE_LIBTIFF=builtin' + wx_cv_use_libtiff='wxUSE_LIBTIFF=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF + wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}" fi; - eval "$ac_cv_use_libtiff" - if test "$no_cache" != 1; then - echo $ac_cv_use_libtiff >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_libtiff" + if test "x$cache" = xyes; then + echo "wxUSE_LIBTIFF=$wxUSE_LIBTIFF" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBTIFF" = yes; then @@ -3172,42 +3045,43 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o echo "$as_me:$LINENO: checking for --with-libxpm" >&5 echo $ECHO_N "checking for --with-libxpm... $ECHO_C" >&6 - no_cache=0 # Check whether --with-libxpm or --without-libxpm was given. if test "${with_libxpm+set}" = set; then withval="$with_libxpm" if test "$withval" = yes; then - ac_cv_use_libxpm='wxUSE_LIBXPM=yes' + wx_cv_use_libxpm='wxUSE_LIBXPM=yes' elif test "$withval" = no; then - ac_cv_use_libxpm='wxUSE_LIBXPM=no' + wx_cv_use_libxpm='wxUSE_LIBXPM=no' elif test "$withval" = sys; then - ac_cv_use_libxpm='wxUSE_LIBXPM=sys' + wx_cv_use_libxpm='wxUSE_LIBXPM=sys' elif test "$withval" = builtin; then - ac_cv_use_libxpm='wxUSE_LIBXPM=builtin' + wx_cv_use_libxpm='wxUSE_LIBXPM=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_libxpm='wxUSE_LIBXPM='$DEFAULT_wxUSE_LIBXPM + wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}" fi; - eval "$ac_cv_use_libxpm" - if test "$no_cache" != 1; then - echo $ac_cv_use_libxpm >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_libxpm" + if test "x$cache" = xyes; then + echo "wxUSE_LIBXPM=$wxUSE_LIBXPM" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBXPM" = yes; then @@ -3229,350 +3103,496 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or fi - withstring= + withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi echo "$as_me:$LINENO: checking for --${withstring:-with}-libmspack" >&5 echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6 - no_cache=0 # Check whether --with-libmspack or --without-libmspack was given. if test "${with_libmspack+set}" = set; then withval="$with_libmspack" if test "$withval" = yes; then - ac_cv_use_libmspack='wxUSE_LIBMSPACK=yes' + wx_cv_use_libmspack='wxUSE_LIBMSPACK=yes' else - ac_cv_use_libmspack='wxUSE_LIBMSPACK=no' + wx_cv_use_libmspack='wxUSE_LIBMSPACK=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_libmspack='wxUSE_LIBMSPACK='$DEFAULT_wxUSE_LIBMSPACK + wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}" fi; - eval "$ac_cv_use_libmspack" - if test "$no_cache" != 1; then - echo $ac_cv_use_libmspack >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_libmspack" + if test "x$cache" = xyes; then + echo "wxUSE_LIBMSPACK=$wxUSE_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 -echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6 - no_cache=0 -# Check whether --with-sdl or --without-sdl was given. -if test "${with_sdl+set}" = set; then - withval="$with_sdl" + withstring=without + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${withstring:-with}-gtkprint" >&5 +echo $ECHO_N "checking for --${withstring:-with}-gtkprint... $ECHO_C" >&6 + +# Check whether --with-gtkprint or --without-gtkprint was given. +if test "${with_gtkprint+set}" = set; then + withval="$with_gtkprint" if test "$withval" = yes; then - ac_cv_use_sdl='wxUSE_LIBSDL=yes' + wx_cv_use_gtkprint='wxUSE_GTKPRINT=yes' else - ac_cv_use_sdl='wxUSE_LIBSDL=no' + wx_cv_use_gtkprint='wxUSE_GTKPRINT=no' fi + cache=yes else - LINE=`grep "wxUSE_LIBSDL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GTKPRINT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_sdl='wxUSE_LIBSDL='$DEFAULT_wxUSE_LIBSDL + wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}" fi; - eval "$ac_cv_use_sdl" - if test "$no_cache" != 1; then - echo $ac_cv_use_sdl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gtkprint" + if test "x$cache" = xyes; then + echo "wxUSE_GTKPRINT=$wxUSE_GTKPRINT" >> ${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_GTKPRINT = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_GTKPRINT fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 + - withstring= + withstring=without + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5 echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6 - no_cache=0 # Check whether --with-gnomeprint or --without-gnomeprint was given. if test "${with_gnomeprint+set}" = set; then withval="$with_gnomeprint" if test "$withval" = yes; then - ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes' + wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes' else - ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no' + wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT='$DEFAULT_wxUSE_LIBGNOMEPRINT + wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}" fi; - eval "$ac_cv_use_gnomeprint" - if test "$no_cache" != 1; then - echo $ac_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gnomeprint" + if test "x$cache" = xyes; then + echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${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= + + withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomevfs" >&5 echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6 - no_cache=0 # Check whether --with-gnomevfs or --without-gnomevfs was given. if test "${with_gnomevfs+set}" = set; then withval="$with_gnomevfs" if test "$withval" = yes; then - ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes' + wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes' else - ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' + wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS='$DEFAULT_wxUSE_LIBGNOMEVFS + wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" fi; - eval "$ac_cv_use_gnomevfs" - if test "$no_cache" != 1; then - echo $ac_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gnomevfs" + if test "x$cache" = xyes; then + echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${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= + withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi echo "$as_me:$LINENO: checking for --${withstring:-with}-hildon" >&5 echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6 - no_cache=0 # Check whether --with-hildon or --without-hildon was given. if test "${with_hildon+set}" = set; then withval="$with_hildon" if test "$withval" = yes; then - ac_cv_use_hildon='wxUSE_LIBHILDON=yes' + wx_cv_use_hildon='wxUSE_LIBHILDON=yes' else - ac_cv_use_hildon='wxUSE_LIBHILDON=no' + wx_cv_use_hildon='wxUSE_LIBHILDON=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_hildon='wxUSE_LIBHILDON='$DEFAULT_wxUSE_LIBHILDON + wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}" fi; - eval "$ac_cv_use_hildon" - if test "$no_cache" != 1; then - echo $ac_cv_use_hildon >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_hildon" + if test "x$cache" = xyes; then + echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${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= + + withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5 echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6 - no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then withval="$with_opengl" if test "$withval" = yes; then - ac_cv_use_opengl='wxUSE_OPENGL=yes' + wx_cv_use_opengl='wxUSE_OPENGL=yes' else - ac_cv_use_opengl='wxUSE_OPENGL=no' + wx_cv_use_opengl='wxUSE_OPENGL=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL + wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}" fi; - eval "$ac_cv_use_opengl" - if test "$no_cache" != 1; then - echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_opengl" + if test "x$cache" = xyes; then + echo "wxUSE_OPENGL=$wxUSE_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 - withstring= + withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi echo "$as_me:$LINENO: checking for --${withstring:-with}-dmalloc" >&5 echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6 - no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" if test "$withval" = yes; then - ac_cv_use_dmalloc='wxUSE_DMALLOC=yes' + wx_cv_use_dmalloc='wxUSE_DMALLOC=yes' else - ac_cv_use_dmalloc='wxUSE_DMALLOC=no' + wx_cv_use_dmalloc='wxUSE_DMALLOC=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC + wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}" fi; - eval "$ac_cv_use_dmalloc" - if test "$no_cache" != 1; then - echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dmalloc" + if test "x$cache" = xyes; then + echo "wxUSE_DMALLOC=$wxUSE_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 + + + withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi + echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5 +echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6 + +# Check whether --with-sdl or --without-sdl was given. +if test "${with_sdl+set}" = set; then + withval="$with_sdl" + + if test "$withval" = yes; then + wx_cv_use_sdl='wxUSE_LIBSDL=yes' + else + wx_cv_use_sdl='wxUSE_LIBSDL=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}" + +fi; + + eval "$wx_cv_use_sdl" + if test "x$cache" = xyes; then + echo "wxUSE_LIBSDL=$wxUSE_LIBSDL" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBSDL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_LIBSDL 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 - no_cache=0 # Check whether --with-regex or --without-regex was given. if test "${with_regex+set}" = set; then withval="$with_regex" if test "$withval" = yes; then - ac_cv_use_regex='wxUSE_REGEX=yes' + wx_cv_use_regex='wxUSE_REGEX=yes' elif test "$withval" = no; then - ac_cv_use_regex='wxUSE_REGEX=no' + wx_cv_use_regex='wxUSE_REGEX=no' elif test "$withval" = sys; then - ac_cv_use_regex='wxUSE_REGEX=sys' + wx_cv_use_regex='wxUSE_REGEX=sys' elif test "$withval" = builtin; then - ac_cv_use_regex='wxUSE_REGEX=builtin' + wx_cv_use_regex='wxUSE_REGEX=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX + wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}" fi; - eval "$ac_cv_use_regex" - if test "$no_cache" != 1; then - echo $ac_cv_use_regex >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_regex" + if test "x$cache" = xyes; then + echo "wxUSE_REGEX=$wxUSE_REGEX" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_REGEX" = yes; then @@ -3596,42 +3616,43 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or echo "$as_me:$LINENO: checking for --with-zlib" >&5 echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6 - no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" if test "$withval" = yes; then - ac_cv_use_zlib='wxUSE_ZLIB=yes' + wx_cv_use_zlib='wxUSE_ZLIB=yes' elif test "$withval" = no; then - ac_cv_use_zlib='wxUSE_ZLIB=no' + wx_cv_use_zlib='wxUSE_ZLIB=no' elif test "$withval" = sys; then - ac_cv_use_zlib='wxUSE_ZLIB=sys' + wx_cv_use_zlib='wxUSE_ZLIB=sys' elif test "$withval" = builtin; then - ac_cv_use_zlib='wxUSE_ZLIB=builtin' + wx_cv_use_zlib='wxUSE_ZLIB=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB + wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}" fi; - eval "$ac_cv_use_zlib" - if test "$no_cache" != 1; then - echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_zlib" + if test "x$cache" = xyes; then + echo "wxUSE_ZLIB=$wxUSE_ZLIB" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_ZLIB" = yes; then @@ -3655,42 +3676,43 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b echo "$as_me:$LINENO: checking for --with-odbc" >&5 echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6 - no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then withval="$with_odbc" if test "$withval" = yes; then - ac_cv_use_odbc='wxUSE_ODBC=yes' + wx_cv_use_odbc='wxUSE_ODBC=yes' elif test "$withval" = no; then - ac_cv_use_odbc='wxUSE_ODBC=no' + wx_cv_use_odbc='wxUSE_ODBC=no' elif test "$withval" = sys; then - ac_cv_use_odbc='wxUSE_ODBC=sys' + wx_cv_use_odbc='wxUSE_ODBC=sys' elif test "$withval" = builtin; then - ac_cv_use_odbc='wxUSE_ODBC=builtin' + wx_cv_use_odbc='wxUSE_ODBC=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC + wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}" fi; - eval "$ac_cv_use_odbc" - if test "$no_cache" != 1; then - echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_odbc" + if test "x$cache" = xyes; then + echo "wxUSE_ODBC=$wxUSE_ODBC" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_ODBC" = yes; then @@ -3714,42 +3736,43 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b echo "$as_me:$LINENO: checking for --with-expat" >&5 echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6 - no_cache=0 # Check whether --with-expat or --without-expat was given. if test "${with_expat+set}" = set; then withval="$with_expat" if test "$withval" = yes; then - ac_cv_use_expat='wxUSE_EXPAT=yes' + wx_cv_use_expat='wxUSE_EXPAT=yes' elif test "$withval" = no; then - ac_cv_use_expat='wxUSE_EXPAT=no' + wx_cv_use_expat='wxUSE_EXPAT=no' elif test "$withval" = sys; then - ac_cv_use_expat='wxUSE_EXPAT=sys' + wx_cv_use_expat='wxUSE_EXPAT=sys' elif test "$withval" = builtin; then - ac_cv_use_expat='wxUSE_EXPAT=builtin' + wx_cv_use_expat='wxUSE_EXPAT=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_expat='wxUSE_EXPAT='$DEFAULT_wxUSE_EXPAT + wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}" fi; - eval "$ac_cv_use_expat" - if test "$no_cache" != 1; then - echo $ac_cv_use_expat >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_expat" + if test "x$cache" = xyes; then + echo "wxUSE_EXPAT=$wxUSE_EXPAT" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_EXPAT" = yes; then @@ -3771,10065 +3794,12340 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or fi +echo "$as_me:$LINENO: checking for --with-macosx-sdk" >&5 +echo $ECHO_N "checking for --with-macosx-sdk... $ECHO_C" >&6 + +# Check whether --with-macosx-sdk or --without-macosx-sdk was given. +if test "${with_macosx_sdk+set}" = set; then + withval="$with_macosx_sdk" + + wxUSE_MACOSX_SDK=$withval + wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval" + echo "wxUSE_MACOSX_SDK=$wxUSE_MACOSX_SDK" >> ${wx_arg_cache_file}.tmp + +else + + # NOTE: Empty string on purpose so that --without-macosx-sdk (thus no) + # will override --enable-universal_binary's automatic SDK usage. + wxUSE_MACOSX_SDK= + LINE=`grep "^wxUSE_MACOSX_SDK=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "$LINE" + echo "$LINE" >> ${wx_arg_cache_file}.tmp + fi + +fi; +echo "$as_me:$LINENO: result: $wxUSE_MACOSX_SDK" >&5 +echo "${ECHO_T}$wxUSE_MACOSX_SDK" >&6 + +echo "$as_me:$LINENO: checking for --with-macosx-version-min" >&5 +echo $ECHO_N "checking for --with-macosx-version-min... $ECHO_C" >&6 + +# Check whether --with-macosx-version-min or --without-macosx-version-min was given. +if test "${with_macosx_version_min+set}" = set; then + withval="$with_macosx_version_min" + + wxUSE_MACOSX_VERSION_MIN=$withval + wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval" + echo "wxUSE_MACOSX_VERSION_MIN=$wxUSE_MACOSX_VERSION_MIN" >> ${wx_arg_cache_file}.tmp + +else + + # default "yes" because when not using an SDK it means the same as no + # but when using an SDK it means to use the SDK version + wxUSE_MACOSX_VERSION_MIN=yes + # See if there is a value in the cache + LINE=`grep "^wxUSE_MACOSX_VERSION_MIN=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "$LINE" + echo "$LINE" >> ${wx_arg_cache_file}.tmp + fi + +fi; +echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5 +echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&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}-shared" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6 - no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" if test "$enableval" = yes; then - ac_cv_use_shared='wxUSE_SHARED=yes' + wx_cv_use_shared='wxUSE_SHARED=yes' else - ac_cv_use_shared='wxUSE_SHARED=no' + wx_cv_use_shared='wxUSE_SHARED=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED + wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" fi; - eval "$ac_cv_use_shared" - if test "$no_cache" != 1; then - echo $ac_cv_use_shared >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_shared" + if test "x$cache" = xyes; then + echo "wxUSE_SHARED=$wxUSE_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=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}-optimise" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6 - no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then enableval="$enable_optimise" if test "$enableval" = yes; then - ac_cv_use_optimise='wxUSE_OPTIMISE=yes' + wx_cv_use_optimise='wxUSE_OPTIMISE=yes' else - ac_cv_use_optimise='wxUSE_OPTIMISE=no' + wx_cv_use_optimise='wxUSE_OPTIMISE=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE + wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" fi; - eval "$ac_cv_use_optimise" - if test "$no_cache" != 1; then - echo $ac_cv_use_optimise >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_optimise" + if test "x$cache" = xyes; then + echo "wxUSE_OPTIMISE=$wxUSE_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 - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6 - no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" if test "$enableval" = yes; then - ac_cv_use_debug='wxUSE_DEBUG=yes' + wx_cv_use_debug='wxUSE_DEBUG=yes' else - ac_cv_use_debug='wxUSE_DEBUG=no' + wx_cv_use_debug='wxUSE_DEBUG=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debug='wxUSE_DEBUG='$DEFAULT_wxUSE_DEBUG + wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}" fi; - eval "$ac_cv_use_debug" - if test "$no_cache" != 1; then - echo $ac_cv_use_debug >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debug" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG=$wxUSE_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 - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6 - no_cache=0 # Check whether --enable-stl or --disable-stl was given. if test "${enable_stl+set}" = set; then enableval="$enable_stl" if test "$enableval" = yes; then - ac_cv_use_stl='wxUSE_STL=yes' + wx_cv_use_stl='wxUSE_STL=yes' else - ac_cv_use_stl='wxUSE_STL=no' + wx_cv_use_stl='wxUSE_STL=no' fi + cache=yes 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" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_stl='wxUSE_STL='$DEFAULT_wxUSE_STL + wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}" fi; - eval "$ac_cv_use_stl" - if test "$no_cache" != 1; then - echo $ac_cv_use_stl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_stl" + if test "x$cache" = xyes; then + echo "wxUSE_STL=$wxUSE_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 -if test "$USE_OS2" = "1"; then - DEFAULT_wxUSE_OMF=no + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-omf or --disable-omf was given. -if test "${enable_omf+set}" = set; then - enableval="$enable_omf" + + 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 + # 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_omf='wxUSE_OMF=yes' + wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' else - ac_cv_use_omf='wxUSE_OMF=no' + wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' fi + cache=yes else - LINE=`grep "wxUSE_OMF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_omf='wxUSE_OMF='$DEFAULT_wxUSE_OMF + wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}" fi; - eval "$ac_cv_use_omf" - if test "$no_cache" != 1; then - echo $ac_cv_use_omf >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_std_iostreams" + if test "x$cache" = xyes; then + echo "wxUSE_STD_IOSTREAM=$wxUSE_STD_IOSTREAM" >> ${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_STD_IOSTREAM = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STD_IOSTREAM fi -fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -if test "$wxUSE_DEBUG" = "yes"; then - DEFAULT_wxUSE_DEBUG_FLAG=yes - DEFAULT_wxUSE_DEBUG_INFO=yes - BUILD=debug -elif test "$wxUSE_DEBUG" = "no"; then - DEFAULT_wxUSE_DEBUG_FLAG=no - DEFAULT_wxUSE_DEBUG_INFO=no - BUILD=release -fi + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi - enablestring= - 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 - # Check whether --enable-debug_flag or --disable-debug_flag was given. -if test "${enable_debug_flag+set}" = set; then - enableval="$enable_debug_flag" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6 + # 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_debug_flag='wxUSE_DEBUG_FLAG=yes' + wx_cv_use_std_string='wxUSE_STD_STRING=yes' else - ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' + wx_cv_use_std_string='wxUSE_STD_STRING=no' fi + cache=yes else - LINE=`grep "wxUSE_DEBUG_FLAG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG + wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}" fi; - eval "$ac_cv_use_debug_flag" - if test "$no_cache" != 1; then - echo $ac_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_std_string" + if test "x$cache" = xyes; then + echo "wxUSE_STD_STRING=$wxUSE_STD_STRING" >> ${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_STD_STRING = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STD_STRING fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - 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 - # Check whether --enable-debug_info or --disable-debug_info was given. -if test "${enable_debug_info+set}" = set; then - enableval="$enable_debug_info" + + 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 + # 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_debug_info='wxUSE_DEBUG_INFO=yes' + wx_cv_use_unicode='wxUSE_UNICODE=yes' else - ac_cv_use_debug_info='wxUSE_DEBUG_INFO=no' + wx_cv_use_unicode='wxUSE_UNICODE=no' fi + cache=yes else - LINE=`grep "wxUSE_DEBUG_INFO" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO + wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}" fi; - eval "$ac_cv_use_debug_info" - if test "$no_cache" != 1; then - echo $ac_cv_use_debug_info >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_unicode" + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE=$wxUSE_UNICODE" >> ${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_UNICODE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_UNICODE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - 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 - # Check whether --enable-debug_gdb or --disable-debug_gdb was given. -if test "${enable_debug_gdb+set}" = set; then - enableval="$enable_debug_gdb" + + 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 + # 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_debug_gdb='wxUSE_DEBUG_GDB=yes' + wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes' else - ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' + wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no' fi + cache=yes else - LINE=`grep "wxUSE_DEBUG_GDB" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB='$DEFAULT_wxUSE_DEBUG_GDB + wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}" fi; - eval "$ac_cv_use_debug_gdb" - if test "$no_cache" != 1; then - echo $ac_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mslu" + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE_MSLU=$wxUSE_UNICODE_MSLU" >> ${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_UNICODE_MSLU = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + 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}-debug_cntxt" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given. -if test "${enable_debug_cntxt+set}" = set; then - enableval="$enable_debug_cntxt" - if test "$enableval" = yes; then - ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' - else - ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' - fi + enablestring= + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6 + # 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'" + cache=yes else - LINE=`grep "wxUSE_DEBUG_CONTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT='$DEFAULT_wxUSE_DEBUG_CONTEXT + wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8 fi; - eval "$ac_cv_use_debug_cntxt" - if test "$no_cache" != 1; then - echo $ac_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_utf8" + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE_UTF8=$wxUSE_UNICODE_UTF8" >> ${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 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi + echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5 +echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6 - enablestring= - 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 - # Check whether --enable-mem_tracing or --disable-mem_tracing was given. -if test "${enable_mem_tracing+set}" = set; then - enableval="$enable_mem_tracing" + 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 + # 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_mem_tracing='wxUSE_MEM_TRACING=yes' + wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes' else - ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' + wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no' fi + cache=yes else - LINE=`grep "wxUSE_MEM_TRACING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING + wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}" fi; - eval "$ac_cv_use_mem_tracing" - if test "$no_cache" != 1; then - echo $ac_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_utf8only" + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE_UTF8_LOCALE=$wxUSE_UNICODE_UTF8_LOCALE" >> ${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_UNICODE_UTF8_LOCALE = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_UNICODE_UTF8_LOCALE fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-profile" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-profile or --disable-profile was given. -if test "${enable_profile+set}" = set; then - enableval="$enable_profile" + + 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 + # 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_profile='wxUSE_PROFILE=yes' + wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes' else - ac_cv_use_profile='wxUSE_PROFILE=no' + wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no' fi + cache=yes else - LINE=`grep "wxUSE_PROFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE + wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}" fi; - eval "$ac_cv_use_profile" - if test "$no_cache" != 1; then - echo $ac_cv_use_profile >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_extended_rtti" + if test "x$cache" = xyes; then + echo "wxUSE_EXTENDED_RTTI=$wxUSE_EXTENDED_RTTI" >> ${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_EXTENDED_RTTI = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_EXTENDED_RTTI fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - 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 - # Check whether --enable-no_rtti or --disable-no_rtti was given. -if test "${enable_no_rtti+set}" = set; then - enableval="$enable_no_rtti" +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 + # Check whether --enable-omf or --disable-omf was given. +if test "${enable_omf+set}" = set; then + enableval="$enable_omf" if test "$enableval" = yes; then - ac_cv_use_no_rtti='wxUSE_NO_RTTI=yes' + wx_cv_use_omf='wxUSE_OMF=yes' else - ac_cv_use_no_rtti='wxUSE_NO_RTTI=no' + wx_cv_use_omf='wxUSE_OMF=no' fi + cache=yes else - LINE=`grep "wxUSE_NO_RTTI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_no_rtti='wxUSE_NO_RTTI='$DEFAULT_wxUSE_NO_RTTI + wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}" fi; - eval "$ac_cv_use_no_rtti" - if test "$no_cache" != 1; then - echo $ac_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_omf" + if test "x$cache" = xyes; then + echo "wxUSE_OMF=$wxUSE_OMF" >> ${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_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 - enablestring= - 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 - # Check whether --enable-no_exceptions or --disable-no_exceptions was given. -if test "${enable_no_exceptions+set}" = set; then - enableval="$enable_no_exceptions" +fi + +if test "$wxUSE_DEBUG" = "yes"; then + DEFAULT_wxUSE_DEBUG_FLAG=yes + DEFAULT_wxUSE_DEBUG_INFO=yes + BUILD=debug +elif test "$wxUSE_DEBUG" = "no"; then + DEFAULT_wxUSE_DEBUG_FLAG=no + DEFAULT_wxUSE_DEBUG_INFO=no + BUILD=release +fi + + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6 + # Check whether --enable-debug_flag or --disable-debug_flag was given. +if test "${enable_debug_flag+set}" = set; then + enableval="$enable_debug_flag" if test "$enableval" = yes; then - ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes' + wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes' else - ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no' + wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' fi + cache=yes else - LINE=`grep "wxUSE_NO_EXCEPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS='$DEFAULT_wxUSE_NO_EXCEPTIONS + wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" fi; - eval "$ac_cv_use_no_exceptions" - if test "$no_cache" != 1; then - echo $ac_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debug_flag" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_FLAG=$wxUSE_DEBUG_FLAG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-permissive" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-permissive or --disable-permissive was given. -if test "${enable_permissive+set}" = set; then - enableval="$enable_permissive" + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6 + # Check whether --enable-debug_info or --disable-debug_info was given. +if test "${enable_debug_info+set}" = set; then + enableval="$enable_debug_info" if test "$enableval" = yes; then - ac_cv_use_permissive='wxUSE_PERMISSIVE=yes' + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes' else - ac_cv_use_permissive='wxUSE_PERMISSIVE=no' + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' fi + cache=yes else - LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_permissive='wxUSE_PERMISSIVE='$DEFAULT_wxUSE_PERMISSIVE + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" fi; - eval "$ac_cv_use_permissive" - if test "$no_cache" != 1; then - echo $ac_cv_use_permissive >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debug_info" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_INFO=$wxUSE_DEBUG_INFO" >> ${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_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= - 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 - # Check whether --enable-no_deps or --disable-no_deps was given. -if test "${enable_no_deps+set}" = set; then - enableval="$enable_no_deps" + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6 + # Check whether --enable-debug_gdb or --disable-debug_gdb was given. +if test "${enable_debug_gdb+set}" = set; then + enableval="$enable_debug_gdb" if test "$enableval" = yes; then - ac_cv_use_no_deps='wxUSE_NO_DEPS=yes' + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes' else - ac_cv_use_no_deps='wxUSE_NO_DEPS=no' + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' fi + cache=yes else - LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_no_deps='wxUSE_NO_DEPS='$DEFAULT_wxUSE_NO_DEPS + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" fi; - eval "$ac_cv_use_no_deps" - if test "$no_cache" != 1; then - echo $ac_cv_use_no_deps >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debug_gdb" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_GDB=$wxUSE_DEBUG_GDB" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-universal_binary or --disable-universal_binary was given. -if test "${enable_universal_binary+set}" = set; then - enableval="$enable_universal_binary" + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi - wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6 + # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given. +if test "${enable_debug_cntxt+set}" = set; then + enableval="$enable_debug_cntxt" + + if test "$enableval" = yes; then + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' + else + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' + fi + cache=yes else - LINE=`grep "wxUSE_UNIVERSAL_BINARY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${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 + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 - wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY=no" + cache=no fi + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" + fi; - eval "$wx_cv_use_universal_binary" - if test "$no_cache" != 1; then - echo $wx_cv_use_universal_binary >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debug_cntxt" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_CONTEXT=$wxUSE_DEBUG_CONTEXT" >> ${wx_arg_cache_file}.tmp fi - echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5 -echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6 - + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_CONTEXT = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DEBUG_CONTEXT + fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring=enable - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat24" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-compat24... $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" - if test "$enableval" = yes; then - ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=yes' + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6 + # Check whether --enable-mem_tracing or --disable-mem_tracing was given. +if test "${enable_mem_tracing+set}" = set; then + enableval="$enable_mem_tracing" + + if test "$enableval" = yes; then + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes' else - ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=no' + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' fi + cache=yes else - LINE=`grep "WXWIN_COMPATIBILITY_2_4" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4='$DEFAULT_WXWIN_COMPATIBILITY_2_4 + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" fi; - eval "$ac_cv_use_compat24" - if test "$no_cache" != 1; then - echo $ac_cv_use_compat24 >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mem_tracing" + if test "x$cache" = xyes; then + echo "wxUSE_MEM_TRACING=$wxUSE_MEM_TRACING" >> ${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 $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=disable - 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-compat26 or --disable-compat26 was given. -if test "${enable_compat26+set}" = set; then - enableval="$enable_compat26" + + 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 + # Check whether --enable-profile or --disable-profile was given. +if test "${enable_profile+set}" = set; then + enableval="$enable_profile" if test "$enableval" = yes; then - ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes' + wx_cv_use_profile='wxUSE_PROFILE=yes' else - ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no' + wx_cv_use_profile='wxUSE_PROFILE=no' fi + cache=yes else - LINE=`grep "WXWIN_COMPATIBILITY_2_6" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6='$DEFAULT_WXWIN_COMPATIBILITY_2_6 + wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}" fi; - eval "$ac_cv_use_compat26" - if test "$no_cache" != 1; then - echo $ac_cv_use_compat26 >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_profile" + if test "x$cache" = xyes; then + echo "wxUSE_PROFILE=$wxUSE_PROFILE" >> ${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 $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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-rpath or --disable-rpath was given. -if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" + 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 + # Check whether --enable-no_rtti or --disable-no_rtti was given. +if test "${enable_no_rtti+set}" = set; then + enableval="$enable_no_rtti" if test "$enableval" = yes; then - ac_cv_use_rpath='wxUSE_RPATH=yes' + wx_cv_use_no_rtti='wxUSE_NO_RTTI=yes' else - ac_cv_use_rpath='wxUSE_RPATH=no' + wx_cv_use_no_rtti='wxUSE_NO_RTTI=no' fi + cache=yes else - LINE=`grep "wxUSE_RPATH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_rpath='wxUSE_RPATH='$DEFAULT_wxUSE_RPATH + wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}" fi; - eval "$ac_cv_use_rpath" - if test "$no_cache" != 1; then - echo $ac_cv_use_rpath >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_no_rtti" + if test "x$cache" = xyes; then + echo "wxUSE_NO_RTTI=$wxUSE_NO_RTTI" >> ${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_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 - - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-intl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-intl or --disable-intl was given. -if test "${enable_intl+set}" = set; then - enableval="$enable_intl" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_exceptions" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >&6 + # Check whether --enable-no_exceptions or --disable-no_exceptions was given. +if test "${enable_no_exceptions+set}" = set; then + enableval="$enable_no_exceptions" if test "$enableval" = yes; then - ac_cv_use_intl='wxUSE_INTL=yes' + wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes' else - ac_cv_use_intl='wxUSE_INTL=no' + wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no' fi + cache=yes else - LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL + wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}" fi; - eval "$ac_cv_use_intl" - if test "$no_cache" != 1; then - echo $ac_cv_use_intl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_no_exceptions" + if test "x$cache" = xyes; then + echo "wxUSE_NO_EXCEPTIONS=$wxUSE_NO_EXCEPTIONS" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-config" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-config or --disable-config was given. -if test "${enable_config+set}" = set; then - enableval="$enable_config" + + 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 + # Check whether --enable-permissive or --disable-permissive was given. +if test "${enable_permissive+set}" = set; then + enableval="$enable_permissive" if test "$enableval" = yes; then - ac_cv_use_config='wxUSE_CONFIG=yes' + wx_cv_use_permissive='wxUSE_PERMISSIVE=yes' else - ac_cv_use_config='wxUSE_CONFIG=no' + wx_cv_use_permissive='wxUSE_PERMISSIVE=no' fi + cache=yes else - LINE=`grep "wxUSE_CONFIG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG + wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}" fi; - eval "$ac_cv_use_config" - if test "$no_cache" != 1; then - echo $ac_cv_use_config >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_permissive" + if test "x$cache" = xyes; then + echo "wxUSE_PERMISSIVE=$wxUSE_PERMISSIVE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocols" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-protocols or --disable-protocols was given. -if test "${enable_protocols+set}" = set; then - enableval="$enable_protocols" + 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 + # Check whether --enable-no_deps or --disable-no_deps was given. +if test "${enable_no_deps+set}" = set; then + enableval="$enable_no_deps" if test "$enableval" = yes; then - ac_cv_use_protocols='wxUSE_PROTOCOL=yes' + wx_cv_use_no_deps='wxUSE_NO_DEPS=yes' else - ac_cv_use_protocols='wxUSE_PROTOCOL=no' + wx_cv_use_no_deps='wxUSE_NO_DEPS=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_protocols='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL + wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}" fi; - eval "$ac_cv_use_protocols" - if test "$no_cache" != 1; then - echo $ac_cv_use_protocols >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_no_deps" + if test "x$cache" = xyes; then + echo "wxUSE_NO_DEPS=$wxUSE_NO_DEPS" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ftp" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-ftp or --disable-ftp was given. -if test "${enable_ftp+set}" = set; then - enableval="$enable_ftp" + + 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}-vararg_macros" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6 + # Check whether --enable-vararg_macros or --disable-vararg_macros was given. +if test "${enable_vararg_macros+set}" = set; then + enableval="$enable_vararg_macros" if test "$enableval" = yes; then - ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes' + wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes' else - ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=no' + wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP + wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}" fi; - eval "$ac_cv_use_ftp" - if test "$no_cache" != 1; then - echo $ac_cv_use_ftp >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_vararg_macros" + if test "x$cache" = xyes; then + echo "wxUSE_VARARG_MACROS=$wxUSE_VARARG_MACROS" >> ${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_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}-http" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-http or --disable-http was given. -if test "${enable_http+set}" = set; then - enableval="$enable_http" - if test "$enableval" = yes; then - ac_cv_use_http='wxUSE_PROTOCOL_HTTP=yes' - else - ac_cv_use_http='wxUSE_PROTOCOL_HTTP=no' - fi + enablestring= + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6 + # Check whether --enable-universal_binary or --disable-universal_binary was given. +if test "${enable_universal_binary+set}" = set; then + enableval="$enable_universal_binary" + + wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'" + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP + wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY fi; - eval "$ac_cv_use_http" - if test "$no_cache" != 1; then - echo $ac_cv_use_http >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_universal_binary" + if test "x$cache" = xyes; then + echo "wxUSE_UNIVERSAL_BINARY=$wxUSE_UNIVERSAL_BINARY" >> ${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 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi + echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5 +echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fileproto" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-fileproto or --disable-fileproto was given. -if test "${enable_fileproto+set}" = set; then - enableval="$enable_fileproto" + + 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 + # 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_fileproto='wxUSE_PROTOCOL_FILE=yes' + wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes' else - ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no' + wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}` + LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE + wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}" fi; - eval "$ac_cv_use_fileproto" - if test "$no_cache" != 1; then - echo $ac_cv_use_fileproto >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_compat26" + if test "x$cache" = xyes; then + echo "WXWIN_COMPATIBILITY_2_6=$WXWIN_COMPATIBILITY_2_6" >> ${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 $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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sockets" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-sockets or --disable-sockets was given. -if test "${enable_sockets+set}" = set; then - enableval="$enable_sockets" + + 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}-compat28" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6 + # 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_sockets='wxUSE_SOCKETS=yes' + wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes' else - ac_cv_use_sockets='wxUSE_SOCKETS=no' + wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no' fi + cache=yes else - LINE=`grep "wxUSE_SOCKETS" ${wx_arg_cache_file}` + LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_sockets='wxUSE_SOCKETS='$DEFAULT_wxUSE_SOCKETS + wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" fi; - eval "$ac_cv_use_sockets" - if test "$no_cache" != 1; then - echo $ac_cv_use_sockets >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_compat28" + if test "x$cache" = xyes; then + echo "WXWIN_COMPATIBILITY_2_8=$WXWIN_COMPATIBILITY_2_8" >> ${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 $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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ole" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-ole or --disable-ole was given. -if test "${enable_ole+set}" = set; then - enableval="$enable_ole" + + + 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 + # Check whether --enable-rpath or --disable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval="$enable_rpath" if test "$enableval" = yes; then - ac_cv_use_ole='wxUSE_OLE=yes' + wx_cv_use_rpath='wxUSE_RPATH=yes' else - ac_cv_use_ole='wxUSE_OLE=no' + wx_cv_use_rpath='wxUSE_RPATH=no' fi + cache=yes else - LINE=`grep "wxUSE_OLE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_ole='wxUSE_OLE='$DEFAULT_wxUSE_OLE + wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}" fi; - eval "$ac_cv_use_ole" - if test "$no_cache" != 1; then - echo $ac_cv_use_ole >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_rpath" + if test "x$cache" = xyes; then + echo "wxUSE_RPATH=$wxUSE_RPATH" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataobj" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dataobj or --disable-dataobj was given. -if test "${enable_dataobj+set}" = set; then - enableval="$enable_dataobj" + + + 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 + # 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_dataobj='wxUSE_DATAOBJ=yes' + wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes' else - ac_cv_use_dataobj='wxUSE_DATAOBJ=no' + wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no' fi + cache=yes else - LINE=`grep "wxUSE_DATAOBJ" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dataobj='wxUSE_DATAOBJ='$DEFAULT_wxUSE_DATAOBJ + wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}" fi; - eval "$ac_cv_use_dataobj" - if test "$no_cache" != 1; then - echo $ac_cv_use_dataobj >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_objc_uniquifying" + if test "x$cache" = xyes; then + echo "wxUSE_OBJC_UNIQUIFYING=$wxUSE_OBJC_UNIQUIFYING" >> ${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_OBJC_UNIQUIFYING = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_OBJC_UNIQUIFYING fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipc" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-ipc or --disable-ipc was given. -if test "${enable_ipc+set}" = set; then - enableval="$enable_ipc" + + 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}-visibility" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6 + # Check whether --enable-visibility or --disable-visibility was given. +if test "${enable_visibility+set}" = set; then + enableval="$enable_visibility" if test "$enableval" = yes; then - ac_cv_use_ipc='wxUSE_IPC=yes' + wx_cv_use_visibility='wxUSE_VISIBILITY=yes' else - ac_cv_use_ipc='wxUSE_IPC=no' + wx_cv_use_visibility='wxUSE_VISIBILITY=no' fi + cache=yes else - LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC + wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}" fi; - eval "$ac_cv_use_ipc" - if test "$no_cache" != 1; then - echo $ac_cv_use_ipc >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_visibility" + if test "x$cache" = xyes; then + echo "wxUSE_VISIBILITY=$wxUSE_VISIBILITY" >> ${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_VISIBILITY = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_VISIBILITY fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - 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 - # Check whether --enable-apple_ieee or --disable-apple_ieee was given. -if test "${enable_apple_ieee+set}" = set; then - enableval="$enable_apple_ieee" + + + 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 + # Check whether --enable-intl or --disable-intl was given. +if test "${enable_intl+set}" = set; then + enableval="$enable_intl" if test "$enableval" = yes; then - ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes' + wx_cv_use_intl='wxUSE_INTL=yes' else - ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' + wx_cv_use_intl='wxUSE_INTL=no' fi + cache=yes else - LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE + wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}" fi; - eval "$ac_cv_use_apple_ieee" - if test "$no_cache" != 1; then - echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_intl" + if test "x$cache" = xyes; then + echo "wxUSE_INTL=$wxUSE_INTL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arcstream" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-arcstream or --disable-arcstream was given. -if test "${enable_arcstream+set}" = set; then - enableval="$enable_arcstream" + + 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 + # Check whether --enable-config or --disable-config was given. +if test "${enable_config+set}" = set; then + enableval="$enable_config" if test "$enableval" = yes; then - ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes' + wx_cv_use_config='wxUSE_CONFIG=yes' else - ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no' + wx_cv_use_config='wxUSE_CONFIG=no' fi + cache=yes else - LINE=`grep "wxUSE_ARCHIVE_STREAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS='$DEFAULT_wxUSE_ARCHIVE_STREAMS + wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}" fi; - eval "$ac_cv_use_arcstream" - if test "$no_cache" != 1; then - echo $ac_cv_use_arcstream >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_config" + if test "x$cache" = xyes; then + echo "wxUSE_CONFIG=$wxUSE_CONFIG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-backtrace or --disable-backtrace was given. -if test "${enable_backtrace+set}" = set; then - enableval="$enable_backtrace" + + + 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 + # Check whether --enable-protocols or --disable-protocols was given. +if test "${enable_protocols+set}" = set; then + enableval="$enable_protocols" if test "$enableval" = yes; then - ac_cv_use_backtrace='wxUSE_STACKWALKER=yes' + wx_cv_use_protocols='wxUSE_PROTOCOL=yes' else - ac_cv_use_backtrace='wxUSE_STACKWALKER=no' + wx_cv_use_protocols='wxUSE_PROTOCOL=no' fi + cache=yes else - LINE=`grep "wxUSE_STACKWALKER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_backtrace='wxUSE_STACKWALKER='$DEFAULT_wxUSE_STACKWALKER + wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi; - eval "$ac_cv_use_backtrace" - if test "$no_cache" != 1; then - echo $ac_cv_use_backtrace >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_protocols" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${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_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= - 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 - # Check whether --enable-catch_segvs or --disable-catch_segvs was given. -if test "${enable_catch_segvs+set}" = set; then - enableval="$enable_catch_segvs" + + 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 + # Check whether --enable-ftp or --disable-ftp was given. +if test "${enable_ftp+set}" = set; then + enableval="$enable_ftp" if test "$enableval" = yes; then - ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes' + wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes' else - ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' + wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no' fi + cache=yes else - LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION + wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi; - eval "$ac_cv_use_catch_segvs" - if test "$no_cache" != 1; then - echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_ftp" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-cmdline or --disable-cmdline was given. -if test "${enable_cmdline+set}" = set; then - enableval="$enable_cmdline" + + 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 + # Check whether --enable-http or --disable-http was given. +if test "${enable_http+set}" = set; then + enableval="$enable_http" if test "$enableval" = yes; then - ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes' + wx_cv_use_http='wxUSE_PROTOCOL_HTTP=yes' else - ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' + wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no' fi + cache=yes else - LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER + wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi; - eval "$ac_cv_use_cmdline" - if test "$no_cache" != 1; then - echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_http" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-datetime or --disable-datetime was given. -if test "${enable_datetime+set}" = set; then - enableval="$enable_datetime" + + 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 + # Check whether --enable-fileproto or --disable-fileproto was given. +if test "${enable_fileproto+set}" = set; then + enableval="$enable_fileproto" if test "$enableval" = yes; then - ac_cv_use_datetime='wxUSE_DATETIME=yes' + wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes' else - ac_cv_use_datetime='wxUSE_DATETIME=no' + wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no' fi + cache=yes else - LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME + wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi; - eval "$ac_cv_use_datetime" - if test "$no_cache" != 1; then - echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fileproto" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debugreport" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-debugreport or --disable-debugreport was given. -if test "${enable_debugreport+set}" = set; then - enableval="$enable_debugreport" + + 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 + # Check whether --enable-sockets or --disable-sockets was given. +if test "${enable_sockets+set}" = set; then + enableval="$enable_sockets" if test "$enableval" = yes; then - ac_cv_use_debugreport='wxUSE_DEBUGREPORT=yes' + wx_cv_use_sockets='wxUSE_SOCKETS=yes' else - ac_cv_use_debugreport='wxUSE_DEBUGREPORT=no' + wx_cv_use_sockets='wxUSE_SOCKETS=no' fi + cache=yes else - LINE=`grep "wxUSE_DEBUGREPORT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debugreport='wxUSE_DEBUGREPORT='$DEFAULT_wxUSE_DEBUGREPORT + wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}" fi; - eval "$ac_cv_use_debugreport" - if test "$no_cache" != 1; then - echo $ac_cv_use_debugreport >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_sockets" + if test "x$cache" = xyes; then + echo "wxUSE_SOCKETS=$wxUSE_SOCKETS" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dialupman or --disable-dialupman was given. -if test "${enable_dialupman+set}" = set; then - enableval="$enable_dialupman" + + 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 + # Check whether --enable-ole or --disable-ole was given. +if test "${enable_ole+set}" = set; then + enableval="$enable_ole" if test "$enableval" = yes; then - ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes' + wx_cv_use_ole='wxUSE_OLE=yes' else - ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' + wx_cv_use_ole='wxUSE_OLE=no' fi + cache=yes else - LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER + wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}" fi; - eval "$ac_cv_use_dialupman" - if test "$no_cache" != 1; then - echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_ole" + if test "x$cache" = xyes; then + echo "wxUSE_OLE=$wxUSE_OLE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynlib" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dynlib or --disable-dynlib was given. -if test "${enable_dynlib+set}" = set; then - enableval="$enable_dynlib" + + 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 + # Check whether --enable-dataobj or --disable-dataobj was given. +if test "${enable_dataobj+set}" = set; then + enableval="$enable_dataobj" if test "$enableval" = yes; then - ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes' + wx_cv_use_dataobj='wxUSE_DATAOBJ=yes' else - ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' + wx_cv_use_dataobj='wxUSE_DATAOBJ=no' fi + cache=yes else - LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS + wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}" fi; - eval "$ac_cv_use_dynlib" - if test "$no_cache" != 1; then - echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dataobj" + if test "x$cache" = xyes; then + echo "wxUSE_DATAOBJ=$wxUSE_DATAOBJ" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynamicloader" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dynamicloader or --disable-dynamicloader was given. -if test "${enable_dynamicloader+set}" = set; then - enableval="$enable_dynamicloader" + + + 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 + # Check whether --enable-ipc or --disable-ipc was given. +if test "${enable_ipc+set}" = set; then + enableval="$enable_ipc" if test "$enableval" = yes; then - ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes' + wx_cv_use_ipc='wxUSE_IPC=yes' else - ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no' + wx_cv_use_ipc='wxUSE_IPC=no' fi + cache=yes else - LINE=`grep "wxUSE_DYNAMIC_LOADER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER='$DEFAULT_wxUSE_DYNAMIC_LOADER + wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}" fi; - eval "$ac_cv_use_dynamicloader" - if test "$no_cache" != 1; then - echo $ac_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_ipc" + if test "x$cache" = xyes; then + echo "wxUSE_IPC=$wxUSE_IPC" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-exceptions" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-exceptions or --disable-exceptions was given. -if test "${enable_exceptions+set}" = set; then - enableval="$enable_exceptions" - if test "$enableval" = yes; then - ac_cv_use_exceptions='wxUSE_EXCEPTIONS=yes' - else - ac_cv_use_exceptions='wxUSE_EXCEPTIONS=no' - fi - -else - - 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 - -fi; - - eval "$ac_cv_use_exceptions" - if test "$no_cache" != 1; then - 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 - 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}-ffile" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-ffile or --disable-ffile was given. -if test "${enable_ffile+set}" = set; then - enableval="$enable_ffile" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-baseevtloop" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-baseevtloop... $ECHO_C" >&6 + # Check whether --enable-baseevtloop or --disable-baseevtloop was given. +if test "${enable_baseevtloop+set}" = set; then + enableval="$enable_baseevtloop" if test "$enableval" = yes; then - ac_cv_use_ffile='wxUSE_FFILE=yes' + wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes' else - ac_cv_use_ffile='wxUSE_FFILE=no' + wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no' fi + cache=yes else - LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE + wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}" fi; - eval "$ac_cv_use_ffile" - if test "$no_cache" != 1; then - echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_baseevtloop" + if test "x$cache" = xyes; then + echo "wxUSE_CONSOLE_EVENTLOOP=$wxUSE_CONSOLE_EVENTLOOP" >> ${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_CONSOLE_EVENTLOOP = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_CONSOLE_EVENTLOOP fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-file or --disable-file was given. -if test "${enable_file+set}" = set; then - enableval="$enable_file" + + 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}-epoolloop" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-epoolloop... $ECHO_C" >&6 + # Check whether --enable-epoolloop or --disable-epoolloop was given. +if test "${enable_epoolloop+set}" = set; then + enableval="$enable_epoolloop" if test "$enableval" = yes; then - ac_cv_use_file='wxUSE_FILE=yes' + wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes' else - ac_cv_use_file='wxUSE_FILE=no' + wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=no' fi + cache=yes else - LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE + wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" fi; - eval "$ac_cv_use_file" - if test "$no_cache" != 1; then - echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_epoolloop" + if test "x$cache" = xyes; then + echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${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_EPOLL_DISPATCHER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_EPOLL_DISPATCHER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-filesystem or --disable-filesystem was given. -if test "${enable_filesystem+set}" = set; then - enableval="$enable_filesystem" + + 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}-selectloop" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-selectloop... $ECHO_C" >&6 + # Check whether --enable-selectloop or --disable-selectloop was given. +if test "${enable_selectloop+set}" = set; then + enableval="$enable_selectloop" if test "$enableval" = yes; then - ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes' + wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes' else - ac_cv_use_filesystem='wxUSE_FILESYSTEM=no' + wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no' fi + cache=yes else - LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM + wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}" fi; - eval "$ac_cv_use_filesystem" - if test "$no_cache" != 1; then - echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_selectloop" + if test "x$cache" = xyes; then + echo "wxUSE_SELECT_DISPATCHER=$wxUSE_SELECT_DISPATCHER" >> ${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_SELECT_DISPATCHER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SELECT_DISPATCHER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-fontmap or --disable-fontmap was given. -if test "${enable_fontmap+set}" = set; then - enableval="$enable_fontmap" + + + 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 + # Check whether --enable-apple_ieee or --disable-apple_ieee was given. +if test "${enable_apple_ieee+set}" = set; then + enableval="$enable_apple_ieee" if test "$enableval" = yes; then - ac_cv_use_fontmap='wxUSE_FONTMAP=yes' + wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes' else - ac_cv_use_fontmap='wxUSE_FONTMAP=no' + wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' fi + cache=yes else - LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP + wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}" fi; - eval "$ac_cv_use_fontmap" - if test "$no_cache" != 1; then - echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_apple_ieee" + if test "x$cache" = xyes; then + echo "wxUSE_APPLE_IEEE=$wxUSE_APPLE_IEEE" >> ${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_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= - 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 - # Check whether --enable-fs_inet or --disable-fs_inet was given. -if test "${enable_fs_inet+set}" = set; then - enableval="$enable_fs_inet" + + 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 + # Check whether --enable-arcstream or --disable-arcstream was given. +if test "${enable_arcstream+set}" = set; then + enableval="$enable_arcstream" if test "$enableval" = yes; then - ac_cv_use_fs_inet='wxUSE_FS_INET=yes' + wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes' else - ac_cv_use_fs_inet='wxUSE_FS_INET=no' + wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no' fi + cache=yes else - LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET + wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}" fi; - eval "$ac_cv_use_fs_inet" - if test "$no_cache" != 1; then - echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_arcstream" + if test "x$cache" = xyes; then + echo "wxUSE_ARCHIVE_STREAMS=$wxUSE_ARCHIVE_STREAMS" >> ${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_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= - 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 - # Check whether --enable-fs_zip or --disable-fs_zip was given. -if test "${enable_fs_zip+set}" = set; then - enableval="$enable_fs_zip" + + 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 + # 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_fs_zip='wxUSE_FS_ZIP=yes' + wx_cv_use_base64='wxUSE_BASE64=yes' else - ac_cv_use_fs_zip='wxUSE_FS_ZIP=no' + wx_cv_use_base64='wxUSE_BASE64=no' fi + cache=yes else - LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP + wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}" fi; - eval "$ac_cv_use_fs_zip" - if test "$no_cache" != 1; then - echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_base64" + if test "x$cache" = xyes; then + echo "wxUSE_BASE64=$wxUSE_BASE64" >> ${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_BASE64 = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_BASE64 fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-geometry or --disable-geometry was given. -if test "${enable_geometry+set}" = set; then - enableval="$enable_geometry" + + 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 + # Check whether --enable-backtrace or --disable-backtrace was given. +if test "${enable_backtrace+set}" = set; then + enableval="$enable_backtrace" if test "$enableval" = yes; then - ac_cv_use_geometry='wxUSE_GEOMETRY=yes' + wx_cv_use_backtrace='wxUSE_STACKWALKER=yes' else - ac_cv_use_geometry='wxUSE_GEOMETRY=no' + wx_cv_use_backtrace='wxUSE_STACKWALKER=no' fi + cache=yes else - LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY + wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}" fi; - eval "$ac_cv_use_geometry" - if test "$no_cache" != 1; then - echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_backtrace" + if test "x$cache" = xyes; then + echo "wxUSE_STACKWALKER=$wxUSE_STACKWALKER" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-log or --disable-log was given. -if test "${enable_log+set}" = set; then - enableval="$enable_log" + + 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 + # Check whether --enable-catch_segvs or --disable-catch_segvs was given. +if test "${enable_catch_segvs+set}" = set; then + enableval="$enable_catch_segvs" if test "$enableval" = yes; then - ac_cv_use_log='wxUSE_LOG=yes' + wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes' else - ac_cv_use_log='wxUSE_LOG=no' + wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' fi + cache=yes else - LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG + wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}" fi; - eval "$ac_cv_use_log" - if test "$no_cache" != 1; then - echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_catch_segvs" + if test "x$cache" = xyes; then + echo "wxUSE_ON_FATAL_EXCEPTION=$wxUSE_ON_FATAL_EXCEPTION" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-longlong or --disable-longlong was given. -if test "${enable_longlong+set}" = set; then - enableval="$enable_longlong" + + 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 + # Check whether --enable-cmdline or --disable-cmdline was given. +if test "${enable_cmdline+set}" = set; then + enableval="$enable_cmdline" if test "$enableval" = yes; then - ac_cv_use_longlong='wxUSE_LONGLONG=yes' + wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes' else - ac_cv_use_longlong='wxUSE_LONGLONG=no' + wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' fi + cache=yes else - LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG + wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}" fi; - eval "$ac_cv_use_longlong" - if test "$no_cache" != 1; then - echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_cmdline" + if test "x$cache" = xyes; then + echo "wxUSE_CMDLINE_PARSER=$wxUSE_CMDLINE_PARSER" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-mimetype or --disable-mimetype was given. -if test "${enable_mimetype+set}" = set; then - enableval="$enable_mimetype" + + 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 + # Check whether --enable-datetime or --disable-datetime was given. +if test "${enable_datetime+set}" = set; then + enableval="$enable_datetime" if test "$enableval" = yes; then - ac_cv_use_mimetype='wxUSE_MIMETYPE=yes' + wx_cv_use_datetime='wxUSE_DATETIME=yes' else - ac_cv_use_mimetype='wxUSE_MIMETYPE=no' + wx_cv_use_datetime='wxUSE_DATETIME=no' fi + cache=yes else - LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE + wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}" fi; - eval "$ac_cv_use_mimetype" - if test "$no_cache" != 1; then - echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_datetime" + if test "x$cache" = xyes; then + echo "wxUSE_DATETIME=$wxUSE_DATETIME" >> ${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_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= - 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" + + 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 + # Check whether --enable-debugreport or --disable-debugreport was given. +if test "${enable_debugreport+set}" = set; then + enableval="$enable_debugreport" if test "$enableval" = yes; then - ac_cv_use_mslu='wxUSE_UNICODE_MSLU=yes' + wx_cv_use_debugreport='wxUSE_DEBUGREPORT=yes' else - ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no' + wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no' fi + cache=yes else - LINE=`grep "wxUSE_UNICODE_MSLU" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mslu='wxUSE_UNICODE_MSLU='$DEFAULT_wxUSE_UNICODE_MSLU + wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}" fi; - eval "$ac_cv_use_mslu" - if test "$no_cache" != 1; then - echo $ac_cv_use_mslu >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debugreport" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUGREPORT=$wxUSE_DEBUGREPORT" >> ${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 + 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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-snglinst or --disable-snglinst was given. -if test "${enable_snglinst+set}" = set; then - enableval="$enable_snglinst" + + 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 + # Check whether --enable-dialupman or --disable-dialupman was given. +if test "${enable_dialupman+set}" = set; then + enableval="$enable_dialupman" if test "$enableval" = yes; then - ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes' + wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes' else - ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no' + wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' fi + cache=yes else - LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER + wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}" fi; - eval "$ac_cv_use_snglinst" - if test "$no_cache" != 1; then - echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dialupman" + if test "x$cache" = xyes; then + echo "wxUSE_DIALUP_MANAGER=$wxUSE_DIALUP_MANAGER" >> ${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_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= - 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" + + 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 + # Check whether --enable-dynlib or --disable-dynlib was given. +if test "${enable_dynlib+set}" = set; then + enableval="$enable_dynlib" if test "$enableval" = yes; then - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' + wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes' else - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' + wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' fi + cache=yes else - LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM + wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$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 + eval "$wx_cv_use_dynlib" + if test "x$cache" = xyes; then + echo "wxUSE_DYNLIB_CLASS=$wxUSE_DYNLIB_CLASS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STD_IOSTREAM" = 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= - 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" + + 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 + # Check whether --enable-dynamicloader or --disable-dynamicloader was given. +if test "${enable_dynamicloader+set}" = set; then + enableval="$enable_dynamicloader" if test "$enableval" = yes; then - ac_cv_use_std_string='wxUSE_STD_STRING=yes' + wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes' else - ac_cv_use_std_string='wxUSE_STD_STRING=no' + wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no' fi + cache=yes else - LINE=`grep "wxUSE_STD_STRING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_std_string='wxUSE_STD_STRING='$DEFAULT_wxUSE_STD_STRING + wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$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 + eval "$wx_cv_use_dynamicloader" + if test "x$cache" = xyes; then + echo "wxUSE_DYNAMIC_LOADER=$wxUSE_DYNAMIC_LOADER" >> ${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 + 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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-stdpaths or --disable-stdpaths was given. -if test "${enable_stdpaths+set}" = set; then - enableval="$enable_stdpaths" + + 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 + # Check whether --enable-exceptions or --disable-exceptions was given. +if test "${enable_exceptions+set}" = set; then + enableval="$enable_exceptions" if test "$enableval" = yes; then - ac_cv_use_stdpaths='wxUSE_STDPATHS=yes' + wx_cv_use_exceptions='wxUSE_EXCEPTIONS=yes' else - ac_cv_use_stdpaths='wxUSE_STDPATHS=no' + wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no' fi + cache=yes else - LINE=`grep "wxUSE_STDPATHS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_stdpaths='wxUSE_STDPATHS='$DEFAULT_wxUSE_STDPATHS + wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}" fi; - eval "$ac_cv_use_stdpaths" - if test "$no_cache" != 1; then - echo $ac_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_exceptions" + if test "x$cache" = xyes; then + echo "wxUSE_EXCEPTIONS=$wxUSE_EXCEPTIONS" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-stopwatch or --disable-stopwatch was given. -if test "${enable_stopwatch+set}" = set; then - enableval="$enable_stopwatch" + + 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 + # Check whether --enable-ffile or --disable-ffile was given. +if test "${enable_ffile+set}" = set; then + enableval="$enable_ffile" if test "$enableval" = yes; then - ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes' + wx_cv_use_ffile='wxUSE_FFILE=yes' else - ac_cv_use_stopwatch='wxUSE_STOPWATCH=no' + wx_cv_use_ffile='wxUSE_FFILE=no' fi + cache=yes else - LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH + wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}" fi; - eval "$ac_cv_use_stopwatch" - if test "$no_cache" != 1; then - echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_ffile" + if test "x$cache" = xyes; then + echo "wxUSE_FFILE=$wxUSE_FFILE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-streams or --disable-streams was given. -if test "${enable_streams+set}" = set; then - enableval="$enable_streams" + + 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 + # Check whether --enable-file or --disable-file was given. +if test "${enable_file+set}" = set; then + enableval="$enable_file" if test "$enableval" = yes; then - ac_cv_use_streams='wxUSE_STREAMS=yes' + wx_cv_use_file='wxUSE_FILE=yes' else - ac_cv_use_streams='wxUSE_STREAMS=no' + wx_cv_use_file='wxUSE_FILE=no' fi + cache=yes else - LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS + wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}" fi; - eval "$ac_cv_use_streams" - if test "$no_cache" != 1; then - echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_file" + if test "x$cache" = xyes; then + echo "wxUSE_FILE=$wxUSE_FILE" >> ${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_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= - 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 - # Check whether --enable-system_options or --disable-system_options was given. -if test "${enable_system_options+set}" = set; then - enableval="$enable_system_options" + + 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 + # Check whether --enable-filesystem or --disable-filesystem was given. +if test "${enable_filesystem+set}" = set; then + enableval="$enable_filesystem" if test "$enableval" = yes; then - ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes' + wx_cv_use_filesystem='wxUSE_FILESYSTEM=yes' else - ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no' + wx_cv_use_filesystem='wxUSE_FILESYSTEM=no' fi + cache=yes else - LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS + wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}" fi; - eval "$ac_cv_use_system_options" - if test "$no_cache" != 1; then - echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_filesystem" + if test "x$cache" = xyes; then + echo "wxUSE_FILESYSTEM=$wxUSE_FILESYSTEM" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-textbuf or --disable-textbuf was given. -if test "${enable_textbuf+set}" = set; then - enableval="$enable_textbuf" + + 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}-fontenum" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fontenum... $ECHO_C" >&6 + # Check whether --enable-fontenum or --disable-fontenum was given. +if test "${enable_fontenum+set}" = set; then + enableval="$enable_fontenum" if test "$enableval" = yes; then - ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes' + wx_cv_use_fontenum='wxUSE_FONTENUM=yes' else - ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no' + wx_cv_use_fontenum='wxUSE_FONTENUM=no' fi + cache=yes else - LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER + wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}" fi; - eval "$ac_cv_use_textbuf" - if test "$no_cache" != 1; then - echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fontenum" + if test "x$cache" = xyes; then + echo "wxUSE_FONTENUM=$wxUSE_FONTENUM" >> ${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_FONTENUM = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_FONTENUM fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-textfile or --disable-textfile was given. -if test "${enable_textfile+set}" = set; then - enableval="$enable_textfile" + + 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 + # Check whether --enable-fontmap or --disable-fontmap was given. +if test "${enable_fontmap+set}" = set; then + enableval="$enable_fontmap" if test "$enableval" = yes; then - ac_cv_use_textfile='wxUSE_TEXTFILE=yes' + wx_cv_use_fontmap='wxUSE_FONTMAP=yes' else - ac_cv_use_textfile='wxUSE_TEXTFILE=no' + wx_cv_use_fontmap='wxUSE_FONTMAP=no' fi + cache=yes else - LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE + wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}" fi; - eval "$ac_cv_use_textfile" - if test "$no_cache" != 1; then - echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fontmap" + if test "x$cache" = xyes; then + echo "wxUSE_FONTMAP=$wxUSE_FONTMAP" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-timer or --disable-timer was given. -if test "${enable_timer+set}" = set; then - enableval="$enable_timer" + + 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 + # Check whether --enable-fs_archive or --disable-fs_archive was given. +if test "${enable_fs_archive+set}" = set; then + enableval="$enable_fs_archive" if test "$enableval" = yes; then - ac_cv_use_timer='wxUSE_TIMER=yes' + wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes' else - ac_cv_use_timer='wxUSE_TIMER=no' + wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no' fi + cache=yes else - LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER + wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}" fi; - eval "$ac_cv_use_timer" - if test "$no_cache" != 1; then - echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fs_archive" + if test "x$cache" = xyes; then + echo "wxUSE_FS_ARCHIVE=$wxUSE_FS_ARCHIVE" >> ${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_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= - 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" + + 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 + # Check whether --enable-fs_inet or --disable-fs_inet was given. +if test "${enable_fs_inet+set}" = set; then + enableval="$enable_fs_inet" if test "$enableval" = yes; then - ac_cv_use_unicode='wxUSE_UNICODE=yes' + wx_cv_use_fs_inet='wxUSE_FS_INET=yes' else - ac_cv_use_unicode='wxUSE_UNICODE=no' + wx_cv_use_fs_inet='wxUSE_FS_INET=no' fi + cache=yes else - LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE + wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}" fi; - eval "$ac_cv_use_unicode" - if test "$no_cache" != 1; then - echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fs_inet" + if test "x$cache" = xyes; then + echo "wxUSE_FS_INET=$wxUSE_FS_INET" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_UNICODE" = 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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-sound or --disable-sound was given. -if test "${enable_sound+set}" = set; then - enableval="$enable_sound" + + 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 + # Check whether --enable-fs_zip or --disable-fs_zip was given. +if test "${enable_fs_zip+set}" = set; then + enableval="$enable_fs_zip" if test "$enableval" = yes; then - ac_cv_use_sound='wxUSE_SOUND=yes' + wx_cv_use_fs_zip='wxUSE_FS_ZIP=yes' else - ac_cv_use_sound='wxUSE_SOUND=no' + wx_cv_use_fs_zip='wxUSE_FS_ZIP=no' fi + cache=yes else - LINE=`grep "wxUSE_SOUND" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_sound='wxUSE_SOUND='$DEFAULT_wxUSE_SOUND + wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}" fi; - eval "$ac_cv_use_sound" - if test "$no_cache" != 1; then - echo $ac_cv_use_sound >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fs_zip" + if test "x$cache" = xyes; then + echo "wxUSE_FS_ZIP=$wxUSE_FS_ZIP" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-mediactrl or --disable-mediactrl was given. -if test "${enable_mediactrl+set}" = set; then - enableval="$enable_mediactrl" + + 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 + # Check whether --enable-geometry or --disable-geometry was given. +if test "${enable_geometry+set}" = set; then + enableval="$enable_geometry" if test "$enableval" = yes; then - ac_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' + wx_cv_use_geometry='wxUSE_GEOMETRY=yes' else - ac_cv_use_mediactrl='wxUSE_MEDIACTRL=no' + wx_cv_use_geometry='wxUSE_GEOMETRY=no' fi + cache=yes else - LINE=`grep "wxUSE_MEDIACTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mediactrl='wxUSE_MEDIACTRL='$DEFAULT_wxUSE_MEDIACTRL + wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}" fi; - eval "$ac_cv_use_mediactrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_mediactrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_geometry" + if test "x$cache" = xyes; then + echo "wxUSE_GEOMETRY=$wxUSE_GEOMETRY" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-gstreamer8 or --disable-gstreamer8 was given. -if test "${enable_gstreamer8+set}" = set; then - enableval="$enable_gstreamer8" + + 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 + # Check whether --enable-log or --disable-log was given. +if test "${enable_log+set}" = set; then + enableval="$enable_log" if test "$enableval" = yes; then - ac_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes' + wx_cv_use_log='wxUSE_LOG=yes' else - ac_cv_use_gstreamer8='wxUSE_GSTREAMER8=no' + wx_cv_use_log='wxUSE_LOG=no' fi + cache=yes else - LINE=`grep "wxUSE_GSTREAMER8" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gstreamer8='wxUSE_GSTREAMER8='$DEFAULT_wxUSE_GSTREAMER8 + wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}" fi; - eval "$ac_cv_use_gstreamer8" - if test "$no_cache" != 1; then - echo $ac_cv_use_gstreamer8 >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_log" + if test "x$cache" = xyes; then + echo "wxUSE_LOG=$wxUSE_LOG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-printfposparam or --disable-printfposparam was given. -if test "${enable_printfposparam+set}" = set; then - enableval="$enable_printfposparam" + + 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 + # Check whether --enable-longlong or --disable-longlong was given. +if test "${enable_longlong+set}" = set; then + enableval="$enable_longlong" if test "$enableval" = yes; then - ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes' + wx_cv_use_longlong='wxUSE_LONGLONG=yes' else - ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' + wx_cv_use_longlong='wxUSE_LONGLONG=no' fi + cache=yes else - LINE=`grep "wxUSE_PRINTF_POS_PARAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS='$DEFAULT_wxUSE_PRINTF_POS_PARAMS + wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}" fi; - eval "$ac_cv_use_printfposparam" - if test "$no_cache" != 1; then - echo $ac_cv_use_printfposparam >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_longlong" + if test "x$cache" = xyes; then + echo "wxUSE_LONGLONG=$wxUSE_LONGLONG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-zipstream" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-zipstream or --disable-zipstream was given. -if test "${enable_zipstream+set}" = set; then - enableval="$enable_zipstream" + + 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 + # Check whether --enable-mimetype or --disable-mimetype was given. +if test "${enable_mimetype+set}" = set; then + enableval="$enable_mimetype" if test "$enableval" = yes; then - ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes' + wx_cv_use_mimetype='wxUSE_MIMETYPE=yes' else - ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no' + wx_cv_use_mimetype='wxUSE_MIMETYPE=no' fi + cache=yes else - LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM + wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}" fi; - eval "$ac_cv_use_zipstream" - if test "$no_cache" != 1; then - echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mimetype" + if test "x$cache" = xyes; then + echo "wxUSE_MIMETYPE=$wxUSE_MIMETYPE" >> ${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_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}-url" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-url or --disable-url was given. -if test "${enable_url+set}" = set; then - enableval="$enable_url" + 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}-snglinst" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6 + # Check whether --enable-snglinst or --disable-snglinst was given. +if test "${enable_snglinst+set}" = set; then + enableval="$enable_snglinst" if test "$enableval" = yes; then - ac_cv_use_url='wxUSE_URL=yes' + wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes' else - ac_cv_use_url='wxUSE_URL=no' + wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no' fi + cache=yes else - LINE=`grep "wxUSE_URL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_url='wxUSE_URL='$DEFAULT_wxUSE_URL + wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}" fi; - eval "$ac_cv_use_url" - if test "$no_cache" != 1; then - echo $ac_cv_use_url >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_snglinst" + if test "x$cache" = xyes; then + echo "wxUSE_SNGLINST_CHECKER=$wxUSE_SNGLINST_CHECKER" >> ${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_SNGLINST_CHECKER = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SNGLINST_CHECKER fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-variant or --disable-variant was given. -if test "${enable_variant+set}" = set; then - enableval="$enable_variant" + + 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}-stdpaths" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6 + # Check whether --enable-stdpaths or --disable-stdpaths was given. +if test "${enable_stdpaths+set}" = set; then + enableval="$enable_stdpaths" if test "$enableval" = yes; then - ac_cv_use_variant='wxUSE_VARIANT=yes' + wx_cv_use_stdpaths='wxUSE_STDPATHS=yes' else - ac_cv_use_variant='wxUSE_VARIANT=no' + wx_cv_use_stdpaths='wxUSE_STDPATHS=no' fi + cache=yes else - LINE=`grep "wxUSE_VARIANT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_variant='wxUSE_VARIANT='$DEFAULT_wxUSE_VARIANT + wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}" fi; - eval "$ac_cv_use_variant" - if test "$no_cache" != 1; then - echo $ac_cv_use_variant >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_stdpaths" + if test "x$cache" = xyes; then + echo "wxUSE_STDPATHS=$wxUSE_STDPATHS" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-protocol or --disable-protocol was given. -if test "${enable_protocol+set}" = set; then - enableval="$enable_protocol" + + 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 + # Check whether --enable-stopwatch or --disable-stopwatch was given. +if test "${enable_stopwatch+set}" = set; then + enableval="$enable_stopwatch" if test "$enableval" = yes; then - ac_cv_use_protocol='wxUSE_PROTOCOL=yes' + wx_cv_use_stopwatch='wxUSE_STOPWATCH=yes' else - ac_cv_use_protocol='wxUSE_PROTOCOL=no' + wx_cv_use_stopwatch='wxUSE_STOPWATCH=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_protocol='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL + wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}" fi; - eval "$ac_cv_use_protocol" - if test "$no_cache" != 1; then - echo $ac_cv_use_protocol >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_stopwatch" + if test "x$cache" = xyes; then + echo "wxUSE_STOPWATCH=$wxUSE_STOPWATCH" >> ${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_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= - 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 - # Check whether --enable-protocol_http or --disable-protocol_http was given. -if test "${enable_protocol_http+set}" = set; then - enableval="$enable_protocol_http" + + 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 + # Check whether --enable-streams or --disable-streams was given. +if test "${enable_streams+set}" = set; then + enableval="$enable_streams" if test "$enableval" = yes; then - ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes' + wx_cv_use_streams='wxUSE_STREAMS=yes' else - ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no' + wx_cv_use_streams='wxUSE_STREAMS=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP + wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}" fi; - eval "$ac_cv_use_protocol_http" - if test "$no_cache" != 1; then - echo $ac_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_streams" + if test "x$cache" = xyes; then + echo "wxUSE_STREAMS=$wxUSE_STREAMS" >> ${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_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= - 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 - # Check whether --enable-protocol_ftp or --disable-protocol_ftp was given. -if test "${enable_protocol_ftp+set}" = set; then - enableval="$enable_protocol_ftp" + + 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 + # Check whether --enable-system_options or --disable-system_options was given. +if test "${enable_system_options+set}" = set; then + enableval="$enable_system_options" if test "$enableval" = yes; then - ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes' + wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes' else - ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no' + wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP + wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" fi; - eval "$ac_cv_use_protocol_ftp" - if test "$no_cache" != 1; then - echo $ac_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_system_options" + if test "x$cache" = xyes; then + echo "wxUSE_SYSTEM_OPTIONS=$wxUSE_SYSTEM_OPTIONS" >> ${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_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= - 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 - # Check whether --enable-protocol_file or --disable-protocol_file was given. -if test "${enable_protocol_file+set}" = set; then - enableval="$enable_protocol_file" + + 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 + # Check whether --enable-tarstream or --disable-tarstream was given. +if test "${enable_tarstream+set}" = set; then + enableval="$enable_tarstream" if test "$enableval" = yes; then - ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes' + wx_cv_use_tarstream='wxUSE_TARSTREAM=yes' else - ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no' + wx_cv_use_tarstream='wxUSE_TARSTREAM=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE + wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}" fi; - eval "$ac_cv_use_protocol_file" - if test "$no_cache" != 1; then - echo $ac_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tarstream" + if test "x$cache" = xyes; then + echo "wxUSE_TARSTREAM=$wxUSE_TARSTREAM" >> ${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_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 - - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-threads" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-threads or --disable-threads was given. -if test "${enable_threads+set}" = set; then - enableval="$enable_threads" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6 + # Check whether --enable-textbuf or --disable-textbuf was given. +if test "${enable_textbuf+set}" = set; then + enableval="$enable_textbuf" if test "$enableval" = yes; then - ac_cv_use_threads='wxUSE_THREADS=yes' + wx_cv_use_textbuf='wxUSE_TEXTBUFFER=yes' else - ac_cv_use_threads='wxUSE_THREADS=no' + wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no' fi + cache=yes else - LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS + wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}" fi; - eval "$ac_cv_use_threads" - if test "$no_cache" != 1; then - echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_textbuf" + if test "x$cache" = xyes; then + echo "wxUSE_TEXTBUFFER=$wxUSE_TEXTBUFFER" >> ${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_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 - -if test "$wxUSE_GUI" = "yes"; then + 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 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-docview" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-docview or --disable-docview was given. -if test "${enable_docview+set}" = set; then - enableval="$enable_docview" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6 + # Check whether --enable-textfile or --disable-textfile was given. +if test "${enable_textfile+set}" = set; then + enableval="$enable_textfile" if test "$enableval" = yes; then - ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes' + wx_cv_use_textfile='wxUSE_TEXTFILE=yes' else - ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' + wx_cv_use_textfile='wxUSE_TEXTFILE=no' fi + cache=yes else - LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE + wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}" fi; - eval "$ac_cv_use_docview" - if test "$no_cache" != 1; then - echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_textfile" + if test "x$cache" = xyes; then + echo "wxUSE_TEXTFILE=$wxUSE_TEXTFILE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-help" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-help or --disable-help was given. -if test "${enable_help+set}" = set; then - enableval="$enable_help" + + 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 + # Check whether --enable-timer or --disable-timer was given. +if test "${enable_timer+set}" = set; then + enableval="$enable_timer" if test "$enableval" = yes; then - ac_cv_use_help='wxUSE_HELP=yes' + wx_cv_use_timer='wxUSE_TIMER=yes' else - ac_cv_use_help='wxUSE_HELP=no' + wx_cv_use_timer='wxUSE_TIMER=no' fi + cache=yes else - LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP + wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}" fi; - eval "$ac_cv_use_help" - if test "$no_cache" != 1; then - echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_timer" + if test "x$cache" = xyes; then + echo "wxUSE_TIMER=$wxUSE_TIMER" >> ${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_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}-mshtmlhelp" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given. -if test "${enable_mshtmlhelp+set}" = set; then - enableval="$enable_mshtmlhelp" + + 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}-sound" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6 + # Check whether --enable-sound or --disable-sound was given. +if test "${enable_sound+set}" = set; then + enableval="$enable_sound" if test "$enableval" = yes; then - ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes' + wx_cv_use_sound='wxUSE_SOUND=yes' else - ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' + wx_cv_use_sound='wxUSE_SOUND=no' fi + cache=yes else - LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP + wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" fi; - eval "$ac_cv_use_mshtmlhelp" - if test "$no_cache" != 1; then - echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_sound" + if test "x$cache" = xyes; then + echo "wxUSE_SOUND=$wxUSE_SOUND" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-html or --disable-html was given. -if test "${enable_html+set}" = set; then - enableval="$enable_html" + + 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 + # Check whether --enable-mediactrl or --disable-mediactrl was given. +if test "${enable_mediactrl+set}" = set; then + enableval="$enable_mediactrl" if test "$enableval" = yes; then - ac_cv_use_html='wxUSE_HTML=yes' + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' else - ac_cv_use_html='wxUSE_HTML=no' + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" fi; - eval "$ac_cv_use_html" - if test "$no_cache" != 1; then - echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mediactrl" + if test "x$cache" = xyes; then + echo "wxUSE_MEDIACTRL=$wxUSE_MEDIACTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-htmlhelp" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-htmlhelp or --disable-htmlhelp was given. -if test "${enable_htmlhelp+set}" = set; then - enableval="$enable_htmlhelp" + + 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 + # Check whether --enable-gstreamer8 or --disable-gstreamer8 was given. +if test "${enable_gstreamer8+set}" = set; then + enableval="$enable_gstreamer8" if test "$enableval" = yes; then - ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes' + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes' else - ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no' fi + cache=yes else - LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" fi; - eval "$ac_cv_use_htmlhelp" - if test "$no_cache" != 1; then - echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gstreamer8" + if test "x$cache" = xyes; then + echo "wxUSE_GSTREAMER8=$wxUSE_GSTREAMER8" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xrc" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-xrc or --disable-xrc was given. -if test "${enable_xrc+set}" = set; then - enableval="$enable_xrc" + + 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 + # Check whether --enable-printfposparam or --disable-printfposparam was given. +if test "${enable_printfposparam+set}" = set; then + enableval="$enable_printfposparam" if test "$enableval" = yes; then - ac_cv_use_xrc='wxUSE_XRC=yes' + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes' else - ac_cv_use_xrc='wxUSE_XRC=no' + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' fi + cache=yes else - LINE=`grep "wxUSE_XRC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_xrc='wxUSE_XRC='$DEFAULT_wxUSE_XRC + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" fi; - eval "$ac_cv_use_xrc" - if test "$no_cache" != 1; then - echo $ac_cv_use_xrc >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_printfposparam" + if test "x$cache" = xyes; then + echo "wxUSE_PRINTF_POS_PARAMS=$wxUSE_PRINTF_POS_PARAMS" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aui" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-aui or --disable-aui was given. -if test "${enable_aui+set}" = set; then - enableval="$enable_aui" + + 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 + # Check whether --enable-zipstream or --disable-zipstream was given. +if test "${enable_zipstream+set}" = set; then + enableval="$enable_zipstream" if test "$enableval" = yes; then - ac_cv_use_aui='wxUSE_AUI=yes' + wx_cv_use_zipstream='wxUSE_ZIPSTREAM=yes' else - ac_cv_use_aui='wxUSE_AUI=no' + wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no' fi + cache=yes else - LINE=`grep "wxUSE_AUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_aui='wxUSE_AUI='$DEFAULT_wxUSE_AUI + wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}" fi; - eval "$ac_cv_use_aui" - if test "$no_cache" != 1; then - echo $ac_cv_use_aui >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_zipstream" + if test "x$cache" = xyes; then + echo "wxUSE_ZIPSTREAM=$wxUSE_ZIPSTREAM" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-constraints or --disable-constraints was given. -if test "${enable_constraints+set}" = set; then - enableval="$enable_constraints" + + + 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 + # Check whether --enable-url or --disable-url was given. +if test "${enable_url+set}" = set; then + enableval="$enable_url" if test "$enableval" = yes; then - ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes' + wx_cv_use_url='wxUSE_URL=yes' else - ac_cv_use_constraints='wxUSE_CONSTRAINTS=no' + wx_cv_use_url='wxUSE_URL=no' fi + cache=yes else - LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS + wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}" fi; - eval "$ac_cv_use_constraints" - if test "$no_cache" != 1; then - echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_url" + if test "x$cache" = xyes; then + echo "wxUSE_URL=$wxUSE_URL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-printarch or --disable-printarch was given. -if test "${enable_printarch+set}" = set; then - enableval="$enable_printarch" + + 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 + # Check whether --enable-variant or --disable-variant was given. +if test "${enable_variant+set}" = set; then + enableval="$enable_variant" if test "$enableval" = yes; then - ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' + wx_cv_use_variant='wxUSE_VARIANT=yes' else - ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' + wx_cv_use_variant='wxUSE_VARIANT=no' fi + cache=yes else - LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE + wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" fi; - eval "$ac_cv_use_printarch" - if test "$no_cache" != 1; then - echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_variant" + if test "x$cache" = xyes; then + echo "wxUSE_VARIANT=$wxUSE_VARIANT" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-mdi or --disable-mdi was given. -if test "${enable_mdi+set}" = set; then - enableval="$enable_mdi" + + 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 + # Check whether --enable-protocol or --disable-protocol was given. +if test "${enable_protocol+set}" = set; then + enableval="$enable_protocol" if test "$enableval" = yes; then - ac_cv_use_mdi='wxUSE_MDI=yes' + wx_cv_use_protocol='wxUSE_PROTOCOL=yes' else - ac_cv_use_mdi='wxUSE_MDI=no' + wx_cv_use_protocol='wxUSE_PROTOCOL=no' fi + cache=yes else - LINE=`grep "wxUSE_MDI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mdi='wxUSE_MDI='$DEFAULT_wxUSE_MDI + wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi; - eval "$ac_cv_use_mdi" - if test "$no_cache" != 1; then - echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_protocol" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-mdidoc or --disable-mdidoc was given. -if test "${enable_mdidoc+set}" = set; then - enableval="$enable_mdidoc" + + 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 + # Check whether --enable-protocol_http or --disable-protocol_http was given. +if test "${enable_protocol_http+set}" = set; then + enableval="$enable_protocol_http" if test "$enableval" = yes; then - ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes' + wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes' else - ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' + wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no' fi + cache=yes else - LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE + wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi; - eval "$ac_cv_use_mdidoc" - if test "$no_cache" != 1; then - echo $ac_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_protocol_http" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-loggui or --disable-loggui was given. -if test "${enable_loggui+set}" = set; then - enableval="$enable_loggui" - if test "$enableval" = yes; then - ac_cv_use_loggui='wxUSE_LOGGUI=yes' - else - ac_cv_use_loggui='wxUSE_LOGGUI=no' - 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}-protocol_ftp" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&6 + # Check whether --enable-protocol_ftp or --disable-protocol_ftp was given. +if test "${enable_protocol_ftp+set}" = set; then + enableval="$enable_protocol_ftp" + + if test "$enableval" = yes; then + wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes' + else + wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no' + fi + cache=yes else - LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI + wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi; - eval "$ac_cv_use_loggui" - if test "$no_cache" != 1; then - echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_protocol_ftp" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-logwin or --disable-logwin was given. -if test "${enable_logwin+set}" = set; then - enableval="$enable_logwin" + + 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 + # Check whether --enable-protocol_file or --disable-protocol_file was given. +if test "${enable_protocol_file+set}" = set; then + enableval="$enable_protocol_file" if test "$enableval" = yes; then - ac_cv_use_logwin='wxUSE_LOGWINDOW=yes' + wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes' else - ac_cv_use_logwin='wxUSE_LOGWINDOW=no' + wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no' fi + cache=yes else - LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW + wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi; - eval "$ac_cv_use_logwin" - if test "$no_cache" != 1; then - echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_protocol_file" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-logdialog or --disable-logdialog was given. -if test "${enable_logdialog+set}" = set; then - enableval="$enable_logdialog" + + + 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 + # Check whether --enable-threads or --disable-threads was given. +if test "${enable_threads+set}" = set; then + enableval="$enable_threads" if test "$enableval" = yes; then - ac_cv_use_logdialog='wxUSE_LOGDIALOG=yes' + wx_cv_use_threads='wxUSE_THREADS=yes' else - ac_cv_use_logdialog='wxUSE_LOGDIALOG=no' + wx_cv_use_threads='wxUSE_THREADS=no' fi + cache=yes else - LINE=`grep "wxUSE_LOGDIALOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_logdialog='wxUSE_LOGDIALOG='$DEFAULT_wxUSE_LOGDIALOG + wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}" fi; - eval "$ac_cv_use_logdialog" - if test "$no_cache" != 1; then - echo $ac_cv_use_logdialog >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_threads" + if test "x$cache" = xyes; then + echo "wxUSE_THREADS=$wxUSE_THREADS" >> ${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_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 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-webkit or --disable-webkit was given. -if test "${enable_webkit+set}" = set; then - enableval="$enable_webkit" + + + 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}-iniconf" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-iniconf... $ECHO_C" >&6 + # Check whether --enable-iniconf or --disable-iniconf was given. +if test "${enable_iniconf+set}" = set; then + enableval="$enable_iniconf" if test "$enableval" = yes; then - ac_cv_use_webkit='wxUSE_WEBKIT=yes' + wx_cv_use_iniconf='wxUSE_INICONF=yes' else - ac_cv_use_webkit='wxUSE_WEBKIT=no' + wx_cv_use_iniconf='wxUSE_INICONF=no' fi + cache=yes else - LINE=`grep "wxUSE_WEBKIT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_webkit='wxUSE_WEBKIT='$DEFAULT_wxUSE_WEBKIT + wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}" fi; - eval "$ac_cv_use_webkit" - if test "$no_cache" != 1; then - echo $ac_cv_use_webkit >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_iniconf" + if test "x$cache" = xyes; then + echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${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_INICONF = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_INICONF fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-html or --disable-html was given. -if test "${enable_html+set}" = set; then - enableval="$enable_html" + + 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}-regkey" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6 + # Check whether --enable-regkey or --disable-regkey was given. +if test "${enable_regkey+set}" = set; then + enableval="$enable_regkey" if test "$enableval" = yes; then - ac_cv_use_html='wxUSE_RICHTEXT=yes' + wx_cv_use_regkey='wxUSE_REGKEY=yes' else - ac_cv_use_html='wxUSE_RICHTEXT=no' + wx_cv_use_regkey='wxUSE_REGKEY=no' fi + cache=yes else - LINE=`grep "wxUSE_RICHTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_html='wxUSE_RICHTEXT='$DEFAULT_wxUSE_RICHTEXT + wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}" fi; - eval "$ac_cv_use_html" - if test "$no_cache" != 1; then - echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_regkey" + if test "x$cache" = xyes; then + echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${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_REGKEY = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_REGKEY fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - 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 - # Check whether --enable-graphics_ctx or --disable-graphics_ctx was given. -if test "${enable_graphics_ctx+set}" = set; then - enableval="$enable_graphics_ctx" + +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 + # Check whether --enable-docview or --disable-docview was given. +if test "${enable_docview+set}" = set; then + enableval="$enable_docview" if test "$enableval" = yes; then - ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' + wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes' else - ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' + wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' fi + cache=yes else - LINE=`grep "wxUSE_GRAPHICS_CONTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT='$DEFAULT_wxUSE_GRAPHICS_CONTEXT + wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}" fi; - eval "$ac_cv_use_graphics_ctx" - if test "$no_cache" != 1; then - echo $ac_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_docview" + if test "x$cache" = xyes; then + echo "wxUSE_DOC_VIEW_ARCHITECTURE=$wxUSE_DOC_VIEW_ARCHITECTURE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-postscript or --disable-postscript was given. -if test "${enable_postscript+set}" = set; then - enableval="$enable_postscript" + 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 + # Check whether --enable-help or --disable-help was given. +if test "${enable_help+set}" = set; then + enableval="$enable_help" if test "$enableval" = yes; then - ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes' + wx_cv_use_help='wxUSE_HELP=yes' else - ac_cv_use_postscript='wxUSE_POSTSCRIPT=no' + wx_cv_use_help='wxUSE_HELP=no' fi + cache=yes else - LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT + wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}" fi; - eval "$ac_cv_use_postscript" - if test "$no_cache" != 1; then - echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_help" + if test "x$cache" = xyes; then + echo "wxUSE_HELP=$wxUSE_HELP" >> ${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_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 - - 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" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mshtmlhelp" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6 + # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given. +if test "${enable_mshtmlhelp+set}" = set; then + enableval="$enable_mshtmlhelp" if test "$enableval" = yes; then - ac_cv_use_prologio='wxUSE_PROLOGIO=yes' + wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes' else - ac_cv_use_prologio='wxUSE_PROLOGIO=no' + wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' fi + cache=yes else - LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO + wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}" fi; - eval "$ac_cv_use_prologio" - if test "$no_cache" != 1; then - echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mshtmlhelp" + if test "x$cache" = xyes; then + echo "wxUSE_MS_HTML_HELP=$wxUSE_MS_HTML_HELP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROLOGIO" = 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 - 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" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6 + # Check whether --enable-html or --disable-html was given. +if test "${enable_html+set}" = set; then + enableval="$enable_html" if test "$enableval" = yes; then - ac_cv_use_resources='wxUSE_RESOURCES=yes' + wx_cv_use_html='wxUSE_HTML=yes' else - ac_cv_use_resources='wxUSE_RESOURCES=no' + wx_cv_use_html='wxUSE_HTML=no' fi + cache=yes else - LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES + wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}" fi; - eval "$ac_cv_use_resources" - if test "$no_cache" != 1; then - echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_html" + if test "x$cache" = xyes; then + echo "wxUSE_HTML=$wxUSE_HTML" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_RESOURCES" = 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 - 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 - # Check whether --enable-clipboard or --disable-clipboard was given. -if test "${enable_clipboard+set}" = set; then - enableval="$enable_clipboard" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-htmlhelp" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6 + # Check whether --enable-htmlhelp or --disable-htmlhelp was given. +if test "${enable_htmlhelp+set}" = set; then + enableval="$enable_htmlhelp" if test "$enableval" = yes; then - ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes' + wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes' else - ac_cv_use_clipboard='wxUSE_CLIPBOARD=no' + wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' fi + cache=yes else - LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD + wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}" fi; - eval "$ac_cv_use_clipboard" - if test "$no_cache" != 1; then - echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_htmlhelp" + if test "x$cache" = xyes; then + echo "wxUSE_WXHTML_HELP=$wxUSE_WXHTML_HELP" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dnd" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dnd or --disable-dnd was given. -if test "${enable_dnd+set}" = set; then - enableval="$enable_dnd" + + 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 + # Check whether --enable-xrc or --disable-xrc was given. +if test "${enable_xrc+set}" = set; then + enableval="$enable_xrc" if test "$enableval" = yes; then - ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes' + wx_cv_use_xrc='wxUSE_XRC=yes' else - ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no' + wx_cv_use_xrc='wxUSE_XRC=no' fi + cache=yes else - LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP + wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}" fi; - eval "$ac_cv_use_dnd" - if test "$no_cache" != 1; then - echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_xrc" + if test "x$cache" = xyes; then + echo "wxUSE_XRC=$wxUSE_XRC" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-metafile or --disable-metafile was given. -if test "${enable_metafile+set}" = set; then - enableval="$enable_metafile" + + 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 + # Check whether --enable-aui or --disable-aui was given. +if test "${enable_aui+set}" = set; then + enableval="$enable_aui" if test "$enableval" = yes; then - ac_cv_use_metafile='wxUSE_METAFILE=yes' + wx_cv_use_aui='wxUSE_AUI=yes' else - ac_cv_use_metafile='wxUSE_METAFILE=no' + wx_cv_use_aui='wxUSE_AUI=no' fi + cache=yes else - LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE + wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}" fi; - eval "$ac_cv_use_metafile" - if test "$no_cache" != 1; then - echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_aui" + if test "x$cache" = xyes; then + echo "wxUSE_AUI=$wxUSE_AUI" >> ${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_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 - - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-controls" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-controls or --disable-controls was given. -if test "${enable_controls+set}" = set; then - enableval="$enable_controls" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stc" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6 + # 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_controls='wxUSE_CONTROLS=yes' + wx_cv_use_stc='wxUSE_STC=yes' else - ac_cv_use_controls='wxUSE_CONTROLS=no' + wx_cv_use_stc='wxUSE_STC=no' fi + cache=yes else - LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS + wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}" fi; - eval "$ac_cv_use_controls" - if test "$no_cache" != 1; then - echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_stc" + if test "x$cache" = xyes; then + echo "wxUSE_STC=$wxUSE_STC" >> ${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_STC = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_STC fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -if test "$wxUSE_CONTROLS" = "yes"; then - DEFAULT_wxUSE_ACCEL=yes - DEFAULT_wxUSE_ANIMATIONCTRL=yes - DEFAULT_wxUSE_BMPBUTTON=yes - DEFAULT_wxUSE_BUTTON=yes - DEFAULT_wxUSE_CALCTRL=yes - DEFAULT_wxUSE_CARET=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_CHECKBOX=yes - DEFAULT_wxUSE_CHECKLISTBOX=yes - DEFAULT_wxUSE_CHOICE=yes - DEFAULT_wxUSE_CHOICEBOOK=yes - DEFAULT_wxUSE_COLOURPICKERCTRL=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_DATEPICKCTRL=yes - DEFAULT_wxUSE_DISPLAY=yes - DEFAULT_wxUSE_DIRPICKERCTRL=yes - DEFAULT_wxUSE_FILEPICKERCTRL=yes - DEFAULT_wxUSE_FONTPICKERCTRL=yes - DEFAULT_wxUSE_GAUGE=yes - DEFAULT_wxUSE_GRID=yes - 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_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_STATUSBAR=yes - DEFAULT_wxUSE_TAB_DIALOG=yes - DEFAULT_wxUSE_TOGGLEBTN=yes - DEFAULT_wxUSE_TOOLBAR=yes - DEFAULT_wxUSE_TOOLBAR_NATIVE=yes - DEFAULT_wxUSE_TOOLTIPS=yes - DEFAULT_wxUSE_TREEBOOK=yes - DEFAULT_wxUSE_TOOLBOOK=yes - DEFAULT_wxUSE_TREECTRL=yes - DEFAULT_wxUSE_POPUPWIN=yes - DEFAULT_wxUSE_TIPWINDOW=yes -elif test "$wxUSE_CONTROLS" = "no"; then - DEFAULT_wxUSE_ACCEL=no - DEFAULT_wxUSE_ANIMATIONCTRL=no - DEFAULT_wxUSE_BMPBUTTON=no - DEFAULT_wxUSE_BUTTON=no - DEFAULT_wxUSE_CALCTRL=no - DEFAULT_wxUSE_CARET=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_CHECKBOX=no - DEFAULT_wxUSE_CHECKLISTBOX=no - DEFAULT_wxUSE_CHOICE=no - DEFAULT_wxUSE_CHOICEBOOK=no - DEFAULT_wxUSE_COLOURPICKERCTRL=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_DATEPICKCTRL=no - DEFAULT_wxUSE_DISPLAY=no - DEFAULT_wxUSE_DIRPICKERCTRL=no - DEFAULT_wxUSE_FILEPICKERCTRL=no - DEFAULT_wxUSE_FONTPICKERCTRL=no - DEFAULT_wxUSE_GAUGE=no - DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_HYPERLINKCTRL=no - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=no - DEFAULT_wxUSE_LISTBOOK=no - DEFAULT_wxUSE_LISTBOX=no - DEFAULT_wxUSE_LISTCTRL=no - DEFAULT_wxUSE_NOTEBOOK=no - DEFAULT_wxUSE_RADIOBOX=no - DEFAULT_wxUSE_RADIOBTN=no - DEFAULT_wxUSE_SASH=no - DEFAULT_wxUSE_SCROLLBAR=no - DEFAULT_wxUSE_SLIDER=no - DEFAULT_wxUSE_SPINBTN=no - DEFAULT_wxUSE_SPINCTRL=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_STATBMP=no - DEFAULT_wxUSE_STATBOX=no - DEFAULT_wxUSE_STATLINE=no - DEFAULT_wxUSE_STATUSBAR=no - DEFAULT_wxUSE_TAB_DIALOG=no - DEFAULT_wxUSE_TOGGLEBTN=no - DEFAULT_wxUSE_TOOLBAR=no - DEFAULT_wxUSE_TOOLBAR_NATIVE=no - DEFAULT_wxUSE_TOOLTIPS=no - DEFAULT_wxUSE_TREEBOOK=no - DEFAULT_wxUSE_TOOLBOOK=no - DEFAULT_wxUSE_TREECTRL=no - DEFAULT_wxUSE_POPUPWIN=no - DEFAULT_wxUSE_TIPWINDOW=no -fi + 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}-accel" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-accel or --disable-accel was given. -if test "${enable_accel+set}" = set; then - enableval="$enable_accel" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6 + # Check whether --enable-constraints or --disable-constraints was given. +if test "${enable_constraints+set}" = set; then + enableval="$enable_constraints" if test "$enableval" = yes; then - ac_cv_use_accel='wxUSE_ACCEL=yes' + wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes' else - ac_cv_use_accel='wxUSE_ACCEL=no' + wx_cv_use_constraints='wxUSE_CONSTRAINTS=no' fi + cache=yes else - LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL + wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}" fi; - eval "$ac_cv_use_accel" - if test "$no_cache" != 1; then - echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_constraints" + if test "x$cache" = xyes; then + echo "wxUSE_CONSTRAINTS=$wxUSE_CONSTRAINTS" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-animatectrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-animatectrl or --disable-animatectrl was given. -if test "${enable_animatectrl+set}" = set; then - enableval="$enable_animatectrl" + + 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 + # Check whether --enable-printarch or --disable-printarch was given. +if test "${enable_printarch+set}" = set; then + enableval="$enable_printarch" if test "$enableval" = yes; then - ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes' + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' else - ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no' + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' fi + cache=yes else - LINE=`grep "wxUSE_ANIMATIONCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL='$DEFAULT_wxUSE_ANIMATIONCTRL + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" fi; - eval "$ac_cv_use_animatectrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_printarch" + if test "x$cache" = xyes; then + echo "wxUSE_PRINTING_ARCHITECTURE=$wxUSE_PRINTING_ARCHITECTURE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-button or --disable-button was given. -if test "${enable_button+set}" = set; then - enableval="$enable_button" + + 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 + # Check whether --enable-mdi or --disable-mdi was given. +if test "${enable_mdi+set}" = set; then + enableval="$enable_mdi" if test "$enableval" = yes; then - ac_cv_use_button='wxUSE_BUTTON=yes' + wx_cv_use_mdi='wxUSE_MDI=yes' else - ac_cv_use_button='wxUSE_BUTTON=no' + wx_cv_use_mdi='wxUSE_MDI=no' fi + cache=yes else - LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON + wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" fi; - eval "$ac_cv_use_button" - if test "$no_cache" != 1; then - echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mdi" + if test "x$cache" = xyes; then + echo "wxUSE_MDI=$wxUSE_MDI" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-bmpbutton or --disable-bmpbutton was given. -if test "${enable_bmpbutton+set}" = set; then - enableval="$enable_bmpbutton" + + 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 + # Check whether --enable-mdidoc or --disable-mdidoc was given. +if test "${enable_mdidoc+set}" = set; then + enableval="$enable_mdidoc" if test "$enableval" = yes; then - ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes' else - ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' fi + cache=yes else - LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" fi; - eval "$ac_cv_use_bmpbutton" - if test "$no_cache" != 1; then - echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mdidoc" + if test "x$cache" = xyes; then + echo "wxUSE_MDI_ARCHITECTURE=$wxUSE_MDI_ARCHITECTURE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-bmpcombobox or --disable-bmpcombobox was given. -if test "${enable_bmpcombobox+set}" = set; then - enableval="$enable_bmpcombobox" + + 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 + # Check whether --enable-loggui or --disable-loggui was given. +if test "${enable_loggui+set}" = set; then + enableval="$enable_loggui" if test "$enableval" = yes; then - ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes' + wx_cv_use_loggui='wxUSE_LOGGUI=yes' else - ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' + wx_cv_use_loggui='wxUSE_LOGGUI=no' fi + cache=yes else - LINE=`grep "wxUSE_BITMAPCOMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX='$DEFAULT_wxUSE_BITMAPCOMBOBOX + wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" fi; - eval "$ac_cv_use_bmpcombobox" - if test "$no_cache" != 1; then - echo $ac_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_loggui" + if test "x$cache" = xyes; then + echo "wxUSE_LOGGUI=$wxUSE_LOGGUI" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-calendar" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-calendar or --disable-calendar was given. -if test "${enable_calendar+set}" = set; then - enableval="$enable_calendar" + + 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 + # Check whether --enable-logwin or --disable-logwin was given. +if test "${enable_logwin+set}" = set; then + enableval="$enable_logwin" if test "$enableval" = yes; then - ac_cv_use_calendar='wxUSE_CALCTRL=yes' + wx_cv_use_logwin='wxUSE_LOGWINDOW=yes' else - ac_cv_use_calendar='wxUSE_CALCTRL=no' + wx_cv_use_logwin='wxUSE_LOGWINDOW=no' fi + cache=yes else - LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL + wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" fi; - eval "$ac_cv_use_calendar" - if test "$no_cache" != 1; then - echo $ac_cv_use_calendar >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_logwin" + if test "x$cache" = xyes; then + echo "wxUSE_LOGWINDOW=$wxUSE_LOGWINDOW" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-caret" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-caret or --disable-caret was given. -if test "${enable_caret+set}" = set; then - enableval="$enable_caret" + + 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 + # Check whether --enable-logdialog or --disable-logdialog was given. +if test "${enable_logdialog+set}" = set; then + enableval="$enable_logdialog" if test "$enableval" = yes; then - ac_cv_use_caret='wxUSE_CARET=yes' + wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes' else - ac_cv_use_caret='wxUSE_CARET=no' + wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' fi + cache=yes else - LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET + wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" fi; - eval "$ac_cv_use_caret" - if test "$no_cache" != 1; then - echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_logdialog" + if test "x$cache" = xyes; then + echo "wxUSE_LOGDIALOG=$wxUSE_LOGDIALOG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checkbox" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-checkbox or --disable-checkbox was given. -if test "${enable_checkbox+set}" = set; then - enableval="$enable_checkbox" + + 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 + # Check whether --enable-webkit or --disable-webkit was given. +if test "${enable_webkit+set}" = set; then + enableval="$enable_webkit" if test "$enableval" = yes; then - ac_cv_use_checkbox='wxUSE_CHECKBOX=yes' + wx_cv_use_webkit='wxUSE_WEBKIT=yes' else - ac_cv_use_checkbox='wxUSE_CHECKBOX=no' + wx_cv_use_webkit='wxUSE_WEBKIT=no' fi + cache=yes else - LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX + wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" fi; - eval "$ac_cv_use_checkbox" - if test "$no_cache" != 1; then - echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_webkit" + if test "x$cache" = xyes; then + echo "wxUSE_WEBKIT=$wxUSE_WEBKIT" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checklst" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-checklst or --disable-checklst was given. -if test "${enable_checklst+set}" = set; then - enableval="$enable_checklst" + + 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 + # Check whether --enable-richtext or --disable-richtext was given. +if test "${enable_richtext+set}" = set; then + enableval="$enable_richtext" if test "$enableval" = yes; then - ac_cv_use_checklst='wxUSE_CHECKLST=yes' + wx_cv_use_richtext='wxUSE_RICHTEXT=yes' else - ac_cv_use_checklst='wxUSE_CHECKLST=no' + wx_cv_use_richtext='wxUSE_RICHTEXT=no' fi + cache=yes else - LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST + wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}" fi; - eval "$ac_cv_use_checklst" - if test "$no_cache" != 1; then - echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_richtext" + if test "x$cache" = xyes; then + echo "wxUSE_RICHTEXT=$wxUSE_RICHTEXT" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choice" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-choice or --disable-choice was given. -if test "${enable_choice+set}" = set; then - enableval="$enable_choice" + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6 + # Check whether --enable-graphics_ctx or --disable-graphics_ctx was given. +if test "${enable_graphics_ctx+set}" = set; then + enableval="$enable_graphics_ctx" if test "$enableval" = yes; then - ac_cv_use_choice='wxUSE_CHOICE=yes' + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' else - ac_cv_use_choice='wxUSE_CHOICE=no' + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' fi + cache=yes else - LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" fi; - eval "$ac_cv_use_choice" - if test "$no_cache" != 1; then - echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_graphics_ctx" + if test "x$cache" = xyes; then + echo "wxUSE_GRAPHICS_CONTEXT=$wxUSE_GRAPHICS_CONTEXT" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicebook" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-choicebook or --disable-choicebook was given. -if test "${enable_choicebook+set}" = set; then - enableval="$enable_choicebook" + + 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 + # Check whether --enable-postscript or --disable-postscript was given. +if test "${enable_postscript+set}" = set; then + enableval="$enable_postscript" if test "$enableval" = yes; then - ac_cv_use_choicebook='wxUSE_CHOICEBOOK=yes' + wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes' else - ac_cv_use_choicebook='wxUSE_CHOICEBOOK=no' + wx_cv_use_postscript='wxUSE_POSTSCRIPT=no' fi + cache=yes else - LINE=`grep "wxUSE_CHOICEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_choicebook='wxUSE_CHOICEBOOK='$DEFAULT_wxUSE_CHOICEBOOK + wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" fi; - eval "$ac_cv_use_choicebook" - if test "$no_cache" != 1; then - echo $ac_cv_use_choicebook >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_postscript" + if test "x$cache" = xyes; then + echo "wxUSE_POSTSCRIPT=$wxUSE_POSTSCRIPT" >> ${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_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}-colourpicker" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-colourpicker or --disable-colourpicker was given. -if test "${enable_colourpicker+set}" = set; then - enableval="$enable_colourpicker" + + 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}-svg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6 + # Check whether --enable-svg or --disable-svg was given. +if test "${enable_svg+set}" = set; then + enableval="$enable_svg" if test "$enableval" = yes; then - ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes' + wx_cv_use_svg='wxUSE_SVG=yes' else - ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no' + wx_cv_use_svg='wxUSE_SVG=no' fi + cache=yes else - LINE=`grep "wxUSE_COLOURPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL='$DEFAULT_wxUSE_COLOURPICKERCTRL + wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" fi; - eval "$ac_cv_use_colourpicker" - if test "$no_cache" != 1; then - echo $ac_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_svg" + if test "x$cache" = xyes; then + echo "wxUSE_SVG=$wxUSE_SVG" >> ${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_SVG = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SVG fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combobox" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-combobox or --disable-combobox was given. -if test "${enable_combobox+set}" = set; then - enableval="$enable_combobox" + + + + 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}-clipboard" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6 + # Check whether --enable-clipboard or --disable-clipboard was given. +if test "${enable_clipboard+set}" = set; then + enableval="$enable_clipboard" if test "$enableval" = yes; then - ac_cv_use_combobox='wxUSE_COMBOBOX=yes' + wx_cv_use_clipboard='wxUSE_CLIPBOARD=yes' else - ac_cv_use_combobox='wxUSE_COMBOBOX=no' + wx_cv_use_clipboard='wxUSE_CLIPBOARD=no' fi + cache=yes else - LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX + wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}" fi; - eval "$ac_cv_use_combobox" - if test "$no_cache" != 1; then - echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_clipboard" + if test "x$cache" = xyes; then + echo "wxUSE_CLIPBOARD=$wxUSE_CLIPBOARD" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-comboctrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-comboctrl or --disable-comboctrl was given. -if test "${enable_comboctrl+set}" = set; then - enableval="$enable_comboctrl" + + 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 + # Check whether --enable-dnd or --disable-dnd was given. +if test "${enable_dnd+set}" = set; then + enableval="$enable_dnd" if test "$enableval" = yes; then - ac_cv_use_comboctrl='wxUSE_COMBOCTRL=yes' + wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes' else - ac_cv_use_comboctrl='wxUSE_COMBOCTRL=no' + wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no' fi + cache=yes else - LINE=`grep "wxUSE_COMBOCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_comboctrl='wxUSE_COMBOCTRL='$DEFAULT_wxUSE_COMBOCTRL + wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}" fi; - eval "$ac_cv_use_comboctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dnd" + if test "x$cache" = xyes; then + echo "wxUSE_DRAG_AND_DROP=$wxUSE_DRAG_AND_DROP" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-datepick or --disable-datepick was given. -if test "${enable_datepick+set}" = set; then - enableval="$enable_datepick" + + 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 + # Check whether --enable-metafile or --disable-metafile was given. +if test "${enable_metafile+set}" = set; then + enableval="$enable_metafile" if test "$enableval" = yes; then - ac_cv_use_datepick='wxUSE_DATEPICKCTRL=yes' + wx_cv_use_metafile='wxUSE_METAFILE=yes' else - ac_cv_use_datepick='wxUSE_DATEPICKCTRL=no' + wx_cv_use_metafile='wxUSE_METAFILE=no' fi + cache=yes else - LINE=`grep "wxUSE_DATEPICKCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_datepick='wxUSE_DATEPICKCTRL='$DEFAULT_wxUSE_DATEPICKCTRL + wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" fi; - eval "$ac_cv_use_datepick" - if test "$no_cache" != 1; then - echo $ac_cv_use_datepick >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_metafile" + if test "x$cache" = xyes; then + echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dirpicker or --disable-dirpicker was given. -if test "${enable_dirpicker+set}" = set; then - enableval="$enable_dirpicker" + + +DEFAULT_wxUSE_CONTROLS=none + + 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}-controls" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6 + # Check whether --enable-controls or --disable-controls was given. +if test "${enable_controls+set}" = set; then + enableval="$enable_controls" if test "$enableval" = yes; then - ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes' + wx_cv_use_controls='wxUSE_CONTROLS=yes' else - ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' + wx_cv_use_controls='wxUSE_CONTROLS=no' fi + cache=yes else - LINE=`grep "wxUSE_DIRPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL='$DEFAULT_wxUSE_DIRPICKERCTRL + wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}" fi; - eval "$ac_cv_use_dirpicker" - if test "$no_cache" != 1; then - echo $ac_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_controls" + if test "x$cache" = xyes; then + echo "wxUSE_CONTROLS=$wxUSE_CONTROLS" >> ${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_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 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-display or --disable-display was given. -if test "${enable_display+set}" = set; then - enableval="$enable_display" + +if test "$wxUSE_CONTROLS" = "yes"; then + DEFAULT_wxUSE_ACCEL=yes + DEFAULT_wxUSE_ANIMATIONCTRL=yes + DEFAULT_wxUSE_BMPBUTTON=yes + DEFAULT_wxUSE_BUTTON=yes + DEFAULT_wxUSE_CALCTRL=yes + DEFAULT_wxUSE_CARET=yes + DEFAULT_wxUSE_COMBOBOX=yes + DEFAULT_wxUSE_CHECKBOX=yes + DEFAULT_wxUSE_CHECKLISTBOX=yes + DEFAULT_wxUSE_CHOICE=yes + DEFAULT_wxUSE_CHOICEBOOK=yes + DEFAULT_wxUSE_COLLPANE=yes + DEFAULT_wxUSE_COLOURPICKERCTRL=yes + DEFAULT_wxUSE_COMBOBOX=yes + DEFAULT_wxUSE_DATEPICKCTRL=yes + DEFAULT_wxUSE_DISPLAY=yes + DEFAULT_wxUSE_DETECT_SM=yes + DEFAULT_wxUSE_DIRPICKERCTRL=yes + DEFAULT_wxUSE_FILEPICKERCTRL=yes + DEFAULT_wxUSE_FONTPICKERCTRL=yes + DEFAULT_wxUSE_GAUGE=yes + DEFAULT_wxUSE_GRID=yes + 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_RADIOBOX=yes + DEFAULT_wxUSE_RADIOBTN=yes + DEFAULT_wxUSE_SASH=yes + DEFAULT_wxUSE_SCROLLBAR=yes + DEFAULT_wxUSE_SEARCHCTRL=yes + DEFAULT_wxUSE_SLIDER=yes + DEFAULT_wxUSE_SPINBTN=yes + DEFAULT_wxUSE_SPINCTRL=yes + DEFAULT_wxUSE_SPLITTER=yes + DEFAULT_wxUSE_STATBMP=yes + DEFAULT_wxUSE_STATBOX=yes + DEFAULT_wxUSE_STATLINE=yes + DEFAULT_wxUSE_STATUSBAR=yes + DEFAULT_wxUSE_TAB_DIALOG=yes + DEFAULT_wxUSE_TOGGLEBTN=yes + DEFAULT_wxUSE_TOOLBAR=yes + DEFAULT_wxUSE_TOOLBAR_NATIVE=yes + DEFAULT_wxUSE_TOOLTIPS=yes + DEFAULT_wxUSE_TREEBOOK=yes + DEFAULT_wxUSE_TOOLBOOK=yes + DEFAULT_wxUSE_TREECTRL=yes + DEFAULT_wxUSE_POPUPWIN=yes + DEFAULT_wxUSE_TIPWINDOW=yes +elif test "$wxUSE_CONTROLS" = "no"; then + DEFAULT_wxUSE_ACCEL=no + DEFAULT_wxUSE_ANIMATIONCTRL=no + DEFAULT_wxUSE_BMPBUTTON=no + DEFAULT_wxUSE_BUTTON=no + DEFAULT_wxUSE_CALCTRL=no + DEFAULT_wxUSE_CARET=no + DEFAULT_wxUSE_COLLPANE=no + DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_CHECKBOX=no + DEFAULT_wxUSE_CHECKLISTBOX=no + DEFAULT_wxUSE_CHOICE=no + DEFAULT_wxUSE_CHOICEBOOK=no + DEFAULT_wxUSE_COLOURPICKERCTRL=no + DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_DATEPICKCTRL=no + DEFAULT_wxUSE_DISPLAY=no + DEFAULT_wxUSE_DETECT_SM=no + DEFAULT_wxUSE_DIRPICKERCTRL=no + DEFAULT_wxUSE_FILEPICKERCTRL=no + DEFAULT_wxUSE_FONTPICKERCTRL=no + DEFAULT_wxUSE_GAUGE=no + DEFAULT_wxUSE_GRID=no + DEFAULT_wxUSE_HYPERLINKCTRL=no + DEFAULT_wxUSE_DATAVIEWCTRL=no + DEFAULT_wxUSE_IMAGLIST=no + DEFAULT_wxUSE_LISTBOOK=no + DEFAULT_wxUSE_LISTBOX=no + DEFAULT_wxUSE_LISTCTRL=no + DEFAULT_wxUSE_NOTEBOOK=no + DEFAULT_wxUSE_RADIOBOX=no + DEFAULT_wxUSE_RADIOBTN=no + DEFAULT_wxUSE_SASH=no + DEFAULT_wxUSE_SCROLLBAR=no + DEFAULT_wxUSE_SEARCHCTRL=no + DEFAULT_wxUSE_SLIDER=no + DEFAULT_wxUSE_SPINBTN=no + DEFAULT_wxUSE_SPINCTRL=no + DEFAULT_wxUSE_SPLITTER=no + DEFAULT_wxUSE_STATBMP=no + DEFAULT_wxUSE_STATBOX=no + DEFAULT_wxUSE_STATLINE=no + DEFAULT_wxUSE_STATUSBAR=no + DEFAULT_wxUSE_TAB_DIALOG=no + DEFAULT_wxUSE_TOGGLEBTN=no + DEFAULT_wxUSE_TOOLBAR=no + DEFAULT_wxUSE_TOOLBAR_NATIVE=no + DEFAULT_wxUSE_TOOLTIPS=no + DEFAULT_wxUSE_TREEBOOK=no + DEFAULT_wxUSE_TOOLBOOK=no + DEFAULT_wxUSE_TREECTRL=no + DEFAULT_wxUSE_POPUPWIN=no + DEFAULT_wxUSE_TIPWINDOW=no +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 + # Check whether --enable-accel or --disable-accel was given. +if test "${enable_accel+set}" = set; then + enableval="$enable_accel" if test "$enableval" = yes; then - ac_cv_use_display='wxUSE_DISPLAY=yes' + wx_cv_use_accel='wxUSE_ACCEL=yes' else - ac_cv_use_display='wxUSE_DISPLAY=no' + wx_cv_use_accel='wxUSE_ACCEL=no' fi + cache=yes else - LINE=`grep "wxUSE_DISPLAY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_display='wxUSE_DISPLAY='$DEFAULT_wxUSE_DISPLAY + wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}" fi; - eval "$ac_cv_use_display" - if test "$no_cache" != 1; then - echo $ac_cv_use_display >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_accel" + if test "x$cache" = xyes; then + echo "wxUSE_ACCEL=$wxUSE_ACCEL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-filepicker or --disable-filepicker was given. -if test "${enable_filepicker+set}" = set; then - enableval="$enable_filepicker" + + 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 + # Check whether --enable-animatectrl or --disable-animatectrl was given. +if test "${enable_animatectrl+set}" = set; then + enableval="$enable_animatectrl" if test "$enableval" = yes; then - ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes' + wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes' else - ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' + wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_FILEPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL='$DEFAULT_wxUSE_FILEPICKERCTRL + wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}" fi; - eval "$ac_cv_use_filepicker" - if test "$no_cache" != 1; then - echo $ac_cv_use_filepicker >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_animatectrl" + if test "x$cache" = xyes; then + echo "wxUSE_ANIMATIONCTRL=$wxUSE_ANIMATIONCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontpicker" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-fontpicker or --disable-fontpicker was given. -if test "${enable_fontpicker+set}" = set; then - enableval="$enable_fontpicker" + + 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 + # Check whether --enable-button or --disable-button was given. +if test "${enable_button+set}" = set; then + enableval="$enable_button" if test "$enableval" = yes; then - ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes' + wx_cv_use_button='wxUSE_BUTTON=yes' else - ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no' + wx_cv_use_button='wxUSE_BUTTON=no' fi + cache=yes else - LINE=`grep "wxUSE_FONTPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL='$DEFAULT_wxUSE_FONTPICKERCTRL + wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" fi; - eval "$ac_cv_use_fontpicker" - if test "$no_cache" != 1; then - echo $ac_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_button" + if test "x$cache" = xyes; then + echo "wxUSE_BUTTON=$wxUSE_BUTTON" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gauge" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-gauge or --disable-gauge was given. -if test "${enable_gauge+set}" = set; then - enableval="$enable_gauge" + + 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 + # Check whether --enable-bmpbutton or --disable-bmpbutton was given. +if test "${enable_bmpbutton+set}" = set; then + enableval="$enable_bmpbutton" if test "$enableval" = yes; then - ac_cv_use_gauge='wxUSE_GAUGE=yes' + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' else - ac_cv_use_gauge='wxUSE_GAUGE=no' + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' fi + cache=yes else - LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" fi; - eval "$ac_cv_use_gauge" - if test "$no_cache" != 1; then - echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_bmpbutton" + if test "x$cache" = xyes; then + echo "wxUSE_BMPBUTTON=$wxUSE_BMPBUTTON" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-grid" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-grid or --disable-grid was given. -if test "${enable_grid+set}" = set; then - enableval="$enable_grid" + + 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 + # Check whether --enable-bmpcombobox or --disable-bmpcombobox was given. +if test "${enable_bmpcombobox+set}" = set; then + enableval="$enable_bmpcombobox" if test "$enableval" = yes; then - ac_cv_use_grid='wxUSE_GRID=yes' + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes' else - ac_cv_use_grid='wxUSE_GRID=no' + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" fi; - eval "$ac_cv_use_grid" - if test "$no_cache" != 1; then - echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_bmpcombobox" + if test "x$cache" = xyes; then + echo "wxUSE_BITMAPCOMBOBOX=$wxUSE_BITMAPCOMBOBOX" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dataviewctrl or --disable-dataviewctrl was given. -if test "${enable_dataviewctrl+set}" = set; then - enableval="$enable_dataviewctrl" + + 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 + # Check whether --enable-calendar or --disable-calendar was given. +if test "${enable_calendar+set}" = set; then + enableval="$enable_calendar" if test "$enableval" = yes; then - ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' + wx_cv_use_calendar='wxUSE_CALCTRL=yes' else - ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' + wx_cv_use_calendar='wxUSE_CALCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_DATAVIEWCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL='$DEFAULT_wxUSE_DATAVIEWCTRL + wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}" fi; - eval "$ac_cv_use_dataviewctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_calendar" + if test "x$cache" = xyes; then + echo "wxUSE_CALCTRL=$wxUSE_CALCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hyperlink" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-hyperlink or --disable-hyperlink was given. -if test "${enable_hyperlink+set}" = set; then - enableval="$enable_hyperlink" + + 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 + # Check whether --enable-caret or --disable-caret was given. +if test "${enable_caret+set}" = set; then + enableval="$enable_caret" if test "$enableval" = yes; then - ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes' + wx_cv_use_caret='wxUSE_CARET=yes' else - ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no' + wx_cv_use_caret='wxUSE_CARET=no' fi + cache=yes else - LINE=`grep "wxUSE_HYPERLINKCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL='$DEFAULT_wxUSE_HYPERLINKCTRL + wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}" fi; - eval "$ac_cv_use_hyperlink" - if test "$no_cache" != 1; then - echo $ac_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_caret" + if test "x$cache" = xyes; then + echo "wxUSE_CARET=$wxUSE_CARET" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-imaglist or --disable-imaglist was given. -if test "${enable_imaglist+set}" = set; then - enableval="$enable_imaglist" + + 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 + # Check whether --enable-checkbox or --disable-checkbox was given. +if test "${enable_checkbox+set}" = set; then + enableval="$enable_checkbox" if test "$enableval" = yes; then - ac_cv_use_imaglist='wxUSE_IMAGLIST=yes' + wx_cv_use_checkbox='wxUSE_CHECKBOX=yes' else - ac_cv_use_imaglist='wxUSE_IMAGLIST=no' + wx_cv_use_checkbox='wxUSE_CHECKBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST + wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}" fi; - eval "$ac_cv_use_imaglist" - if test "$no_cache" != 1; then - echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_checkbox" + if test "x$cache" = xyes; then + echo "wxUSE_CHECKBOX=$wxUSE_CHECKBOX" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbook" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-listbook or --disable-listbook was given. -if test "${enable_listbook+set}" = set; then - enableval="$enable_listbook" + + 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 + # Check whether --enable-checklst or --disable-checklst was given. +if test "${enable_checklst+set}" = set; then + enableval="$enable_checklst" if test "$enableval" = yes; then - ac_cv_use_listbook='wxUSE_LISTBOOK=yes' + wx_cv_use_checklst='wxUSE_CHECKLST=yes' else - ac_cv_use_listbook='wxUSE_LISTBOOK=no' + wx_cv_use_checklst='wxUSE_CHECKLST=no' fi + cache=yes else - LINE=`grep "wxUSE_LISTBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_listbook='wxUSE_LISTBOOK='$DEFAULT_wxUSE_LISTBOOK + wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}" fi; - eval "$ac_cv_use_listbook" - if test "$no_cache" != 1; then - echo $ac_cv_use_listbook >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_checklst" + if test "x$cache" = xyes; then + echo "wxUSE_CHECKLST=$wxUSE_CHECKLST" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbox" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-listbox or --disable-listbox was given. -if test "${enable_listbox+set}" = set; then - enableval="$enable_listbox" + + 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 + # Check whether --enable-choice or --disable-choice was given. +if test "${enable_choice+set}" = set; then + enableval="$enable_choice" if test "$enableval" = yes; then - ac_cv_use_listbox='wxUSE_LISTBOX=yes' + wx_cv_use_choice='wxUSE_CHOICE=yes' else - ac_cv_use_listbox='wxUSE_LISTBOX=no' + wx_cv_use_choice='wxUSE_CHOICE=no' fi + cache=yes else - LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX + wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}" fi; - eval "$ac_cv_use_listbox" - if test "$no_cache" != 1; then - echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_choice" + if test "x$cache" = xyes; then + echo "wxUSE_CHOICE=$wxUSE_CHOICE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listctrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-listctrl or --disable-listctrl was given. -if test "${enable_listctrl+set}" = set; then - enableval="$enable_listctrl" + + 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 + # Check whether --enable-choicebook or --disable-choicebook was given. +if test "${enable_choicebook+set}" = set; then + enableval="$enable_choicebook" if test "$enableval" = yes; then - ac_cv_use_listctrl='wxUSE_LISTCTRL=yes' + wx_cv_use_choicebook='wxUSE_CHOICEBOOK=yes' else - ac_cv_use_listctrl='wxUSE_LISTCTRL=no' + wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no' fi + cache=yes else - LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL + wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}" fi; - eval "$ac_cv_use_listctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_choicebook" + if test "x$cache" = xyes; then + echo "wxUSE_CHOICEBOOK=$wxUSE_CHOICEBOOK" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notebook" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-notebook or --disable-notebook was given. -if test "${enable_notebook+set}" = set; then - enableval="$enable_notebook" + + 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 + # Check whether --enable-collpane or --disable-collpane was given. +if test "${enable_collpane+set}" = set; then + enableval="$enable_collpane" if test "$enableval" = yes; then - ac_cv_use_notebook='wxUSE_NOTEBOOK=yes' + wx_cv_use_collpane='wxUSE_COLLPANE=yes' else - ac_cv_use_notebook='wxUSE_NOTEBOOK=no' + wx_cv_use_collpane='wxUSE_COLLPANE=no' fi + cache=yes else - LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK + wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}" fi; - eval "$ac_cv_use_notebook" - if test "$no_cache" != 1; then - echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_collpane" + if test "x$cache" = xyes; then + echo "wxUSE_COLLPANE=$wxUSE_COLLPANE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombobox" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-odcombobox or --disable-odcombobox was given. -if test "${enable_odcombobox+set}" = set; then - enableval="$enable_odcombobox" + + 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 + # Check whether --enable-colourpicker or --disable-colourpicker was given. +if test "${enable_colourpicker+set}" = set; then + enableval="$enable_colourpicker" if test "$enableval" = yes; then - ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes' + wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes' else - ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no' + wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_ODCOMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX='$DEFAULT_wxUSE_ODCOMBOBOX + wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}" fi; - eval "$ac_cv_use_odcombobox" - if test "$no_cache" != 1; then - echo $ac_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_colourpicker" + if test "x$cache" = xyes; then + echo "wxUSE_COLOURPICKERCTRL=$wxUSE_COLOURPICKERCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobox" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-radiobox or --disable-radiobox was given. -if test "${enable_radiobox+set}" = set; then - enableval="$enable_radiobox" + + 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 + # Check whether --enable-combobox or --disable-combobox was given. +if test "${enable_combobox+set}" = set; then + enableval="$enable_combobox" if test "$enableval" = yes; then - ac_cv_use_radiobox='wxUSE_RADIOBOX=yes' + wx_cv_use_combobox='wxUSE_COMBOBOX=yes' else - ac_cv_use_radiobox='wxUSE_RADIOBOX=no' + wx_cv_use_combobox='wxUSE_COMBOBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX + wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}" fi; - eval "$ac_cv_use_radiobox" - if test "$no_cache" != 1; then - echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_combobox" + if test "x$cache" = xyes; then + echo "wxUSE_COMBOBOX=$wxUSE_COMBOBOX" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobtn" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-radiobtn or --disable-radiobtn was given. -if test "${enable_radiobtn+set}" = set; then - enableval="$enable_radiobtn" + + 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 + # Check whether --enable-comboctrl or --disable-comboctrl was given. +if test "${enable_comboctrl+set}" = set; then + enableval="$enable_comboctrl" if test "$enableval" = yes; then - ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes' + wx_cv_use_comboctrl='wxUSE_COMBOCTRL=yes' else - ac_cv_use_radiobtn='wxUSE_RADIOBTN=no' + wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN + wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}" fi; - eval "$ac_cv_use_radiobtn" - if test "$no_cache" != 1; then - echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_comboctrl" + if test "x$cache" = xyes; then + echo "wxUSE_COMBOCTRL=$wxUSE_COMBOCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sash" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-sash or --disable-sash was given. -if test "${enable_sash+set}" = set; then - enableval="$enable_sash" + + 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 + # Check whether --enable-datepick or --disable-datepick was given. +if test "${enable_datepick+set}" = set; then + enableval="$enable_datepick" if test "$enableval" = yes; then - ac_cv_use_sash='wxUSE_SASH=yes' + wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes' else - ac_cv_use_sash='wxUSE_SASH=no' + wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH + wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" fi; - eval "$ac_cv_use_sash" - if test "$no_cache" != 1; then - echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_datepick" + if test "x$cache" = xyes; then + echo "wxUSE_DATEPICKCTRL=$wxUSE_DATEPICKCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-scrollbar" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-scrollbar or --disable-scrollbar was given. -if test "${enable_scrollbar+set}" = set; then - enableval="$enable_scrollbar" + + 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 + # Check whether --enable-dirpicker or --disable-dirpicker was given. +if test "${enable_dirpicker+set}" = set; then + enableval="$enable_dirpicker" if test "$enableval" = yes; then - ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes' + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes' else - ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no' + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" fi; - eval "$ac_cv_use_scrollbar" - if test "$no_cache" != 1; then - echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dirpicker" + if test "x$cache" = xyes; then + echo "wxUSE_DIRPICKERCTRL=$wxUSE_DIRPICKERCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-slider or --disable-slider was given. -if test "${enable_slider+set}" = set; then - enableval="$enable_slider" + + 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 + # Check whether --enable-display or --disable-display was given. +if test "${enable_display+set}" = set; then + enableval="$enable_display" if test "$enableval" = yes; then - ac_cv_use_slider='wxUSE_SLIDER=yes' + wx_cv_use_display='wxUSE_DISPLAY=yes' else - ac_cv_use_slider='wxUSE_SLIDER=no' + wx_cv_use_display='wxUSE_DISPLAY=no' fi + cache=yes else - LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER + wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" fi; - eval "$ac_cv_use_slider" - if test "$no_cache" != 1; then - echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_display" + if test "x$cache" = xyes; then + echo "wxUSE_DISPLAY=$wxUSE_DISPLAY" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinbtn" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-spinbtn or --disable-spinbtn was given. -if test "${enable_spinbtn+set}" = set; then - enableval="$enable_spinbtn" + + 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 + # Check whether --enable-detect_sm or --disable-detect_sm was given. +if test "${enable_detect_sm+set}" = set; then + enableval="$enable_detect_sm" if test "$enableval" = yes; then - ac_cv_use_spinbtn='wxUSE_SPINBTN=yes' + wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes' else - ac_cv_use_spinbtn='wxUSE_SPINBTN=no' + wx_cv_use_detect_sm='wxUSE_DETECT_SM=no' fi + cache=yes else - LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN + wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" fi; - eval "$ac_cv_use_spinbtn" - if test "$no_cache" != 1; then - echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_detect_sm" + if test "x$cache" = xyes; then + echo "wxUSE_DETECT_SM=$wxUSE_DETECT_SM" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinctrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-spinctrl or --disable-spinctrl was given. -if test "${enable_spinctrl+set}" = set; then - enableval="$enable_spinctrl" + + 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 + # 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_spinctrl='wxUSE_SPINCTRL=yes' + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes' else - ac_cv_use_spinctrl='wxUSE_SPINCTRL=no' + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" fi; - eval "$ac_cv_use_spinctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_editablebox" + if test "x$cache" = xyes; then + echo "wxUSE_EDITABLELISTBOX=$wxUSE_EDITABLELISTBOX" >> ${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_EDITABLELISTBOX = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_EDITABLELISTBOX fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splitter" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-splitter or --disable-splitter was given. -if test "${enable_splitter+set}" = set; then - enableval="$enable_splitter" + + 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 + # Check whether --enable-filepicker or --disable-filepicker was given. +if test "${enable_filepicker+set}" = set; then + enableval="$enable_filepicker" if test "$enableval" = yes; then - ac_cv_use_splitter='wxUSE_SPLITTER=yes' + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes' else - ac_cv_use_splitter='wxUSE_SPLITTER=no' + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" fi; - eval "$ac_cv_use_splitter" - if test "$no_cache" != 1; then - echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_filepicker" + if test "x$cache" = xyes; then + echo "wxUSE_FILEPICKERCTRL=$wxUSE_FILEPICKERCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbmp" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-statbmp or --disable-statbmp was given. -if test "${enable_statbmp+set}" = set; then - enableval="$enable_statbmp" + + 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 + # Check whether --enable-fontpicker or --disable-fontpicker was given. +if test "${enable_fontpicker+set}" = set; then + enableval="$enable_fontpicker" if test "$enableval" = yes; then - ac_cv_use_statbmp='wxUSE_STATBMP=yes' + wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes' else - ac_cv_use_statbmp='wxUSE_STATBMP=no' + wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP + wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}" fi; - eval "$ac_cv_use_statbmp" - if test "$no_cache" != 1; then - echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fontpicker" + if test "x$cache" = xyes; then + echo "wxUSE_FONTPICKERCTRL=$wxUSE_FONTPICKERCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbox" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-statbox or --disable-statbox was given. -if test "${enable_statbox+set}" = set; then - enableval="$enable_statbox" + + 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 + # Check whether --enable-gauge or --disable-gauge was given. +if test "${enable_gauge+set}" = set; then + enableval="$enable_gauge" if test "$enableval" = yes; then - ac_cv_use_statbox='wxUSE_STATBOX=yes' + wx_cv_use_gauge='wxUSE_GAUGE=yes' else - ac_cv_use_statbox='wxUSE_STATBOX=no' + wx_cv_use_gauge='wxUSE_GAUGE=no' fi + cache=yes else - LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX + wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}" fi; - eval "$ac_cv_use_statbox" - if test "$no_cache" != 1; then - echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gauge" + if test "x$cache" = xyes; then + echo "wxUSE_GAUGE=$wxUSE_GAUGE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statline" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-statline or --disable-statline was given. -if test "${enable_statline+set}" = set; then - enableval="$enable_statline" + + 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 + # Check whether --enable-grid or --disable-grid was given. +if test "${enable_grid+set}" = set; then + enableval="$enable_grid" if test "$enableval" = yes; then - ac_cv_use_statline='wxUSE_STATLINE=yes' + wx_cv_use_grid='wxUSE_GRID=yes' else - ac_cv_use_statline='wxUSE_STATLINE=no' + wx_cv_use_grid='wxUSE_GRID=no' fi + cache=yes else - LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE + wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}" fi; - eval "$ac_cv_use_statline" - if test "$no_cache" != 1; then - echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_grid" + if test "x$cache" = xyes; then + echo "wxUSE_GRID=$wxUSE_GRID" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stattext" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-stattext or --disable-stattext was given. -if test "${enable_stattext+set}" = set; then - enableval="$enable_stattext" + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6 + # Check whether --enable-dataviewctrl or --disable-dataviewctrl was given. +if test "${enable_dataviewctrl+set}" = set; then + enableval="$enable_dataviewctrl" if test "$enableval" = yes; then - ac_cv_use_stattext='wxUSE_STATTEXT=yes' + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' else - ac_cv_use_stattext='wxUSE_STATTEXT=no' + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" fi; - eval "$ac_cv_use_stattext" - if test "$no_cache" != 1; then - echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dataviewctrl" + if test "x$cache" = xyes; then + echo "wxUSE_DATAVIEWCTRL=$wxUSE_DATAVIEWCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statusbar" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-statusbar or --disable-statusbar was given. -if test "${enable_statusbar+set}" = set; then - enableval="$enable_statusbar" + + 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 + # Check whether --enable-hyperlink or --disable-hyperlink was given. +if test "${enable_hyperlink+set}" = set; then + enableval="$enable_hyperlink" if test "$enableval" = yes; then - ac_cv_use_statusbar='wxUSE_STATUSBAR=yes' + wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes' else - ac_cv_use_statusbar='wxUSE_STATUSBAR=no' + wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR + wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}" fi; - eval "$ac_cv_use_statusbar" - if test "$no_cache" != 1; then - echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_hyperlink" + if test "x$cache" = xyes; then + echo "wxUSE_HYPERLINKCTRL=$wxUSE_HYPERLINKCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tabdialog" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-tabdialog or --disable-tabdialog was given. -if test "${enable_tabdialog+set}" = set; then - enableval="$enable_tabdialog" + + 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 + # Check whether --enable-imaglist or --disable-imaglist was given. +if test "${enable_imaglist+set}" = set; then + enableval="$enable_imaglist" if test "$enableval" = yes; then - ac_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes' + wx_cv_use_imaglist='wxUSE_IMAGLIST=yes' else - ac_cv_use_tabdialog='wxUSE_TAB_DIALOG=no' + wx_cv_use_imaglist='wxUSE_IMAGLIST=no' fi + cache=yes else - LINE=`grep "wxUSE_TAB_DIALOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tabdialog='wxUSE_TAB_DIALOG='$DEFAULT_wxUSE_TAB_DIALOG + wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}" fi; - eval "$ac_cv_use_tabdialog" - if test "$no_cache" != 1; then - echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_imaglist" + if test "x$cache" = xyes; then + echo "wxUSE_IMAGLIST=$wxUSE_IMAGLIST" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-textctrl or --disable-textctrl was given. -if test "${enable_textctrl+set}" = set; then - enableval="$enable_textctrl" + + 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 + # Check whether --enable-listbook or --disable-listbook was given. +if test "${enable_listbook+set}" = set; then + enableval="$enable_listbook" if test "$enableval" = yes; then - ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes' + wx_cv_use_listbook='wxUSE_LISTBOOK=yes' else - ac_cv_use_textctrl='wxUSE_TEXTCTRL=no' + wx_cv_use_listbook='wxUSE_LISTBOOK=no' fi + cache=yes else - LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL + wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}" fi; - eval "$ac_cv_use_textctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_listbook" + if test "x$cache" = xyes; then + echo "wxUSE_LISTBOOK=$wxUSE_LISTBOOK" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-togglebtn or --disable-togglebtn was given. -if test "${enable_togglebtn+set}" = set; then - enableval="$enable_togglebtn" + + 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 + # Check whether --enable-listbox or --disable-listbox was given. +if test "${enable_listbox+set}" = set; then + enableval="$enable_listbox" if test "$enableval" = yes; then - ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' + wx_cv_use_listbox='wxUSE_LISTBOX=yes' else - ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' + wx_cv_use_listbox='wxUSE_LISTBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN + wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}" fi; - eval "$ac_cv_use_togglebtn" - if test "$no_cache" != 1; then - echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_listbox" + if test "x$cache" = xyes; then + echo "wxUSE_LISTBOX=$wxUSE_LISTBOX" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-toolbar or --disable-toolbar was given. -if test "${enable_toolbar+set}" = set; then - enableval="$enable_toolbar" + + 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 + # Check whether --enable-listctrl or --disable-listctrl was given. +if test "${enable_listctrl+set}" = set; then + enableval="$enable_listctrl" if test "$enableval" = yes; then - ac_cv_use_toolbar='wxUSE_TOOLBAR=yes' + wx_cv_use_listctrl='wxUSE_LISTCTRL=yes' else - ac_cv_use_toolbar='wxUSE_TOOLBAR=no' + wx_cv_use_listctrl='wxUSE_LISTCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR + wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}" fi; - eval "$ac_cv_use_toolbar" - if test "$no_cache" != 1; then - echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_listctrl" + if test "x$cache" = xyes; then + echo "wxUSE_LISTCTRL=$wxUSE_LISTCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-tbarnative or --disable-tbarnative was given. -if test "${enable_tbarnative+set}" = set; then - enableval="$enable_tbarnative" + + 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 + # Check whether --enable-notebook or --disable-notebook was given. +if test "${enable_notebook+set}" = set; then + enableval="$enable_notebook" if test "$enableval" = yes; then - ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' + wx_cv_use_notebook='wxUSE_NOTEBOOK=yes' else - ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' + wx_cv_use_notebook='wxUSE_NOTEBOOK=no' fi + cache=yes else - LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE + wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}" fi; - eval "$ac_cv_use_tbarnative" - if test "$no_cache" != 1; then - echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_notebook" + if test "x$cache" = xyes; then + echo "wxUSE_NOTEBOOK=$wxUSE_NOTEBOOK" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-treebook or --disable-treebook was given. -if test "${enable_treebook+set}" = set; then - enableval="$enable_treebook" + + 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 + # Check whether --enable-odcombobox or --disable-odcombobox was given. +if test "${enable_odcombobox+set}" = set; then + enableval="$enable_odcombobox" if test "$enableval" = yes; then - ac_cv_use_treebook='wxUSE_TREEBOOK=yes' + wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes' else - ac_cv_use_treebook='wxUSE_TREEBOOK=no' + wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_TREEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_treebook='wxUSE_TREEBOOK='$DEFAULT_wxUSE_TREEBOOK + wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}" fi; - eval "$ac_cv_use_treebook" - if test "$no_cache" != 1; then - echo $ac_cv_use_treebook >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_odcombobox" + if test "x$cache" = xyes; then + echo "wxUSE_ODCOMBOBOX=$wxUSE_ODCOMBOBOX" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbook" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-toolbook or --disable-toolbook was given. -if test "${enable_toolbook+set}" = set; then - enableval="$enable_toolbook" + + 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 + # Check whether --enable-radiobox or --disable-radiobox was given. +if test "${enable_radiobox+set}" = set; then + enableval="$enable_radiobox" if test "$enableval" = yes; then - ac_cv_use_toolbook='wxUSE_TOOLBOOK=yes' + wx_cv_use_radiobox='wxUSE_RADIOBOX=yes' else - ac_cv_use_toolbook='wxUSE_TOOLBOOK=no' + wx_cv_use_radiobox='wxUSE_RADIOBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_TOOLBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_toolbook='wxUSE_TOOLBOOK='$DEFAULT_wxUSE_TOOLBOOK + wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}" fi; - eval "$ac_cv_use_toolbook" - if test "$no_cache" != 1; then - echo $ac_cv_use_toolbook >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_radiobox" + if test "x$cache" = xyes; then + echo "wxUSE_RADIOBOX=$wxUSE_RADIOBOX" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-treectrl or --disable-treectrl was given. -if test "${enable_treectrl+set}" = set; then - enableval="$enable_treectrl" + + 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 + # Check whether --enable-radiobtn or --disable-radiobtn was given. +if test "${enable_radiobtn+set}" = set; then + enableval="$enable_radiobtn" if test "$enableval" = yes; then - ac_cv_use_treectrl='wxUSE_TREECTRL=yes' + wx_cv_use_radiobtn='wxUSE_RADIOBTN=yes' else - ac_cv_use_treectrl='wxUSE_TREECTRL=no' + wx_cv_use_radiobtn='wxUSE_RADIOBTN=no' fi + cache=yes else - LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL + wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}" fi; - eval "$ac_cv_use_treectrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_radiobtn" + if test "x$cache" = xyes; then + echo "wxUSE_RADIOBTN=$wxUSE_RADIOBTN" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-tipwindow or --disable-tipwindow was given. -if test "${enable_tipwindow+set}" = set; then - enableval="$enable_tipwindow" + + 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 + # Check whether --enable-sash or --disable-sash was given. +if test "${enable_sash+set}" = set; then + enableval="$enable_sash" if test "$enableval" = yes; then - ac_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' + wx_cv_use_sash='wxUSE_SASH=yes' else - ac_cv_use_tipwindow='wxUSE_TIPWINDOW=no' + wx_cv_use_sash='wxUSE_SASH=no' fi + cache=yes else - LINE=`grep "wxUSE_TIPWINDOW" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tipwindow='wxUSE_TIPWINDOW='$DEFAULT_wxUSE_TIPWINDOW + wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}" fi; - eval "$ac_cv_use_tipwindow" - if test "$no_cache" != 1; then - echo $ac_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_sash" + if test "x$cache" = xyes; then + echo "wxUSE_SASH=$wxUSE_SASH" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-popupwin or --disable-popupwin was given. -if test "${enable_popupwin+set}" = set; then - enableval="$enable_popupwin" + + 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 + # Check whether --enable-scrollbar or --disable-scrollbar was given. +if test "${enable_scrollbar+set}" = set; then + enableval="$enable_scrollbar" if test "$enableval" = yes; then - ac_cv_use_popupwin='wxUSE_POPUPWIN=yes' + wx_cv_use_scrollbar='wxUSE_SCROLLBAR=yes' else - ac_cv_use_popupwin='wxUSE_POPUPWIN=no' + wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no' fi + cache=yes else - LINE=`grep "wxUSE_POPUPWIN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN + wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}" fi; - eval "$ac_cv_use_popupwin" - if test "$no_cache" != 1; then - echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_scrollbar" + if test "x$cache" = xyes; then + echo "wxUSE_SCROLLBAR=$wxUSE_SCROLLBAR" >> ${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_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 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commondlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-commondlg or --disable-commondlg was given. -if test "${enable_commondlg+set}" = set; then - enableval="$enable_commondlg" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6 + # 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_commondlg='wxUSE_COMMONDLGS=yes' + wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes' else - ac_cv_use_commondlg='wxUSE_COMMONDLGS=no' + wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS + wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}" fi; - eval "$ac_cv_use_commondlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_searchctrl" + if test "x$cache" = xyes; then + echo "wxUSE_SEARCHCTRL=$wxUSE_SEARCHCTRL" >> ${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_SEARCHCTRL = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_SEARCHCTRL fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aboutdlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-aboutdlg or --disable-aboutdlg was given. -if test "${enable_aboutdlg+set}" = set; then - enableval="$enable_aboutdlg" + + 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 + # Check whether --enable-slider or --disable-slider was given. +if test "${enable_slider+set}" = set; then + enableval="$enable_slider" if test "$enableval" = yes; then - ac_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes' + wx_cv_use_slider='wxUSE_SLIDER=yes' else - ac_cv_use_aboutdlg='wxUSE_ABOUTDLG=no' + wx_cv_use_slider='wxUSE_SLIDER=no' fi + cache=yes else - LINE=`grep "wxUSE_ABOUTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_aboutdlg='wxUSE_ABOUTDLG='$DEFAULT_wxUSE_ABOUTDLG + wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}" fi; - eval "$ac_cv_use_aboutdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_slider" + if test "x$cache" = xyes; then + echo "wxUSE_SLIDER=$wxUSE_SLIDER" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicedlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-choicedlg or --disable-choicedlg was given. -if test "${enable_choicedlg+set}" = set; then - enableval="$enable_choicedlg" + + 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 + # Check whether --enable-spinbtn or --disable-spinbtn was given. +if test "${enable_spinbtn+set}" = set; then + enableval="$enable_spinbtn" if test "$enableval" = yes; then - ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes' + wx_cv_use_spinbtn='wxUSE_SPINBTN=yes' else - ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no' + wx_cv_use_spinbtn='wxUSE_SPINBTN=no' fi + cache=yes else - LINE=`grep "wxUSE_CHOICEDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG + wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}" fi; - eval "$ac_cv_use_choicedlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_spinbtn" + if test "x$cache" = xyes; then + echo "wxUSE_SPINBTN=$wxUSE_SPINBTN" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-coldlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-coldlg or --disable-coldlg was given. -if test "${enable_coldlg+set}" = set; then - enableval="$enable_coldlg" + + 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 + # Check whether --enable-spinctrl or --disable-spinctrl was given. +if test "${enable_spinctrl+set}" = set; then + enableval="$enable_spinctrl" if test "$enableval" = yes; then - ac_cv_use_coldlg='wxUSE_COLOURDLG=yes' + wx_cv_use_spinctrl='wxUSE_SPINCTRL=yes' else - ac_cv_use_coldlg='wxUSE_COLOURDLG=no' + wx_cv_use_spinctrl='wxUSE_SPINCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG + wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}" fi; - eval "$ac_cv_use_coldlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_spinctrl" + if test "x$cache" = xyes; then + echo "wxUSE_SPINCTRL=$wxUSE_SPINCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filedlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-filedlg or --disable-filedlg was given. -if test "${enable_filedlg+set}" = set; then - enableval="$enable_filedlg" + + 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 + # Check whether --enable-splitter or --disable-splitter was given. +if test "${enable_splitter+set}" = set; then + enableval="$enable_splitter" if test "$enableval" = yes; then - ac_cv_use_filedlg='wxUSE_FILEDLG=yes' + wx_cv_use_splitter='wxUSE_SPLITTER=yes' else - ac_cv_use_filedlg='wxUSE_FILEDLG=no' + wx_cv_use_splitter='wxUSE_SPLITTER=no' fi + cache=yes else - LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG + wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}" fi; - eval "$ac_cv_use_filedlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_splitter" + if test "x$cache" = xyes; then + echo "wxUSE_SPLITTER=$wxUSE_SPLITTER" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-finddlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-finddlg or --disable-finddlg was given. -if test "${enable_finddlg+set}" = set; then - enableval="$enable_finddlg" + + 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 + # Check whether --enable-statbmp or --disable-statbmp was given. +if test "${enable_statbmp+set}" = set; then + enableval="$enable_statbmp" if test "$enableval" = yes; then - ac_cv_use_finddlg='wxUSE_FINDREPLDLG=yes' + wx_cv_use_statbmp='wxUSE_STATBMP=yes' else - ac_cv_use_finddlg='wxUSE_FINDREPLDLG=no' + wx_cv_use_statbmp='wxUSE_STATBMP=no' fi + cache=yes else - LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_finddlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG + wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}" fi; - eval "$ac_cv_use_finddlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_finddlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_statbmp" + if test "x$cache" = xyes; then + echo "wxUSE_STATBMP=$wxUSE_STATBMP" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontdlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-fontdlg or --disable-fontdlg was given. -if test "${enable_fontdlg+set}" = set; then - enableval="$enable_fontdlg" + + 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 + # Check whether --enable-statbox or --disable-statbox was given. +if test "${enable_statbox+set}" = set; then + enableval="$enable_statbox" if test "$enableval" = yes; then - ac_cv_use_fontdlg='wxUSE_FONTDLG=yes' + wx_cv_use_statbox='wxUSE_STATBOX=yes' else - ac_cv_use_fontdlg='wxUSE_FONTDLG=no' + wx_cv_use_statbox='wxUSE_STATBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG + wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}" fi; - eval "$ac_cv_use_fontdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_statbox" + if test "x$cache" = xyes; then + echo "wxUSE_STATBOX=$wxUSE_STATBOX" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirdlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dirdlg or --disable-dirdlg was given. -if test "${enable_dirdlg+set}" = set; then - enableval="$enable_dirdlg" + + 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 + # Check whether --enable-statline or --disable-statline was given. +if test "${enable_statline+set}" = set; then + enableval="$enable_statline" if test "$enableval" = yes; then - ac_cv_use_dirdlg='wxUSE_DIRDLG=yes' + wx_cv_use_statline='wxUSE_STATLINE=yes' else - ac_cv_use_dirdlg='wxUSE_DIRDLG=no' + wx_cv_use_statline='wxUSE_STATLINE=no' fi + cache=yes else - LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG + wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}" fi; - eval "$ac_cv_use_dirdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_statline" + if test "x$cache" = xyes; then + echo "wxUSE_STATLINE=$wxUSE_STATLINE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-msgdlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-msgdlg or --disable-msgdlg was given. -if test "${enable_msgdlg+set}" = set; then - enableval="$enable_msgdlg" + + 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 + # Check whether --enable-stattext or --disable-stattext was given. +if test "${enable_stattext+set}" = set; then + enableval="$enable_stattext" if test "$enableval" = yes; then - ac_cv_use_msgdlg='wxUSE_MSGDLG=yes' + wx_cv_use_stattext='wxUSE_STATTEXT=yes' else - ac_cv_use_msgdlg='wxUSE_MSGDLG=no' + wx_cv_use_stattext='wxUSE_STATTEXT=no' fi + cache=yes else - LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG + wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}" fi; - eval "$ac_cv_use_msgdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_stattext" + if test "x$cache" = xyes; then + echo "wxUSE_STATTEXT=$wxUSE_STATTEXT" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-numberdlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-numberdlg or --disable-numberdlg was given. -if test "${enable_numberdlg+set}" = set; then - enableval="$enable_numberdlg" + + 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 + # Check whether --enable-statusbar or --disable-statusbar was given. +if test "${enable_statusbar+set}" = set; then + enableval="$enable_statusbar" if test "$enableval" = yes; then - ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes' + wx_cv_use_statusbar='wxUSE_STATUSBAR=yes' else - ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no' + wx_cv_use_statusbar='wxUSE_STATUSBAR=no' fi + cache=yes else - LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG + wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}" fi; - eval "$ac_cv_use_numberdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_statusbar" + if test "x$cache" = xyes; then + echo "wxUSE_STATUSBAR=$wxUSE_STATUSBAR" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splash" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-splash or --disable-splash was given. -if test "${enable_splash+set}" = set; then - enableval="$enable_splash" + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tabdialog" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6 + # Check whether --enable-tabdialog or --disable-tabdialog was given. +if test "${enable_tabdialog+set}" = set; then + enableval="$enable_tabdialog" if test "$enableval" = yes; then - ac_cv_use_splash='wxUSE_SPLASH=yes' + wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes' else - ac_cv_use_splash='wxUSE_SPLASH=no' + wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no' fi + cache=yes else - LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH + wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}" fi; - eval "$ac_cv_use_splash" - if test "$no_cache" != 1; then - echo $ac_cv_use_splash >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tabdialog" + if test "x$cache" = xyes; then + echo "wxUSE_TAB_DIALOG=$wxUSE_TAB_DIALOG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textdlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-textdlg or --disable-textdlg was given. -if test "${enable_textdlg+set}" = set; then - enableval="$enable_textdlg" + + 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}-taskbaricon" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6 + # Check whether --enable-taskbaricon or --disable-taskbaricon was given. +if test "${enable_taskbaricon+set}" = set; then + enableval="$enable_taskbaricon" if test "$enableval" = yes; then - ac_cv_use_textdlg='wxUSE_TEXTDLG=yes' + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes' else - ac_cv_use_textdlg='wxUSE_TEXTDLG=no' + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no' fi + cache=yes else - LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}" fi; - eval "$ac_cv_use_textdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_taskbaricon" + if test "x$cache" = xyes; then + echo "wxUSE_TASKBARICON=$wxUSE_TASKBARICON" >> ${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_TASKBARICON = yes; then + result=no + else + result=yes + fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + result=$wxUSE_TASKBARICON fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipdlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-tipdlg or --disable-tipdlg was given. -if test "${enable_tipdlg+set}" = set; then - enableval="$enable_tipdlg" + + 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 + # Check whether --enable-textctrl or --disable-textctrl was given. +if test "${enable_textctrl+set}" = set; then + enableval="$enable_textctrl" if test "$enableval" = yes; then - ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes' + wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes' else - ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' + wx_cv_use_textctrl='wxUSE_TEXTCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS + wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" fi; - eval "$ac_cv_use_tipdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_textctrl" + if test "x$cache" = xyes; then + echo "wxUSE_TEXTCTRL=$wxUSE_TEXTCTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-progressdlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-progressdlg or --disable-progressdlg was given. -if test "${enable_progressdlg+set}" = set; then - enableval="$enable_progressdlg" + + 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 + # Check whether --enable-togglebtn or --disable-togglebtn was given. +if test "${enable_togglebtn+set}" = set; then + enableval="$enable_togglebtn" if test "$enableval" = yes; then - ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes' + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' else - ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' fi + cache=yes else - LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" fi; - eval "$ac_cv_use_progressdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_togglebtn" + if test "x$cache" = xyes; then + echo "wxUSE_TOGGLEBTN=$wxUSE_TOGGLEBTN" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wizarddlg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-wizarddlg or --disable-wizarddlg was given. -if test "${enable_wizarddlg+set}" = set; then - enableval="$enable_wizarddlg" + + 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 + # Check whether --enable-toolbar or --disable-toolbar was given. +if test "${enable_toolbar+set}" = set; then + enableval="$enable_toolbar" if test "$enableval" = yes; then - ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes' + wx_cv_use_toolbar='wxUSE_TOOLBAR=yes' else - ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' + wx_cv_use_toolbar='wxUSE_TOOLBAR=no' fi + cache=yes else - LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG + wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" fi; - eval "$ac_cv_use_wizarddlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_toolbar" + if test "x$cache" = xyes; then + echo "wxUSE_TOOLBAR=$wxUSE_TOOLBAR" >> ${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_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 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-menus" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-menus or --disable-menus was given. -if test "${enable_menus+set}" = set; then - enableval="$enable_menus" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6 + # Check whether --enable-tbarnative or --disable-tbarnative was given. +if test "${enable_tbarnative+set}" = set; then + enableval="$enable_tbarnative" if test "$enableval" = yes; then - ac_cv_use_menus='wxUSE_MENUS=yes' + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' else - ac_cv_use_menus='wxUSE_MENUS=no' + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' fi + cache=yes else - LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" fi; - eval "$ac_cv_use_menus" - if test "$no_cache" != 1; then - echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tbarnative" + if test "x$cache" = xyes; then + echo "wxUSE_TOOLBAR_NATIVE=$wxUSE_TOOLBAR_NATIVE" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-miniframe" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-miniframe or --disable-miniframe was given. -if test "${enable_miniframe+set}" = set; then - enableval="$enable_miniframe" + + 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 + # Check whether --enable-treebook or --disable-treebook was given. +if test "${enable_treebook+set}" = set; then + enableval="$enable_treebook" if test "$enableval" = yes; then - ac_cv_use_miniframe='wxUSE_MINIFRAME=yes' + wx_cv_use_treebook='wxUSE_TREEBOOK=yes' else - ac_cv_use_miniframe='wxUSE_MINIFRAME=no' + wx_cv_use_treebook='wxUSE_TREEBOOK=no' fi + cache=yes else - LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME + wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" fi; - eval "$ac_cv_use_miniframe" - if test "$no_cache" != 1; then - echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_treebook" + if test "x$cache" = xyes; then + echo "wxUSE_TREEBOOK=$wxUSE_TREEBOOK" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tooltips" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-tooltips or --disable-tooltips was given. -if test "${enable_tooltips+set}" = set; then - enableval="$enable_tooltips" + + 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 + # Check whether --enable-toolbook or --disable-toolbook was given. +if test "${enable_toolbook+set}" = set; then + enableval="$enable_toolbook" if test "$enableval" = yes; then - ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes' + wx_cv_use_toolbook='wxUSE_TOOLBOOK=yes' else - ac_cv_use_tooltips='wxUSE_TOOLTIPS=no' + wx_cv_use_toolbook='wxUSE_TOOLBOOK=no' fi + cache=yes else - LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS + wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}" fi; - eval "$ac_cv_use_tooltips" - if test "$no_cache" != 1; then - echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_toolbook" + if test "x$cache" = xyes; then + echo "wxUSE_TOOLBOOK=$wxUSE_TOOLBOOK" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splines" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-splines or --disable-splines was given. -if test "${enable_splines+set}" = set; then - enableval="$enable_splines" + + 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 + # Check whether --enable-treectrl or --disable-treectrl was given. +if test "${enable_treectrl+set}" = set; then + enableval="$enable_treectrl" if test "$enableval" = yes; then - ac_cv_use_splines='wxUSE_SPLINES=yes' + wx_cv_use_treectrl='wxUSE_TREECTRL=yes' else - ac_cv_use_splines='wxUSE_SPLINES=no' + wx_cv_use_treectrl='wxUSE_TREECTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES + wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" fi; - eval "$ac_cv_use_splines" - if test "$no_cache" != 1; then - echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_treectrl" + if test "x$cache" = xyes; then + echo "wxUSE_TREECTRL=$wxUSE_TREECTRL" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-mousewheel or --disable-mousewheel was given. -if test "${enable_mousewheel+set}" = set; then - enableval="$enable_mousewheel" + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6 + # Check whether --enable-tipwindow or --disable-tipwindow was given. +if test "${enable_tipwindow+set}" = set; then + enableval="$enable_tipwindow" if test "$enableval" = yes; then - ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes' + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' else - ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no' + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' fi + cache=yes else - LINE=`grep "wxUSE_MOUSEWHEEL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL='$DEFAULT_wxUSE_MOUSEWHEEL + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" fi; - eval "$ac_cv_use_mousewheel" - if test "$no_cache" != 1; then - echo $ac_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tipwindow" + if test "x$cache" = xyes; then + echo "wxUSE_TIPWINDOW=$wxUSE_TIPWINDOW" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-validators or --disable-validators was given. -if test "${enable_validators+set}" = set; then - enableval="$enable_validators" + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6 + # Check whether --enable-popupwin or --disable-popupwin was given. +if test "${enable_popupwin+set}" = set; then + enableval="$enable_popupwin" if test "$enableval" = yes; then - ac_cv_use_validators='wxUSE_VALIDATORS=yes' + wx_cv_use_popupwin='wxUSE_POPUPWIN=yes' else - ac_cv_use_validators='wxUSE_VALIDATORS=no' + wx_cv_use_popupwin='wxUSE_POPUPWIN=no' fi + cache=yes else - LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS + wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" fi; - eval "$ac_cv_use_validators" - if test "$no_cache" != 1; then - echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_popupwin" + if test "x$cache" = xyes; then + echo "wxUSE_POPUPWIN=$wxUSE_POPUPWIN" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-busyinfo" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-busyinfo or --disable-busyinfo was given. -if test "${enable_busyinfo+set}" = set; then - enableval="$enable_busyinfo" + + + + 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 + # Check whether --enable-commondlg or --disable-commondlg was given. +if test "${enable_commondlg+set}" = set; then + enableval="$enable_commondlg" if test "$enableval" = yes; then - ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes' + wx_cv_use_commondlg='wxUSE_COMMONDLGS=yes' else - ac_cv_use_busyinfo='wxUSE_BUSYINFO=no' + wx_cv_use_commondlg='wxUSE_COMMONDLGS=no' fi + cache=yes else - LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO + wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}" fi; - eval "$ac_cv_use_busyinfo" - if test "$no_cache" != 1; then - echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_commondlg" + if test "x$cache" = xyes; then + echo "wxUSE_COMMONDLGS=$wxUSE_COMMONDLGS" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-joystick" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-joystick or --disable-joystick was given. -if test "${enable_joystick+set}" = set; then - enableval="$enable_joystick" + + 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 + # Check whether --enable-aboutdlg or --disable-aboutdlg was given. +if test "${enable_aboutdlg+set}" = set; then + enableval="$enable_aboutdlg" if test "$enableval" = yes; then - ac_cv_use_joystick='wxUSE_JOYSTICK=yes' + wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes' else - ac_cv_use_joystick='wxUSE_JOYSTICK=no' + wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK + wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}" fi; - eval "$ac_cv_use_joystick" - if test "$no_cache" != 1; then - echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_aboutdlg" + if test "x$cache" = xyes; then + echo "wxUSE_ABOUTDLG=$wxUSE_ABOUTDLG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-metafile or --disable-metafile was given. -if test "${enable_metafile+set}" = set; then - enableval="$enable_metafile" + + 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 + # Check whether --enable-choicedlg or --disable-choicedlg was given. +if test "${enable_choicedlg+set}" = set; then + enableval="$enable_choicedlg" if test "$enableval" = yes; then - ac_cv_use_metafile='wxUSE_METAFILE=yes' + wx_cv_use_choicedlg='wxUSE_CHOICEDLG=yes' else - ac_cv_use_metafile='wxUSE_METAFILE=no' + wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE + wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}" fi; - eval "$ac_cv_use_metafile" - if test "$no_cache" != 1; then - echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_choicedlg" + if test "x$cache" = xyes; then + echo "wxUSE_CHOICEDLG=$wxUSE_CHOICEDLG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dragimage" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dragimage or --disable-dragimage was given. -if test "${enable_dragimage+set}" = set; then - enableval="$enable_dragimage" + + 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 + # Check whether --enable-coldlg or --disable-coldlg was given. +if test "${enable_coldlg+set}" = set; then + enableval="$enable_coldlg" if test "$enableval" = yes; then - ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes' + wx_cv_use_coldlg='wxUSE_COLOURDLG=yes' else - ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no' + wx_cv_use_coldlg='wxUSE_COLOURDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE + wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}" fi; - eval "$ac_cv_use_dragimage" - if test "$no_cache" != 1; then - echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_coldlg" + if test "x$cache" = xyes; then + echo "wxUSE_COLOURDLG=$wxUSE_COLOURDLG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accessibility" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-accessibility or --disable-accessibility was given. -if test "${enable_accessibility+set}" = set; then - enableval="$enable_accessibility" + + 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 + # Check whether --enable-filedlg or --disable-filedlg was given. +if test "${enable_filedlg+set}" = set; then + enableval="$enable_filedlg" if test "$enableval" = yes; then - ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes' + wx_cv_use_filedlg='wxUSE_FILEDLG=yes' else - ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=no' + wx_cv_use_filedlg='wxUSE_FILEDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_ACCESSIBILITY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_accessibility='wxUSE_ACCESSIBILITY='$DEFAULT_wxUSE_ACCESSIBILITY + wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}" fi; - eval "$ac_cv_use_accessibility" - if test "$no_cache" != 1; then - echo $ac_cv_use_accessibility >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_filedlg" + if test "x$cache" = xyes; then + echo "wxUSE_FILEDLG=$wxUSE_FILEDLG" >> ${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_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 -if test "$wxUSE_MSW" = "1"; then - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dccache" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dccache or --disable-dccache was given. -if test "${enable_dccache+set}" = set; then - enableval="$enable_dccache" + 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 + # Check whether --enable-finddlg or --disable-finddlg was given. +if test "${enable_finddlg+set}" = set; then + enableval="$enable_finddlg" if test "$enableval" = yes; then - ac_cv_use_dccache='wxUSE_DC_CACHEING=yes' + wx_cv_use_finddlg='wxUSE_FINDREPLDLG=yes' else - ac_cv_use_dccache='wxUSE_DC_CACHEING=no' + wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_DC_CACHEING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dccache='wxUSE_DC_CACHEING='$DEFAULT_wxUSE_DC_CACHEING + wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}" fi; - eval "$ac_cv_use_dccache" - if test "$no_cache" != 1; then - echo $ac_cv_use_dccache >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_finddlg" + if test "x$cache" = xyes; then + echo "wxUSE_FINDREPLDLG=$wxUSE_FINDREPLDLG" >> ${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_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 -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 - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-palette or --disable-palette was given. -if test "${enable_palette+set}" = set; then - enableval="$enable_palette" + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6 + # Check whether --enable-fontdlg or --disable-fontdlg was given. +if test "${enable_fontdlg+set}" = set; then + enableval="$enable_fontdlg" if test "$enableval" = yes; then - ac_cv_use_palette='wxUSE_PALETTE=yes' + wx_cv_use_fontdlg='wxUSE_FONTDLG=yes' else - ac_cv_use_palette='wxUSE_PALETTE=no' + wx_cv_use_fontdlg='wxUSE_FONTDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_PALETTE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_palette='wxUSE_PALETTE='$DEFAULT_wxUSE_PALETTE + wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}" fi; - eval "$ac_cv_use_palette" - if test "$no_cache" != 1; then - echo $ac_cv_use_palette >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fontdlg" + if test "x$cache" = xyes; then + echo "wxUSE_FONTDLG=$wxUSE_FONTDLG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-image" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-image or --disable-image was given. -if test "${enable_image+set}" = set; then - enableval="$enable_image" + + 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 + # Check whether --enable-dirdlg or --disable-dirdlg was given. +if test "${enable_dirdlg+set}" = set; then + enableval="$enable_dirdlg" if test "$enableval" = yes; then - ac_cv_use_image='wxUSE_IMAGE=yes' + wx_cv_use_dirdlg='wxUSE_DIRDLG=yes' else - ac_cv_use_image='wxUSE_IMAGE=no' + wx_cv_use_dirdlg='wxUSE_DIRDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE + wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}" fi; - eval "$ac_cv_use_image" - if test "$no_cache" != 1; then - echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dirdlg" + if test "x$cache" = xyes; then + echo "wxUSE_DIRDLG=$wxUSE_DIRDLG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gif" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-gif or --disable-gif was given. -if test "${enable_gif+set}" = set; then - enableval="$enable_gif" + + 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 + # Check whether --enable-msgdlg or --disable-msgdlg was given. +if test "${enable_msgdlg+set}" = set; then + enableval="$enable_msgdlg" if test "$enableval" = yes; then - ac_cv_use_gif='wxUSE_GIF=yes' + wx_cv_use_msgdlg='wxUSE_MSGDLG=yes' else - ac_cv_use_gif='wxUSE_GIF=no' + wx_cv_use_msgdlg='wxUSE_MSGDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF + wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}" fi; - eval "$ac_cv_use_gif" - if test "$no_cache" != 1; then - echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_msgdlg" + if test "x$cache" = xyes; then + echo "wxUSE_MSGDLG=$wxUSE_MSGDLG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pcx" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-pcx or --disable-pcx was given. -if test "${enable_pcx+set}" = set; then - enableval="$enable_pcx" + + 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 + # Check whether --enable-numberdlg or --disable-numberdlg was given. +if test "${enable_numberdlg+set}" = set; then + enableval="$enable_numberdlg" if test "$enableval" = yes; then - ac_cv_use_pcx='wxUSE_PCX=yes' + wx_cv_use_numberdlg='wxUSE_NUMBERDLG=yes' else - ac_cv_use_pcx='wxUSE_PCX=no' + wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX + wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}" fi; - eval "$ac_cv_use_pcx" - if test "$no_cache" != 1; then - echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_numberdlg" + if test "x$cache" = xyes; then + echo "wxUSE_NUMBERDLG=$wxUSE_NUMBERDLG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iff" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-iff or --disable-iff was given. -if test "${enable_iff+set}" = set; then - enableval="$enable_iff" + + 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 + # Check whether --enable-splash or --disable-splash was given. +if test "${enable_splash+set}" = set; then + enableval="$enable_splash" if test "$enableval" = yes; then - ac_cv_use_iff='wxUSE_IFF=yes' + wx_cv_use_splash='wxUSE_SPLASH=yes' else - ac_cv_use_iff='wxUSE_IFF=no' + wx_cv_use_splash='wxUSE_SPLASH=no' fi + cache=yes else - LINE=`grep "wxUSE_IFF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_iff='wxUSE_IFF='$DEFAULT_wxUSE_IFF + wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}" fi; - eval "$ac_cv_use_iff" - if test "$no_cache" != 1; then - echo $ac_cv_use_iff >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_splash" + if test "x$cache" = xyes; then + echo "wxUSE_SPLASH=$wxUSE_SPLASH" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pnm" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-pnm or --disable-pnm was given. -if test "${enable_pnm+set}" = set; then - enableval="$enable_pnm" + + 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 + # Check whether --enable-textdlg or --disable-textdlg was given. +if test "${enable_textdlg+set}" = set; then + enableval="$enable_textdlg" if test "$enableval" = yes; then - ac_cv_use_pnm='wxUSE_PNM=yes' + wx_cv_use_textdlg='wxUSE_TEXTDLG=yes' else - ac_cv_use_pnm='wxUSE_PNM=no' + wx_cv_use_textdlg='wxUSE_TEXTDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM + wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}" fi; - eval "$ac_cv_use_pnm" - if test "$no_cache" != 1; then - echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_textdlg" + if test "x$cache" = xyes; then + echo "wxUSE_TEXTDLG=$wxUSE_TEXTDLG" >> ${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_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= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xpm" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-xpm or --disable-xpm was given. -if test "${enable_xpm+set}" = set; then - enableval="$enable_xpm" + + 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 + # Check whether --enable-tipdlg or --disable-tipdlg was given. +if test "${enable_tipdlg+set}" = set; then + enableval="$enable_tipdlg" if test "$enableval" = yes; then - ac_cv_use_xpm='wxUSE_XPM=yes' + wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes' else - ac_cv_use_xpm='wxUSE_XPM=no' + wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' fi + cache=yes else - LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_xpm='wxUSE_XPM='$DEFAULT_wxUSE_XPM + wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}" fi; - eval "$ac_cv_use_xpm" - if test "$no_cache" != 1; then - echo $ac_cv_use_xpm >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tipdlg" + if test "x$cache" = xyes; then + echo "wxUSE_STARTUP_TIPS=$wxUSE_STARTUP_TIPS" >> ${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_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= - 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 - # Check whether --enable-ico_cur or --disable-ico_cur was given. -if test "${enable_ico_cur+set}" = set; then - enableval="$enable_ico_cur" + + 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 + # Check whether --enable-progressdlg or --disable-progressdlg was given. +if test "${enable_progressdlg+set}" = set; then + enableval="$enable_progressdlg" if test "$enableval" = yes; then - ac_cv_use_ico_cur='wxUSE_ICO_CUR=yes' + wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes' else - ac_cv_use_ico_cur='wxUSE_ICO_CUR=no' + wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_ICO_CUR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_ico_cur='wxUSE_ICO_CUR='$DEFAULT_wxUSE_ICO_CUR + wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}" fi; - eval "$ac_cv_use_ico_cur" - if test "$no_cache" != 1; then - echo $ac_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_progressdlg" + if test "x$cache" = xyes; then + echo "wxUSE_PROGRESSDLG=$wxUSE_PROGRESSDLG" >> ${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_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 -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}-wizarddlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6 + # Check whether --enable-wizarddlg or --disable-wizarddlg was given. +if test "${enable_wizarddlg+set}" = set; then + enableval="$enable_wizarddlg" + + if test "$enableval" = yes; then + wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes' + else + wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' + fi + cache=yes + +else + LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}" -# Check whether --with-flavour or --without-flavour was given. -if test "${with_flavour+set}" = set; then - withval="$with_flavour" - WX_FLAVOUR="$withval" fi; + eval "$wx_cv_use_wizarddlg" + if test "x$cache" = xyes; then + echo "wxUSE_WIZARDDLG=$wxUSE_WIZARDDLG" >> ${wx_arg_cache_file}.tmp + fi + if test x"$enablestring" = xdisable; then + if test $wxUSE_WIZARDDLG = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_WIZARDDLG + 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" + 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 + # Check whether --enable-menus or --disable-menus was given. +if test "${enable_menus+set}" = set; then + enableval="$enable_menus" if test "$enableval" = yes; then - ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes' + wx_cv_use_menus='wxUSE_MENUS=yes' else - ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' + wx_cv_use_menus='wxUSE_MENUS=no' fi + cache=yes else - LINE=`grep "wxUSE_OFFICIAL_BUILD" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD='$DEFAULT_wxUSE_OFFICIAL_BUILD + wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$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 + eval "$wx_cv_use_menus" + if test "x$cache" = xyes; then + echo "wxUSE_MENUS=$wxUSE_MENUS" >> ${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 + 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 -# 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 "$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 + # Check whether --enable-miniframe or --disable-miniframe was given. +if test "${enable_miniframe+set}" = set; then + enableval="$enable_miniframe" - echo "saving argument cache $wx_arg_cache_file" - mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} + if test "$enableval" = yes; then + wx_cv_use_miniframe='wxUSE_MINIFRAME=yes' + else + wx_cv_use_miniframe='wxUSE_MINIFRAME=no' + fi + cache=yes +else + LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi -echo "$as_me:$LINENO: checking for toolkit" >&5 -echo $ECHO_N "checking for toolkit... $ECHO_C" >&6 + wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}" -# In Wine, we need to default to MSW, not GTK or MOTIF -if test "$wxUSE_WINE" = "yes"; then - DEFAULT_DEFAULT_wxUSE_GTK=0 - DEFAULT_DEFAULT_wxUSE_MOTIF=0 - DEFAULT_DEFAULT_wxUSE_MSW=1 - wxUSE_SHARED=no -fi +fi; + eval "$wx_cv_use_miniframe" + if test "x$cache" = xyes; then + echo "wxUSE_MINIFRAME=$wxUSE_MINIFRAME" >> ${wx_arg_cache_file}.tmp + fi -if test "$wxUSE_GUI" = "yes"; then + if test x"$enablestring" = xdisable; then + if test $wxUSE_MINIFRAME = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_MINIFRAME + fi - if test "$USE_BEOS" = 1; then - { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5 -echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} - { (exit 1); exit 1; }; } - fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - if test "$TOOLKIT_GIVEN" = 1; then - for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - if test "x$value" = "xno"; then - eval "$var=0" - elif test "x$value" != "x"; then - eval "$var=1" - fi - if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then - eval "wx${toolkit}_VERSION=$value" - fi - done - else - for toolkit in `echo $ALL_TOOLKITS`; do - if test "$has_toolkit_in_cache" != 1; then - var=DEFAULT_DEFAULT_wxUSE_$toolkit - else - var=DEFAULT_wxUSE_$toolkit - - eval "version=\$DEFAULT_wx${toolkit}_VERSION" - if test "x$version" != "x"; then - eval "wx${toolkit}_VERSION=$version" + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi fi - fi - eval "wxUSE_$toolkit=\$${var}" - done - fi - NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \ - + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \ - + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tooltips" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6 + # Check whether --enable-tooltips or --disable-tooltips was given. +if test "${enable_tooltips+set}" = set; then + enableval="$enable_tooltips" - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` - esac + if test "$enableval" = yes; then + wx_cv_use_tooltips='wxUSE_TOOLTIPS=yes' + else + wx_cv_use_tooltips='wxUSE_TOOLTIPS=no' + fi + cache=yes - case "$NUM_TOOLKITS" in - 1) - ;; - 0) - { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5 -echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;} - { (exit 1); exit 1; }; } - ;; - *) - { { echo "$as_me:$LINENO: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&5 -echo "$as_me: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&2;} - { (exit 1); exit 1; }; } - esac +else - # to be removed when --disable-gtk2 isn't needed - if test "x$wxUSE_GTK2" = "xyes"; then - wxGTK_VERSION=2 - elif test "x$wxUSE_GTK2" = "xno"; then - wxGTK_VERSION=1 - fi + LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi - for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - if test "x$value" != x; then - cache_var=CACHE_$toolkit - eval "cache=\$${cache_var}" - if test "$cache" = 1; then - echo "$var=$value" >> ${wx_arg_cache_file} - eval "version=\$wx${toolkit}_VERSION" - if test "x$version" != "x"; then - echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file} + wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}" + +fi; + + eval "$wx_cv_use_tooltips" + if test "x$cache" = xyes; then + echo "wxUSE_TOOLTIPS=$wxUSE_TOOLTIPS" >> ${wx_arg_cache_file}.tmp fi - fi - if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"` - echo "$as_me:$LINENO: result: $toolkit_echo" >&5 -echo "${ECHO_T}$toolkit_echo" >&6 - fi - fi - done + + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOOLTIPS = yes; then + result=no + else + result=yes + fi + else + 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 + # Check whether --enable-splines or --disable-splines was given. +if test "${enable_splines+set}" = set; then + enableval="$enable_splines" + + if test "$enableval" = yes; then + wx_cv_use_splines='wxUSE_SPLINES=yes' + else + wx_cv_use_splines='wxUSE_SPLINES=no' + fi + cache=yes + else - if test "x$host_alias" != "x"; then - echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5 -echo "${ECHO_T}base ($host_alias hosted) only" >&6 - else - echo "$as_me:$LINENO: result: base only" >&5 -echo "${ECHO_T}base only" >&6 - fi -fi -wants_win32=0 -doesnt_want_win32=0 -case "${host}" in - *-*-cygwin*) - if test "$wxUSE_MSW" = 1 ; then - wants_win32=1 - BAKEFILE_FORCE_PLATFORM=win32 - else - doesnt_want_win32=1 - fi - ;; - *-*-mingw*) - wants_win32=1 - ;; -esac + LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi -if test "$wxUSE_WINE" = "yes"; then - wants_win32=1 - CC=winegcc - CXX=wineg++ - LDFLAGS_GUI="-mwindows" -fi + wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}" -if test "$wants_win32" = 1 ; then - USE_UNIX=0 - USE_WIN32=1 - cat >>confdefs.h <<\_ACEOF -#define __WIN32__ 1 -_ACEOF +fi; - cat >>confdefs.h <<\_ACEOF -#define __WIN95__ 1 -_ACEOF + eval "$wx_cv_use_splines" + if test "x$cache" = xyes; then + echo "wxUSE_SPLINES=$wxUSE_SPLINES" >> ${wx_arg_cache_file}.tmp + fi - cat >>confdefs.h <<\_ACEOF -#define __WINDOWS__ 1 -_ACEOF + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPLINES = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_SPLINES + fi - cat >>confdefs.h <<\_ACEOF -#define __GNUWIN32__ 1 -_ACEOF + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - cat >>confdefs.h <<\_ACEOF -#define STRICT 1 -_ACEOF - cat >>confdefs.h <<\_ACEOF -#define WINVER 0x0400 -_ACEOF + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi -fi -if test "$doesnt_want_win32" = 1 ; then - USE_UNIX=1 - USE_WIN32=0 -fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6 + # Check whether --enable-mousewheel or --disable-mousewheel was given. +if test "${enable_mousewheel+set}" = set; then + enableval="$enable_mousewheel" -if test "$USE_UNIX" = 1 ; then - wxUSE_UNIX=yes - cat >>confdefs.h <<\_ACEOF -#define __UNIX__ 1 -_ACEOF + if test "$enableval" = yes; then + wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes' + else + wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no' + fi + cache=yes -fi +else + LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. + wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}" -_ACEOF +fi; -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache + eval "$wx_cv_use_mousewheel" + if test "x$cache" = xyes; then + echo "wxUSE_MOUSEWHEEL=$wxUSE_MOUSEWHEEL" >> ${wx_arg_cache_file}.tmp + fi -CFLAGS=${CFLAGS:=} + if test x"$enablestring" = xdisable; then + if test $wxUSE_MOUSEWHEEL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_MOUSEWHEEL + fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6 + # Check whether --enable-validators or --disable-validators was given. +if test "${enable_validators+set}" = set; then + enableval="$enable_validators" -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + if test "$enableval" = yes; then + wx_cv_use_validators='wxUSE_VALIDATORS=yes' + else + wx_cv_use_validators='wxUSE_VALIDATORS=no' + fi + cache=yes -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}" -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +fi; -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + eval "$wx_cv_use_validators" + if test "x$cache" = xyes; then + echo "wxUSE_VALIDATORS=$wxUSE_VALIDATORS" >> ${wx_arg_cache_file}.tmp + fi -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + if test x"$enablestring" = xdisable; then + if test $wxUSE_VALIDATORS = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_VALIDATORS + fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&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 -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-busyinfo" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6 + # Check whether --enable-busyinfo or --disable-busyinfo was given. +if test "${enable_busyinfo+set}" = set; then + enableval="$enable_busyinfo" + + if test "$enableval" = yes; then + wx_cv_use_busyinfo='wxUSE_BUSYINFO=yes' + else + wx_cv_use_busyinfo='wxUSE_BUSYINFO=no' + fi + cache=yes -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}" + +fi; + + eval "$wx_cv_use_busyinfo" + if test "x$cache" = xyes; then + echo "wxUSE_BUSYINFO=$wxUSE_BUSYINFO" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_BUSYINFO = yes; then + result=no + else + result=yes + fi + else + 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 + # Check whether --enable-joystick or --disable-joystick was given. +if test "${enable_joystick+set}" = set; then + enableval="$enable_joystick" + + if test "$enableval" = yes; then + wx_cv_use_joystick='wxUSE_JOYSTICK=yes' + else + wx_cv_use_joystick='wxUSE_JOYSTICK=no' + fi + cache=yes -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - test -n "$ac_ct_CC" && break -done + LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi - CC=$ac_ct_CC -fi + wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}" -fi +fi; + eval "$wx_cv_use_joystick" + if test "x$cache" = xyes; then + echo "wxUSE_JOYSTICK=$wxUSE_JOYSTICK" >> ${wx_arg_cache_file}.tmp + fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_JOYSTICK = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_JOYSTICK + fi -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6 + # Check whether --enable-metafile or --disable-metafile was given. +if test "${enable_metafile+set}" = set; then + enableval="$enable_metafile" + + if test "$enableval" = yes; then + wx_cv_use_metafile='wxUSE_METAFILE=yes' + else + wx_cv_use_metafile='wxUSE_METAFILE=no' + fi + cache=yes -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; - * ) - break;; - esac -done else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi + LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi -ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 + wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (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 - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +fi; -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 + eval "$wx_cv_use_metafile" + if test "x$cache" = xyes; then + echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp + fi -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -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); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi + if test x"$enablestring" = xdisable; then + if test $wxUSE_METAFILE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_METAFILE + fi -rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -if test "${ac_cv_objext+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 () -{ + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dragimage" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6 + # Check whether --enable-dragimage or --disable-dragimage was given. +if test "${enable_dragimage+set}" = set; then + enableval="$enable_dragimage" -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi + if test "$enableval" = yes; then + wx_cv_use_dragimage='wxUSE_DRAGIMAGE=yes' + else + wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no' + fi + cache=yes -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+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 __GNUC__ - choke me -#endif + LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi - ; - 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_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}" -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu +fi; -fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+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. */ + eval "$wx_cv_use_dragimage" + if test "x$cache" = xyes; then + echo "wxUSE_DRAGIMAGE=$wxUSE_DRAGIMAGE" >> ${wx_arg_cache_file}.tmp + fi -int -main () -{ + if test x"$enablestring" = xdisable; then + if test $wxUSE_DRAGIMAGE = yes; then + result=no + else + result=yes + fi + else + 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 + # Check whether --enable-accessibility or --disable-accessibility was given. +if test "${enable_accessibility+set}" = set; then + enableval="$enable_accessibility" + + if test "$enableval" = yes; then + wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes' + else + wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no' + fi + cache=yes - ; - 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_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi + LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}" + +fi; + + eval "$wx_cv_use_accessibility" + if test "x$cache" = xyes; then + echo "wxUSE_ACCESSIBILITY=$wxUSE_ACCESSIBILITY" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_ACCESSIBILITY = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_ACCESSIBILITY + 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}-palette" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6 + # Check whether --enable-palette or --disable-palette was given. +if test "${enable_palette+set}" = set; then + enableval="$enable_palette" + + if test "$enableval" = yes; then + wx_cv_use_palette='wxUSE_PALETTE=yes' + else + wx_cv_use_palette='wxUSE_PALETTE=no' + fi + cache=yes + else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}" + +fi; + + eval "$wx_cv_use_palette" + if test "x$cache" = xyes; then + echo "wxUSE_PALETTE=$wxUSE_PALETTE" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PALETTE = yes; then + result=no + else + result=yes + fi + else + 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 + # Check whether --enable-image or --disable-image was given. +if test "${enable_image+set}" = set; then + enableval="$enable_image" + + if test "$enableval" = yes; then + wx_cv_use_image='wxUSE_IMAGE=yes' + else + wx_cv_use_image='wxUSE_IMAGE=no' + fi + cache=yes + else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}" + +fi; + + eval "$wx_cv_use_image" + if test "x$cache" = xyes; then + echo "wxUSE_IMAGE=$wxUSE_IMAGE" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_IMAGE = yes; then + result=no + else + result=yes + fi + else + 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 + # Check whether --enable-gif or --disable-gif was given. +if test "${enable_gif+set}" = set; then + enableval="$enable_gif" + + if test "$enableval" = yes; then + wx_cv_use_gif='wxUSE_GIF=yes' + else + wx_cv_use_gif='wxUSE_GIF=no' + fi + cache=yes -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - 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_prog_cc_stdc=$ac_arg -break else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC + LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi -fi + wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}" -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac +fi; + + eval "$wx_cv_use_gif" + if test "x$cache" = xyes; then + echo "wxUSE_GIF=$wxUSE_GIF" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_GIF = yes; then + result=no + else + result=yes + fi + else + 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 + # Check whether --enable-pcx or --disable-pcx was given. +if test "${enable_pcx+set}" = set; then + enableval="$enable_pcx" + + if test "$enableval" = yes; then + wx_cv_use_pcx='wxUSE_PCX=yes' + else + wx_cv_use_pcx='wxUSE_PCX=no' + fi + cache=yes -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_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 - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - 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 - : else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - 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 - break + LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}" + +fi; + + eval "$wx_cv_use_pcx" + if test "x$cache" = xyes; then + echo "wxUSE_PCX=$wxUSE_PCX" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PCX = yes; then + result=no + else + result=yes + fi + else + 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 + # Check whether --enable-tga or --disable-tga was given. +if test "${enable_tga+set}" = set; then + enableval="$enable_tga" + + if test "$enableval" = yes; then + wx_cv_use_tga='wxUSE_TGA=yes' + else + wx_cv_use_tga='wxUSE_TGA=no' + fi + cache=yes + else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi + LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}" + +fi; + + eval "$wx_cv_use_tga" + if test "x$cache" = xyes; then + echo "wxUSE_TGA=$wxUSE_TGA" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_TGA = yes; then + result=no + else + result=yes + fi + else + 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 + # Check whether --enable-iff or --disable-iff was given. +if test "${enable_iff+set}" = set; then + enableval="$enable_iff" + + if test "$enableval" = yes; then + wx_cv_use_iff='wxUSE_IFF=yes' + else + wx_cv_use_iff='wxUSE_IFF=no' + fi + cache=yes else - echo "$as_me: failed program was:" >&5 -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 + LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}" +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 + eval "$wx_cv_use_iff" + if test "x$cache" = xyes; then + echo "wxUSE_IFF=$wxUSE_IFF" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_IFF = yes; then + result=no + else + result=yes + fi + else + 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 + # Check whether --enable-pnm or --disable-pnm was given. +if test "${enable_pnm+set}" = set; then + enableval="$enable_pnm" + + if test "$enableval" = yes; then + wx_cv_use_pnm='wxUSE_PNM=yes' + else + wx_cv_use_pnm='wxUSE_PNM=no' + fi + cache=yes - echo "$as_me:$LINENO: checking whether we are using the Intel C compiler" >&5 -echo $ECHO_N "checking whether we are using the Intel C compiler... $ECHO_C" >&6 -if test "${bakefile_cv_c_compiler___INTEL_COMPILER+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ + LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}" + +fi; + + eval "$wx_cv_use_pnm" + if test "x$cache" = xyes; then + echo "wxUSE_PNM=$wxUSE_PNM" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PNM = yes; then + result=no + else + result=yes + fi + else + 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 + # Check whether --enable-xpm or --disable-xpm was given. +if test "${enable_xpm+set}" = set; then + enableval="$enable_xpm" - #ifndef __INTEL_COMPILER - choke me - #endif + if test "$enableval" = yes; then + wx_cv_use_xpm='wxUSE_XPM=yes' + else + wx_cv_use_xpm='wxUSE_XPM=no' + fi + cache=yes - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - bakefile_cv_c_compiler___INTEL_COMPILER=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_cv_c_compiler___INTEL_COMPILER=no + LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}" +fi; -fi -echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6 - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + eval "$wx_cv_use_xpm" + if test "x$cache" = xyes; then + echo "wxUSE_XPM=$wxUSE_XPM" >> ${wx_arg_cache_file}.tmp + fi - if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then - :; INTELCC=yes - else - :; - fi + if test x"$enablestring" = xdisable; then + if test $wxUSE_XPM = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_XPM + fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - if test "x$GCC" != "xyes"; then - if test "xCC" = "xC"; then - echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5 -echo $ECHO_N "checking if the C compiler requires -ext o... $ECHO_C" >&6 -if test "${bakefile_cv_c_exto+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 () -{ + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest.$ac_ext.o -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.* 2>/dev/null)`; do - case $ac_file in - conftest.$ac_ext.o) - bakefile_cv_c_exto="-ext o" - ;; - *) - ;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot figure out if compiler needs -ext o: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot figure out if compiler needs -ext o: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ico_cur" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6 + # Check whether --enable-ico_cur or --disable-ico_cur was given. +if test "${enable_ico_cur+set}" = set; then + enableval="$enable_ico_cur" -fi + if test "$enableval" = yes; then + wx_cv_use_ico_cur='wxUSE_ICO_CUR=yes' + else + wx_cv_use_ico_cur='wxUSE_ICO_CUR=no' + fi + cache=yes -rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext +else -fi -echo "$as_me:$LINENO: result: $bakefile_cv_c_exto" >&5 -echo "${ECHO_T}$bakefile_cv_c_exto" >&6 -if test "x$bakefile_cv_c_exto" '!=' "x"; then - if test "c" = "c"; then - CFLAGS="$bakefile_cv_c_exto $CFLAGS" - fi - if test "c" = "cxx"; then - CXXFLAGS="$bakefile_cv_c_exto $CXXFLAGS" - fi -fi + LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi - if test "x$bakefile_cv_c_exto" '!=' "x"; then - unset ac_cv_prog_cc_g - ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+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. */ + wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}" -int -main () -{ +fi; - ; - 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_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + eval "$wx_cv_use_ico_cur" + if test "x$cache" = xyes; then + echo "wxUSE_ICO_CUR=$wxUSE_ICO_CUR" >> ${wx_arg_cache_file}.tmp + fi -ac_cv_prog_cc_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi + if test x"$enablestring" = xdisable; then + if test $wxUSE_ICO_CUR = yes; then + result=no + else + result=yes fi - fi + else + result=$wxUSE_ICO_CUR + fi - case `uname -s` in - AIX*) - 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: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -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 - 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 __xlC__ - 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_compiler_xlc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_compiler_xlc=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_xlc=$bakefile_compiler_xlc + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi -fi -echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_xlc" >&6 + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dccache" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6 + # Check whether --enable-dccache or --disable-dccache was given. +if test "${enable_dccache+set}" = set; then + enableval="$enable_dccache" -XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes` -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 "$enableval" = yes; then + wx_cv_use_dccache='wxUSE_DC_CACHEING=yes' + else + wx_cv_use_dccache='wxUSE_DC_CACHEING=no' + fi + cache=yes +else - ;; + LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi - Darwin) - 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 + wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" -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 - 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. */ +fi; -int -main () -{ -#ifndef __MWERKS__ - choke me -#endif + eval "$wx_cv_use_dccache" + if test "x$cache" = xyes; then + echo "wxUSE_DC_CACHEING=$wxUSE_DC_CACHEING" >> ${wx_arg_cache_file}.tmp + fi - ; - 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_compiler_mwerks=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test x"$enablestring" = xdisable; then + if test $wxUSE_DC_CACHEING = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DC_CACHEING + fi -bakefile_compiler_mwerks=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_mwerks=$bakefile_compiler_mwerks + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -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 -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 + 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}-ps-in-msw" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ps-in-msw... $ECHO_C" >&6 + # Check whether --enable-ps-in-msw or --disable-ps-in-msw was given. +if test "${enable_ps_in_msw+set}" = set; then + enableval="$enable_ps_in_msw" - 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 "$enableval" = yes; then + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes' + else + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no' + fi + cache=yes -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 - 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 __xlC__ - choke me -#endif + LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi - ; - 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_compiler_xlc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}" -bakefile_compiler_xlc=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_xlc=$bakefile_compiler_xlc +fi; -fi -echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_xlc" >&6 + eval "$wx_cv_use_ps_in_msw" + if test "x$cache" = xyes; then + echo "wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" >> ${wx_arg_cache_file}.tmp + fi -XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes` -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"$enablestring" = xdisable; then + if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW + fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - ;; - IRIX*) + 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}-ownerdrawn" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ownerdrawn... $ECHO_C" >&6 + # Check whether --enable-ownerdrawn or --disable-ownerdrawn was given. +if test "${enable_ownerdrawn+set}" = set; then + enableval="$enable_ownerdrawn" - 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 "$enableval" = yes; then + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes' + else + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no' + fi + cache=yes - echo "$as_me:$LINENO: checking whether we are using the SGI C compiler" >&5 -echo $ECHO_N "checking whether we are using the SGI C compiler... $ECHO_C" >&6 -if test "${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -main () -{ + LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi - #ifndef _SGI_COMPILER_VERSION - choke me - #endif + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}" - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - bakefile_cv_c_compiler__SGI_COMPILER_VERSION=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +fi; -bakefile_cv_c_compiler__SGI_COMPILER_VERSION=no + eval "$wx_cv_use_ownerdrawn" + if test "x$cache" = xyes; then + echo "wxUSE_OWNER_DRAWN=$wxUSE_OWNER_DRAWN" >> ${wx_arg_cache_file}.tmp + fi -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + if test x"$enablestring" = xdisable; then + if test $wxUSE_OWNER_DRAWN = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_OWNER_DRAWN + fi + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -fi -echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6 - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then - :; SGICC=yes - else - :; - fi + 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}-uxtheme" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-uxtheme... $ECHO_C" >&6 + # Check whether --enable-uxtheme or --disable-uxtheme was given. +if test "${enable_uxtheme+set}" = set; then + enableval="$enable_uxtheme" + + if test "$enableval" = yes; then + wx_cv_use_uxtheme='wxUSE_UXTHEME=yes' + else + wx_cv_use_uxtheme='wxUSE_UXTHEME=no' + fi + cache=yes + +else + LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi - ;; + wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}" - HP-UX*) +fi; + eval "$wx_cv_use_uxtheme" + if test "x$cache" = xyes; then + echo "wxUSE_UXTHEME=$wxUSE_UXTHEME" >> ${wx_arg_cache_file}.tmp + 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"$enablestring" = xdisable; then + if test $wxUSE_UXTHEME = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_UXTHEME + fi - 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_c_compiler___HP_cc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 -int -main () -{ - #ifndef __HP_cc - choke me - #endif + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi - ; - 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___HP_cc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxdib" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-wxdib... $ECHO_C" >&6 + # Check whether --enable-wxdib or --disable-wxdib was given. +if test "${enable_wxdib+set}" = set; then + enableval="$enable_wxdib" -bakefile_cv_c_compiler___HP_cc=no + if test "$enableval" = yes; then + wx_cv_use_wxdib='wxUSE_DIB=yes' + else + wx_cv_use_wxdib='wxUSE_DIB=no' + fi + cache=yes -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +else + LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi -fi -echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6 - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}" - if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then - :; HPCC=yes - else - :; - fi +fi; + eval "$wx_cv_use_wxdib" + if test "x$cache" = xyes; then + echo "wxUSE_DIB=$wxUSE_DIB" >> ${wx_arg_cache_file}.tmp + fi - ;; + if test x"$enablestring" = xdisable; then + if test $wxUSE_DIB = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DIB + fi - OSF1) + echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6 - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +fi - echo "$as_me:$LINENO: checking whether we are using the Compaq C compiler" >&5 -echo $ECHO_N "checking whether we are using the Compaq C compiler... $ECHO_C" >&6 -if test "${bakefile_cv_c_compiler___DECC+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 () -{ + echo "saving argument cache $wx_arg_cache_file" + mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} - #ifndef __DECC - 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___DECC=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_cv_c_compiler___DECC=no +echo "$as_me:$LINENO: checking for toolkit" >&5 +echo $ECHO_N "checking for toolkit... $ECHO_C" >&6 +# In Wine, we need to default to MSW, not GTK or MOTIF +if test "$wxUSE_WINE" = "yes"; then + DEFAULT_DEFAULT_wxUSE_GTK=0 + DEFAULT_DEFAULT_wxUSE_MOTIF=0 + DEFAULT_DEFAULT_wxUSE_MSW=1 + wxUSE_SHARED=no + CC=${CC:-winegcc} + CXX=${CXX:-wineg++} fi -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 - 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 "$wxUSE_GUI" = "yes"; then - if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then - :; COMPAQCC=yes - else - :; + if test "$USE_BEOS" = 1; then + { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5 +echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} + { (exit 1); exit 1; }; } fi + if test "$TOOLKIT_GIVEN" = 1; then + for toolkit in `echo $ALL_TOOLKITS`; do + var=wxUSE_$toolkit + eval "value=\$${var}" + if test "x$value" = "xno"; then + eval "$var=0" + elif test "x$value" != "x"; then + eval "$var=1" + fi - ;; - - SunOS) + if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then + eval "wx${toolkit}_VERSION=$value" + fi + done + else + for toolkit in `echo $ALL_TOOLKITS`; do + if test "$has_toolkit_in_cache" != 1; then + var=DEFAULT_DEFAULT_wxUSE_$toolkit + else + var=DEFAULT_wxUSE_$toolkit + eval "version=\$DEFAULT_wx${toolkit}_VERSION" + if test "x$version" != "x"; then + eval "wx${toolkit}_VERSION=$version" + fi + fi + eval "wxUSE_$toolkit=\$${var}" + 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 + NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \ + + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \ + + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` - 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. */ + case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` + esac -int -main () -{ + case "$NUM_TOOLKITS" in + 1) + ;; + 0) + { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5 +echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;} + { (exit 1); exit 1; }; } + ;; + *) + { { echo "$as_me:$LINENO: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&5 +echo "$as_me: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&2;} + { (exit 1); exit 1; }; } + esac - #ifndef __SUNPRO_C - choke me - #endif + # to be removed when --disable-gtk2 isn't needed + if test "x$wxUSE_GTK2" = "xyes"; then + wxGTK_VERSION=2 + elif test "x$wxUSE_GTK2" = "xno"; then + wxGTK_VERSION=1 + fi - ; - 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 + for toolkit in `echo $ALL_TOOLKITS`; do + var=wxUSE_$toolkit + eval "value=\$${var}" + if test "x$value" != x; then + cache_var=CACHE_$toolkit + eval "cache=\$${cache_var}" + if test "$cache" = 1; then + echo "$var=$value" >> ${wx_arg_cache_file} + eval "version=\$wx${toolkit}_VERSION" + if test "x$version" != "x"; then + echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file} + fi + fi + if test "$value" = 1; then + toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"` + echo "$as_me:$LINENO: result: $toolkit_echo" >&5 +echo "${ECHO_T}$toolkit_echo" >&6 + fi + fi + done else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -bakefile_cv_c_compiler___SUNPRO_C=no - + if test "x$host_alias" != "x"; then + echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5 +echo "${ECHO_T}base ($host_alias hosted) only" >&6 + else + echo "$as_me:$LINENO: result: base only" >&5 +echo "${ECHO_T}base only" >&6 + fi 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 - 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 +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. - if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then - :; SUNCC=yes - else - :; - fi +_ACEOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +{ + (set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} | + sed ' + t clear + : clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + : end' >>confcache +if diff $cache_file confcache >/dev/null 2>&1; then :; else + if test -w $cache_file; then + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + cat confcache >$cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache - ;; - esac - fi +CFLAGS=${CFLAGS:=} -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 how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH 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_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi -else - ac_cpp_err=yes +done +done + fi -if test -z "$ac_cpp_err"; then - : +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cpp_err=yes + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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 + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" fi - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH 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_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi -else - ac_cpp_err=yes +done +done + fi -if test -z "$ac_cpp_err"; then - : +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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_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 - # Broken: success on invalid input. -continue +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done - # 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 - : +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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 - - -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + CC=$ac_ct_CC else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi + CC="$ac_cv_prog_CC" fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - -if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 -echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 -if test "${ac_cv_prog_gcc_traditional+set}" = set; then +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -Autoconf TIOCGETP -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_cv_prog_gcc_traditional=no -fi -rm -f conftest* - - - if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -Autoconf TCGETA -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -fi -rm -f conftest* + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi -echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 -echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 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 - - -CXXFLAGS=${CXXFLAGS:=} - - - - 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 -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CXX+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -13838,7 +16136,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -13847,31 +16145,31 @@ done fi fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - test -n "$CXX" && break + test -n "$CC" && break done fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -13880,55 +16178,263 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" + ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$ac_ct_CC" && break +done + + CC=$ac_ct_CC +fi + +fi + + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + +# Provide some information about the compiler. +echo "$as_me:$LINENO:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is +# not robust to junk in `.', hence go to wildcards (a.*) only as a last +# resort. + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; + * ) + break;; + esac +done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } +fi + +ac_exeext=$ac_cv_exeext +echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6 + +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (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 + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + fi +fi +echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +rm -f a.out a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6 + +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +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); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + export ac_cv_exeext + break;; + * ) break;; + esac +done else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi - test -n "$ac_ct_CXX" && break -done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" +rm -f conftest$ac_cv_exeext +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6 - CXX=$ac_ct_CXX -fi +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +if test "${ac_cv_objext+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 () +{ -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6 +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -13958,7 +16464,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -13978,18 +16485,18 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu +ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cxx_g+set}" = set; then +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +GCC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +CFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14016,7 +16523,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14028,33 +16536,179 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_prog_cxx_g=yes + ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no +ac_cv_prog_cc_g=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" else - CXXFLAGS="-g" + CFLAGS="-g" fi else - if test "$GXX" = yes; then - CXXFLAGS="-O2" + if test "$GCC" = yes; then + CFLAGS="-O2" else - CXXFLAGS= + CFLAGS= fi fi -for ac_declaration in \ +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std1 is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std1. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + 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_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_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 + for ac_declaration in \ '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ @@ -14087,7 +16741,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14131,7 +16786,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14158,23 +16814,30 @@ if test -n "$ac_declaration"; then echo '#endif' >>confdefs.h 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 +else + echo "$as_me: failed program was:" >&5 +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 - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - echo "$as_me:$LINENO: checking whether we are using the Intel C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the Intel C++ compiler... $ECHO_C" >&6 -if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER+set}" = set; then + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + echo "$as_me:$LINENO: checking whether we are using the Intel C compiler" >&5 +echo $ECHO_N "checking whether we are using the Intel C compiler... $ECHO_C" >&6 +if test "${bakefile_cv_c_compiler___INTEL_COMPILER+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14205,7 +16868,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14217,38 +16881,39 @@ 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___INTEL_COMPILER=yes + bakefile_cv_c_compiler___INTEL_COMPILER=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_cv_cxx_compiler___INTEL_COMPILER=no +bakefile_cv_c_compiler___INTEL_COMPILER=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6 - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then - :; INTELCXX=yes +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$GCXX" != "xyes"; then - if test "xCXX" = "xC"; then - echo "$as_me:$LINENO: checking if the C++ compiler requires -ext o" >&5 -echo $ECHO_N "checking if the C++ compiler requires -ext o... $ECHO_C" >&6 -if test "${bakefile_cv_cxx_exto+set}" = set; then + + + if test "x$GCC" != "xyes"; then + if test "xCC" = "xC"; then + echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5 +echo $ECHO_N "checking if the C compiler requires -ext o... $ECHO_C" >&6 +if test "${bakefile_cv_c_exto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14275,7 +16940,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 for ac_file in `(ls conftest.* 2>/dev/null)`; do case $ac_file in conftest.$ac_ext.o) - bakefile_cv_cxx_exto="-ext o" + bakefile_cv_c_exto="-ext o" ;; *) ;; @@ -14293,14 +16958,14 @@ fi rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $bakefile_cv_cxx_exto" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_exto" >&6 -if test "x$bakefile_cv_cxx_exto" '!=' "x"; then - if test "cxx" = "c"; then - CFLAGS="$bakefile_cv_cxx_exto $CFLAGS" +echo "$as_me:$LINENO: result: $bakefile_cv_c_exto" >&5 +echo "${ECHO_T}$bakefile_cv_c_exto" >&6 +if test "x$bakefile_cv_c_exto" '!=' "x"; then + if test "c" = "c"; then + CFLAGS="$bakefile_cv_c_exto $CFLAGS" fi - if test "cxx" = "cxx"; then - CXXFLAGS="$bakefile_cv_cxx_exto $CXXFLAGS" + if test "c" = "cxx"; then + CXXFLAGS="$bakefile_cv_c_exto $CXXFLAGS" fi fi @@ -14338,7 +17003,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14381,15 +17047,17 @@ fi case `uname -s` in AIX*) - 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 $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 + + 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 $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 echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14402,9 +17070,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -14419,7 +17088,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14431,40 +17101,128 @@ 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_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 +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 -XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes` -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 ;; Darwin) - 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 $ECHO_N "checking whether we are using the Metrowerks C++ compiler... $ECHO_C" >&6 -if test "${bakefile_cv_cxx_compiler_mwerks+set}" = set; then + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + echo "$as_me:$LINENO: checking whether we are using 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 + 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 __MWERKS__ + 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___MWERKS__=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +bakefile_cv_c_compiler___MWERKS__=no + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +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_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 $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 echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14477,9 +17235,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __MWERKS__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -14494,7 +17253,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14506,37 +17266,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_mwerks=yes + bakefile_cv_c_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_compiler_mwerks=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_cxx_compiler_mwerks=$bakefile_compiler_mwerks +bakefile_cv_c_compiler___xlC__=no + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +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 + -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=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 + ;; + IRIX*) - 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 $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 + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + echo "$as_me:$LINENO: checking whether we are using the SGI C compiler" >&5 +echo $ECHO_N "checking whether we are using the SGI C compiler... $ECHO_C" >&6 +if test "${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14549,9 +17319,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef _SGI_COMPILER_VERSION + choke me + #endif ; return 0; @@ -14566,7 +17337,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14578,42 +17350,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__SGI_COMPILER_VERSION=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_compiler_xlc=no +bakefile_cv_c_compiler__SGI_COMPILER_VERSION=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 +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 -XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes` -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 ;; - IRIX*) + Linux*) - 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 + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - echo "$as_me:$LINENO: checking whether we are using the SGI C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the SGI C++ compiler... $ECHO_C" >&6 -if test "${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+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_c_compiler___SUNPRO_C+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14627,7 +17404,7 @@ int main () { - #ifndef _SGI_COMPILER_VERSION + #ifndef __SUNPRO_C choke me #endif @@ -14644,7 +17421,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14656,31 +17434,31 @@ 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__SGI_COMPILER_VERSION=yes + bakefile_cv_c_compiler___SUNPRO_C=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=no +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_cxx_compiler__SGI_COMPILER_VERSION" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6 - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then - :; SGICXX=yes +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 + ;; @@ -14688,15 +17466,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu 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 + 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 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 HP C compiler" >&5 +echo $ECHO_N "checking whether we are using the HP C compiler... $ECHO_C" >&6 +if test "${bakefile_cv_c_compiler___HP_cc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14710,7 +17488,7 @@ int main () { - #ifndef __HP_aCC + #ifndef __HP_cc choke me #endif @@ -14727,7 +17505,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14739,31 +17518,31 @@ 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_c_compiler___HP_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_c_compiler___HP_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 - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then - :; HPCXX=yes +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 + ;; @@ -14771,15 +17550,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu OSF1) - 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 + 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 Compaq C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the Compaq C++ compiler... $ECHO_C" >&6 -if test "${bakefile_cv_cxx_compiler___DECCXX+set}" = set; then + echo "$as_me:$LINENO: checking whether we are using the Compaq C compiler" >&5 +echo $ECHO_N "checking whether we are using the Compaq C compiler... $ECHO_C" >&6 +if test "${bakefile_cv_c_compiler___DECC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14793,7 +17572,7 @@ int main () { - #ifndef __DECCXX + #ifndef __DECC choke me #endif @@ -14810,7 +17589,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14822,31 +17602,31 @@ 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___DECCXX=yes + bakefile_cv_c_compiler___DECC=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_cv_cxx_compiler___DECCXX=no +bakefile_cv_c_compiler___DECC=no fi 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 - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then - :; COMPAQCXX=yes +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 + ;; @@ -14854,15 +17634,15 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu SunOS) - 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 + 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_cxx_compiler___SUNPRO_CC+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_c_compiler___SUNPRO_C+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14876,7 +17656,7 @@ int main () { - #ifndef __SUNPRO_CC + #ifndef __SUNPRO_C choke me #endif @@ -14893,7 +17673,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -14905,31 +17686,31 @@ 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___SUNPRO_CC=yes + bakefile_cv_c_compiler___SUNPRO_C=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -bakefile_cv_cxx_compiler___SUNPRO_CC=no +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_cxx_compiler___SUNPRO_CC" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6 - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then - :; SUNCXX=yes +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 + ;; @@ -14938,527 +17719,328 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -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 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" -fi - - -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 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - AR=$ac_ct_AR -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 -echo "$as_me: error: ar is needed to build wxWidgets" >&2;} - { (exit 1); exit 1; }; } -fi - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -case ${INSTALL} in - /* ) # Absolute - ;; - ?:* ) # Drive letter, considered as absolute. - ;; - *) - INSTALL=`pwd`/${INSTALL} ;; -esac - - -case "${host}" in - - *-*-darwin* ) - INSTALL_PROGRAM="cp -fp" - INSTALL_DATA="cp -fp" - ;; - *) - ;; -esac - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -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 +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 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + # 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_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= fi -done -done - - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP="true" -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + ac_cpp_err=yes fi - - STRIP=$ac_ct_STRIP +if test -z "$ac_cpp_err"; then + : else - STRIP="$ac_cv_prog_STRIP" -fi + 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 -if test "$wxUSE_WINE" = "yes"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}wrc", so it can be a program name with args. -set dummy ${ac_tool_prefix}wrc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # 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_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_WINDRES="${ac_tool_prefix}wrc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + 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 -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - echo "$as_me:$LINENO: result: $WINDRES" >&5 -echo "${ECHO_T}$WINDRES" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + + done + ac_cv_prog_CPP=$CPP fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "wrc", so it can be a program name with args. -set dummy wrc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. + CPP=$ac_cv_prog_CPP else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + ac_cv_prog_CPP=$CPP +fi +echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_WINDRES="wrc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + # 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_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= fi -done -done - -fi -fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -echo "${ECHO_T}$ac_ct_WINDRES" >&6 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + ac_cpp_err=yes fi - - WINDRES=$ac_ct_WINDRES +if test -z "$ac_cpp_err"; then + : else - WINDRES="$ac_cv_prog_WINDRES" + 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 - RESCOMP="$WINDRES" -else - case "${host}" in - *-*-cygwin* | *-*-mingw32* ) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -set dummy ${ac_tool_prefix}windres; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # 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_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break fi -fi -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - echo "$as_me:$LINENO: result: $WINDRES" >&5 -echo "${ECHO_T}$WINDRES" >&6 +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: result: no" >&5 -echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } 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 + + +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + + +if test $ac_cv_c_compiler_gnu = yes; then + echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 +echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 +if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. + ac_pattern="Autoconf.*'x'" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +Autoconf TIOCGETP +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "$ac_pattern" >/dev/null 2>&1; then + ac_cv_prog_gcc_traditional=yes else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_WINDRES="windres" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done + ac_cv_prog_gcc_traditional=no +fi +rm -f conftest* + + if test $ac_cv_prog_gcc_traditional = no; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +Autoconf TCGETA +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "$ac_pattern" >/dev/null 2>&1; then + ac_cv_prog_gcc_traditional=yes fi +rm -f conftest* + + fi fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -echo "${ECHO_T}$ac_ct_WINDRES" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 +echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 +echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 + if test $ac_cv_prog_gcc_traditional = yes; then + CC="$CC -traditional" + fi fi - WINDRES=$ac_ct_WINDRES -else - WINDRES="$ac_cv_prog_WINDRES" -fi - RESCOMP="$WINDRES" - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +CXXFLAGS=${CXXFLAGS:=} + + + + 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 -n "$ac_tool_prefix"; then + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_DLLTOOL+set}" = set; then +if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -15467,7 +18049,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -15476,27 +18058,31 @@ done fi fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6 +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi + test -n "$CXX" && break + done fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -15505,7 +18091,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" + ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -15514,128 +18100,49 @@ done fi fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6 +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi - DLLTOOL=$ac_ct_DLLTOOL -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - - ;; - esac -fi - -echo "$as_me:$LINENO: checking if make is GNU make" >&5 -echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6 -if test "${wx_cv_prog_makeisgnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null | - egrep -s GNU > /dev/null); then - wx_cv_prog_makeisgnu="yes" - else - wx_cv_prog_makeisgnu="no" - fi - -fi -echo "$as_me:$LINENO: result: $wx_cv_prog_makeisgnu" >&5 -echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6 - -if test "x$wx_cv_prog_makeisgnu" = "xyes"; then - IF_GNU_MAKE="" -else - IF_GNU_MAKE="#" -fi - - - -if test "x$wx_cv_prog_makeisgnu" != "xyes"; then -echo "$as_me:$LINENO: checking if make supports VPATH" >&5 -echo $ECHO_N "checking if make supports VPATH... $ECHO_C" >&6 -if test "${wx_cv_prog_makevpath+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cat - << EOF > confMake -check : file - cp \$? \$@ - cp \$? final_file -EOF - -if test ! -d sub ; then - mkdir sub -fi -echo dummy > sub/file -${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null -RESULT=$? -rm -f sub/file check final_file confMake -rmdir sub -if test "$RESULT" = 0; then - wx_cv_prog_makevpath="yes" -else - wx_cv_prog_makevpath="no" -fi - -fi -echo "$as_me:$LINENO: result: $wx_cv_prog_makevpath" >&5 -echo "${ECHO_T}$wx_cv_prog_makevpath" >&6 + test -n "$ac_ct_CXX" && break +done +test -n "$ac_ct_CXX" || ac_ct_CXX="g++" -if test "x$wx_cv_prog_makevpath" != "xyes"; then -{ { echo "$as_me:$LINENO: error: -You need a make-utility that is able to use the variable -VPATH correctly. -If your version of make does not support VPATH correctly, -please install GNU-make (possibly as gmake), and start -configure with the following command: -export MAKE=gmake; ./configure for sh-type shells -setenv MAKE gmake; ./configure for csh-type shells -Also please do remember to use gmake in this case every time -you are trying to compile. -" >&5 -echo "$as_me: error: -You need a make-utility that is able to use the variable -VPATH correctly. -If your version of make does not support VPATH correctly, -please install GNU-make (possibly as gmake), and start -configure with the following command: -export MAKE=gmake; ./configure for sh-type shells -setenv MAKE gmake; ./configure for csh-type shells -Also please do remember to use gmake in this case every time -you are trying to compile. -" >&2;} - { (exit 1); exit 1; }; } -fi fi -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + CXX=$ac_ct_CXX fi +# Provide some information about the compiler. +echo "$as_me:$LINENO:" \ + "checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } - -if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then - CXXFLAGS="-qunique $CXXFLAGS" -fi - -case "${host}" in - powerpc-*-darwin* ) - echo "$as_me:$LINENO: checking if __POWERPC__ is already defined" >&5 -echo $ECHO_N "checking if __POWERPC__ is already defined... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +if test "${ac_cv_cxx_compiler_gnu+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 @@ -15645,8 +18152,8 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __POWERPC__ - choke me for lack of PowerPC +#ifndef __GNUC__ + choke me #endif ; @@ -15662,7 +18169,8 @@ 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_cxx_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=$? @@ -15674,35 +18182,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 + ac_compiler_gnu=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 - cat >>confdefs.h <<\_ACEOF -#define __POWERPC__ 1 -_ACEOF - - +ac_compiler_gnu=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ;; -esac +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu -case "${host}" in - *-*-darwin* ) - echo "$as_me:$LINENO: checking if CoreFoundation/CFBase.h is usable" >&5 -echo $ECHO_N "checking if CoreFoundation/CFBase.h is usable... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF +fi +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +GXX=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cxx_g+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 () @@ -15721,7 +18228,8 @@ 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_cxx_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=$? @@ -15733,29 +18241,52 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 + ac_cv_prog_cxx_g=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 - echo "$as_me:$LINENO: checking if __CF_USE_FRAMEWORK_INCLUDES__ is required" >&5 -echo $ECHO_N "checking if __CF_USE_FRAMEWORK_INCLUDES__ is required... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF +ac_cv_prog_cxx_g=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define __CF_USE_FRAMEWORK_INCLUDES__ -#include - +$ac_declaration +#include int main () { - +exit (42); ; return 0; } @@ -15769,7 +18300,8 @@ 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_cxx_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=$? @@ -15781,575 +18313,304 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 - CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS" + : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: no. CoreFoundation not available. -See \`config.log' for more details." >&5 -echo "$as_me: error: no. CoreFoundation not available. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - - +continue fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ;; -esac - -case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - 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 "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then - echo "$as_me:$LINENO: checking for drand48 in -lcExt" >&5 -echo $ECHO_N "checking for drand48 in -lcExt... $ECHO_C" >&6 -if test "${ac_cv_lib_cExt_drand48+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcExt $LIBS" -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. */ - -/* 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 drand48 (); +$ac_declaration int main () { -drand48 (); +exit (42); ; 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 +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' + { 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' + { 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_lib_cExt_drand48=yes + break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_cExt_drand48=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_cExt_drand48" >&5 -echo "${ECHO_T}$ac_cv_lib_cExt_drand48" >&6 -if test $ac_cv_lib_cExt_drand48 = yes; then - LIBS="$LIBS -lcExt" +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h fi - else - RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" - fi - echo "$as_me:$LINENO: checking for gcc/libc version" >&5 -echo $ECHO_N "checking for gcc/libc version... $ECHO_C" >&6 -if test "${wx_cv_gccversion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test "$cross_compiling" = yes; then - wx_cv_gccversion="EMX2" - -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_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 - int main() - { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, - #if (__GNUC__ < 3) - "EMX2" - #elif (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2))) - "EMX3" - #elif (__GNUC__==3) && (__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__==2) - "Innotek5" - #else - "Innotek6" - #endif - ); - exit(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 - wx_cv_gccversion=`cat conftestval` -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_gccversion="EMX2" -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_gccversion" >&5 -echo "${ECHO_T}$wx_cv_gccversion" >&6 - 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 - if test "$wx_cv_gccversion" = "EMX2"; then - LIBS="$LIBS -lstdcpp" - LDFLAGS="$LDFLAGS -Zsysv-signals" - else - if test "$wx_cv_gccversion" = "EMX3"; then - LIBS="$LIBS -lstdcxx -lgcc" - LDFLAGS="$LDFLAGS -Zsysv-signals" - else - LIBS="$LIBS -lstdc++" - fi - fi - if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then - { echo "$as_me:$LINENO: WARNING: Building DLLs requires OMF mode, enabled" >&5 -echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;} - wxUSE_OMF=yes - enable_omf=yes - fi - ;; - *) - - echo "$as_me:$LINENO: checking for strcasecmp() in string.h" >&5 -echo $ECHO_N "checking for strcasecmp() in string.h... $ECHO_C" >&6 -if test "${ac_cv_string_strcasecmp+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 () -{ - - strcasecmp("foo", "bar"); - - ; - 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 - ac_cv_string_strcasecmp=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_string_strcasecmp=no - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $ac_cv_string_strcasecmp" >&5 -echo "${ECHO_T}$ac_cv_string_strcasecmp" >&6 - - if test x"$ac_cv_string_strcasecmp" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRCASECMP_IN_STRING_H 1 -_ACEOF - - else - echo "$as_me:$LINENO: checking for strcasecmp() in strings.h" >&5 -echo $ECHO_N "checking for strcasecmp() in strings.h... $ECHO_C" >&6 -if test "${ac_cv_strings_strcasecmp+set}" = set; then + echo "$as_me:$LINENO: checking whether we are using the Intel C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the Intel C++ compiler... $ECHO_C" >&6 +if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF + 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 () { - strcasecmp("foo", "bar"); + #ifndef __INTEL_COMPILER + choke me + #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 +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' + { 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' + { 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_strings_strcasecmp=yes + bakefile_cv_cxx_compiler___INTEL_COMPILER=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_strings_strcasecmp=no - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $ac_cv_strings_strcasecmp" >&5 -echo "${ECHO_T}$ac_cv_strings_strcasecmp" >&6 - - if test x"$ac_cv_strings_strcasecmp" = "xyes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRCASECMP_IN_STRINGS_H 1 -_ACEOF - - else - { { echo "$as_me:$LINENO: error: No case-insensitive string comparison function found." >&5 -echo "$as_me: error: No case-insensitive string comparison function found." >&2;} - { (exit 1); exit 1; }; } - fi - fi - - ;; -esac - +bakefile_cv_cxx_compiler___INTEL_COMPILER=no -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 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - # 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 +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 - # 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. + if test "x$GCXX" != "xyes"; then + if test "xCXX" = "xC"; then + echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5 +echo $ECHO_N "checking if the C compiler requires -ext o... $ECHO_C" >&6 +if test "${bakefile_cv_c_exto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error + +int +main () +{ + + ; + return 0; +} _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 conftest.$ac_ext.o +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 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 + (exit $ac_status); }; then + for ac_file in `(ls conftest.* 2>/dev/null)`; do + case $ac_file in + conftest.$ac_ext.o) + bakefile_cv_c_exto="-ext o" + ;; + *) + ;; + esac +done else - ac_cpp_err=yes + { { echo "$as_me:$LINENO: error: cannot figure out if compiler needs -ext o: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot figure out if compiler needs -ext o: cannot compile +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + 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 +rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $bakefile_cv_c_exto" >&5 +echo "${ECHO_T}$bakefile_cv_c_exto" >&6 +if test "x$bakefile_cv_c_exto" '!=' "x"; then + if test "c" = "c"; then + CFLAGS="$bakefile_cv_c_exto $CFLAGS" + fi + if test "c" = "cxx"; then + CXXFLAGS="$bakefile_cv_c_exto $CXXFLAGS" + fi fi -rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. + if test "x$bakefile_cv_c_exto" '!=' "x"; then + unset ac_cv_prog_cc_g + ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +CFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_g+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; +} _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_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 + (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_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break +ac_cv_prog_cc_g=no 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 - : +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi 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; }; } + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi + fi + fi -ac_ext=cc + case `uname -s` in + AIX*) + + + 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 for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then + 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -16358,15 +18619,15 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include -#include -#include int main () { + #ifndef __xlC__ + choke me + #endif + ; return 0; } @@ -16380,7 +18641,8 @@ 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_cxx_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=$? @@ -16392,61 +18654,48 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_header_stdc=yes + bakefile_cv_cxx_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no +bakefile_cv_cxx_compiler___xlC__=no + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - 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 "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no fi -rm -f conftest* +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 -fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - 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 "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* + ;; -fi + Darwin) -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : + + 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 $ECHO_N "checking whether we are using the Metrowerks C++ compiler... $ECHO_C" >&6 +if test "${bakefile_cv_cxx_compiler___MWERKS__+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -16454,81 +18703,79 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main () { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + + #ifndef __MWERKS__ + choke me + #endif + + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +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='./conftest$ac_exeext' + (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___MWERKS__=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +bakefile_cv_cxx_compiler___MWERKS__=no fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +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_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 ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.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 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -16537,9 +18784,18 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +int +main () +{ + + #ifndef __xlC__ + choke me + #endif + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -16550,7 +18806,8 @@ 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_cxx_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=$? @@ -16562,51 +18819,67 @@ 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" + bakefile_cv_cxx_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" +bakefile_cv_cxx_compiler___xlC__=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: $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 -done + ;; -for ac_header in stdlib.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 + IRIX*) + + + 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 SGI C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the SGI C++ compiler... $ECHO_C" >&6 +if test "${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -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> + +int +main () +{ + + #ifndef _SGI_COMPILER_VERSION + choke me + #endif + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -16617,7 +18890,8 @@ 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_cxx_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=$? @@ -16629,133 +18903,151 @@ 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 + bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION=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 + +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 + + + + ;; + + Linux*) + + + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + echo "$as_me:$LINENO: checking whether we are using the Sun C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6 +if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> + +int +main () +{ + + #ifndef __SUNPRO_CC + choke me + #endif + + ; + return 0; +} _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_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 + (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___SUNPRO_CC=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: $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 +bakefile_cv_cxx_compiler___SUNPRO_CC=no fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +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 -done -for ac_header in malloc.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 + ;; + + 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 -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> + +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 @@ -16766,7 +19058,8 @@ 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_cxx_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=$? @@ -16778,133 +19071,151 @@ 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 + bakefile_cv_cxx_compiler___HP_aCC=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +bakefile_cv_cxx_compiler___HP_aCC=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 + +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 + + + + ;; + + OSF1) + + + 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 Compaq C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the Compaq C++ compiler... $ECHO_C" >&6 +if test "${bakefile_cv_cxx_compiler___DECCXX+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> + +int +main () +{ + + #ifndef __DECCXX + choke me + #endif + + ; + return 0; +} _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_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 + (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___DECCXX=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: $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 +bakefile_cv_cxx_compiler___DECCXX=no fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +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 -done -for ac_header in unistd.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 + ;; + + SunOS) + + + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + echo "$as_me:$LINENO: checking whether we are using the Sun C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6 +if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -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> + +int +main () +{ + + #ifndef __SUNPRO_CC + choke me + #endif + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -16915,7 +19226,8 @@ 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_cxx_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=$? @@ -16927,284 +19239,415 @@ 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 + bakefile_cv_cxx_compiler___SUNPRO_CC=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +bakefile_cv_cxx_compiler___SUNPRO_CC=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 + +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 + + + + ;; + esac + fi + + + +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 "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 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cpp_err=yes + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi - 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: $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 +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=\$ac_header_preproc" + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="ar" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + AR=$ac_ct_AR +else + AR="$ac_cv_prog_AR" fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + 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 -done +retest_macosx_linking=no + +#if test "$wxUSE_MAC" = 1; then + if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then + if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then + # Implicitly turn on the new --with-macosx-sdk using the default + # SDK which provides the behavior this option has always had. + if test "x$wxUSE_MACOSX_SDK" = "x"; then + { echo "$as_me:$LINENO: WARNING: Enabling default SDK due to --enable-universal_binary." >&5 +echo "$as_me: WARNING: Enabling default SDK due to --enable-universal_binary." >&2;} + { echo "$as_me:$LINENO: WARNING: If you don't want this, specify --without-macosx-sdk" >&5 +echo "$as_me: WARNING: If you don't want this, specify --without-macosx-sdk" >&2;} + wxUSE_MACOSX_SDK=yes + fi + else + # Complain to user if he specified an argument to --enable-universal_binary + # and also 1) specified --with-macosx-sdk using the default (yes) or + # 2) specified --with-macosx-sdk using a path or 3) specified + # --without-macosx-sdk (no). + if test "x$wxUSE_MACOSX_SDK" != "x" ; then + { { echo "$as_me:$LINENO: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary +See \`config.log' for more details." >&5 +echo "$as_me: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else + # Put the SDK path into the wxUSE_MACOSX_SDK. We don't have to + # special-case the empty string because the below test simply + # converts "no" to the empty string anyway. + wxUSE_MACOSX_SDK="$wxUSE_UNIVERSAL_BINARY" + { echo "$as_me:$LINENO: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&5 +echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;} + fi + fi + OSX_UNIV_OPTS="-arch ppc -arch i386" + CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS" + CFLAGS="$OSX_UNIV_OPTS $CFLAGS" + LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS" + retest_macosx_linking=yes + { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5 +echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} + bk_use_pch=no + fi +#fi -for ac_header in 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 $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 +if test "x$wxUSE_MACOSX_SDK" = "xno"; then + wxUSE_MACOSX_SDK= +elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then + # TODO: Search for most recent SDK and use it. + wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk" 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 + + +if test "x$wxUSE_MACOSX_SDK" != "x"; then + echo "$as_me:$LINENO: checking for SDK directory $wxUSE_MACOSX_SDK" >&5 +echo $ECHO_N "checking for SDK directory $wxUSE_MACOSX_SDK... $ECHO_C" >&6 + if ! test -d "$wxUSE_MACOSX_SDK"; then + { { echo "$as_me:$LINENO: error: not found +See \`config.log' for more details." >&5 +echo "$as_me: error: not found +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else + echo "$as_me:$LINENO: result: exists" >&5 +echo "${ECHO_T}exists" >&6 + fi + MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" + eval "CC=\"$CC $MACOSX_SDK_OPTS\"" + eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" + eval "LD=\"$LD $MACOSX_SDK_OPTS\"" + retest_macosx_linking=yes + fi + +if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then + wxUSE_MACOSX_VERSION_MIN= +elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then + if test "x$wxUSE_MACOSX_SDK" != "x"; then + echo "$as_me:$LINENO: checking SDK deployment version" >&5 +echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6 + + MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` + + # If that failed, try again with the new key + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then + + MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` + + fi + + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then + wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN + echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5 +echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6 + else + { echo "$as_me:$LINENO: WARNING: Could not determine deployment target from SDKSettings.plist" >&5 +echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;} + wxUSE_MACOSX_VERSION_MIN= + fi + else + wxUSE_MACOSX_VERSION_MIN= + fi +fi + +if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then + MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" + eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\"" + eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\"" + eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\"" + retest_macosx_linking=yes +fi + +if test "x$retest_macosx_linking" = "xyes"; then + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + echo "$as_me:$LINENO: checking if C compiler works with SDK/version options" >&5 +echo $ECHO_N "checking if C compiler works with SDK/version options... $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> + +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 +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' + { 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' + { 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_header_compiler=yes + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +{ { echo "$as_me:$LINENO: error: no. Try a different SDK +See \`config.log' for more details." >&5 +echo "$as_me: error: no. Try a different SDK +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; exit 1 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 +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 -# 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 + + 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 if C++ compiler works with SDK/version options" >&5 +echo $ECHO_N "checking if C++ compiler works with SDK/version options... $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> + +int +main () +{ + + ; + return 0; +} _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 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); } >/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 + (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 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - 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: $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" +{ { echo "$as_me:$LINENO: error: no. Try a different SDK +See \`config.log' for more details." >&5 +echo "$as_me: error: no. Try a different SDK +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; exit 1 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +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 -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 +case "${host}" in + *-*-darwin* ) + INSTALL_PROGRAM="cp -fp" + INSTALL_DATA="cp -fp" + ;; + *) + ;; +esac -if test "$ac_cv_header_wchar_h" != "yes"; then -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 - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then + CXXFLAGS="-qunique $CXXFLAGS" 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 + +case "${host}" in + powerpc-*-darwin* ) + echo "$as_me:$LINENO: checking if __POWERPC__ is already defined" >&5 +echo $ECHO_N "checking if __POWERPC__ is already defined... $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> + +int +main () +{ +#ifndef __POWERPC__ + choke me for lack of PowerPC +#endif + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -17215,7 +19658,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -17227,135 +19671,92 @@ 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 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + cat >>confdefs.h <<\_ACEOF +#define __POWERPC__ 1 +_ACEOF + + 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 + ;; +esac -# 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 +case "${host}" in + *-*-darwin* ) + echo "$as_me:$LINENO: checking if CoreFoundation/CFBase.h is usable" >&5 +echo $ECHO_N "checking if CoreFoundation/CFBase.h is usable... $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> +#include + +int +main () +{ + + ; + return 0; +} _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_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 + (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 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - 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: $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 - - -for ac_header in fnmatch.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 +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + echo "$as_me:$LINENO: checking if __CF_USE_FRAMEWORK_INCLUDES__ is required" >&5 +echo $ECHO_N "checking if __CF_USE_FRAMEWORK_INCLUDES__ is required... $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> +#define __CF_USE_FRAMEWORK_INCLUDES__ +#include + +int +main () +{ + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -17366,7 +19767,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -17378,549 +19780,481 @@ 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 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +{ { echo "$as_me:$LINENO: error: no. CoreFoundation not available. +See \`config.log' for more details." >&5 +echo "$as_me: error: no. CoreFoundation not available. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + 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 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ;; +esac + +wants_win32=0 +doesnt_want_win32=0 +case "${host}" in + *-*-cygwin*) + if test "$wxUSE_MSW" = 1 ; then + wants_win32=1 + else + echo "$as_me:$LINENO: checking if -mno-cygwin is in effect" >&5 +echo $ECHO_N "checking if -mno-cygwin is in effect... $ECHO_C" >&6 +if test "${wx_cv_nocygwin+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> + +int +main () +{ + + #ifdef __MINGW32__ + choke me + #endif + + ; + return 0; +} _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_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 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + wx_cv_nocygwin=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +wx_cv_nocygwin=yes + 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: $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: $wx_cv_nocygwin" >&5 +echo "${ECHO_T}$wx_cv_nocygwin" >&6 + + if test "$wx_cv_nocygwin" = "yes"; then + wants_win32=1 + else + doesnt_want_win32=1 + fi + fi + if test "$wants_win32" = 1 ; then + BAKEFILE_FORCE_PLATFORM=win32 + fi + ;; + *-*-mingw*) + wants_win32=1 + ;; +esac +if test "$wxUSE_WINE" = "yes"; then + wants_win32=1 + LDFLAGS_GUI="-mwindows" 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 "$wants_win32" = 1 ; then + USE_UNIX=0 + USE_WIN32=1 + cat >>confdefs.h <<\_ACEOF +#define __WIN32__ 1 _ACEOF -fi + cat >>confdefs.h <<\_ACEOF +#define __WIN95__ 1 +_ACEOF -done + cat >>confdefs.h <<\_ACEOF +#define __WINDOWS__ 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define __GNUWIN32__ 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define STRICT 1 +_ACEOF -for ac_header in langinfo.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 +if test "$doesnt_want_win32" = 1 ; then + USE_UNIX=1 + USE_WIN32=0 +fi + +if test "$USE_UNIX" = 1 ; then + wxUSE_UNIX=yes + cat >>confdefs.h <<\_ACEOF +#define __UNIX__ 1 +_ACEOF + +fi + +case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then + echo "$as_me:$LINENO: checking for drand48 in -lcExt" >&5 +echo $ECHO_N "checking for drand48 in -lcExt... $ECHO_C" >&6 +if test "${ac_cv_lib_cExt_drand48+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&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 + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcExt $LIBS" 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> + +/* 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 drand48 (); +int +main () +{ +drand48 (); + ; + 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 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' + { 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' + { 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_header_compiler=yes + ac_cv_lib_cExt_drand48=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_lib_cExt_drand48=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_cExt_drand48" >&5 +echo "${ECHO_T}$ac_cv_lib_cExt_drand48" >&6 +if test $ac_cv_lib_cExt_drand48 = yes; then + LIBS="$LIBS -lcExt" 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 + else + RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" + fi + echo "$as_me:$LINENO: checking for gcc/libc version" >&5 +echo $ECHO_N "checking for gcc/libc version... $ECHO_C" >&6 +if test "${wx_cv_gccversion+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test "$cross_compiling" = yes; then + wx_cv_gccversion="EMX2" + +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 + + int main() + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, + #if (__GNUC__ < 3) + "EMX2" + #elif (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2))) + "EMX3" + #elif (__GNUC__==3) && (__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__==2) + "Innotek5" + #else + "Innotek6" + #endif + ); + exit(0); + } + _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_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 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 + (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_gccversion=`cat conftestval` else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +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: $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" +( exit $ac_status ) +wx_cv_gccversion="EMX2" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 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 - - -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" +echo "$as_me:$LINENO: result: $wx_cv_gccversion" >&5 +echo "${ECHO_T}$wx_cv_gccversion" >&6 + if test "$wx_cv_gccversion" = "EMX2"; then + LIBS="$LIBS -lstdcpp" + LDFLAGS="$LDFLAGS -Zsysv-signals" + else + if test "$wx_cv_gccversion" = "EMX3"; then + LIBS="$LIBS -lstdcxx -lgcc" + LDFLAGS="$LDFLAGS -Zsysv-signals" + else + LIBS="$LIBS -lstdc++" + fi fi - ;; -esac - -if test "$USE_UNIX" = 1 ; then + if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then + { echo "$as_me:$LINENO: WARNING: Building DLLs requires OMF mode, enabled" >&5 +echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;} + wxUSE_OMF=yes + enable_omf=yes + fi + ;; + *) -for ac_header in sys/select.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 strcasecmp() in string.h" >&5 +echo $ECHO_N "checking for strcasecmp() in string.h... $ECHO_C" >&6 +if test "${ac_cv_string_strcasecmp+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 + +int +main () +{ + + strcasecmp("foo", "bar"); + + ; + 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 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' + { 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' + { 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_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_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 + ac_cv_string_strcasecmp=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: $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 +ac_cv_string_strcasecmp=no fi - -done +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_string_strcasecmp" >&5 +echo "${ECHO_T}$ac_cv_string_strcasecmp" >&6 + if test x"$ac_cv_string_strcasecmp" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STRCASECMP_IN_STRING_H 1 +_ACEOF -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then + else + echo "$as_me:$LINENO: checking for strcasecmp() in strings.h" >&5 +echo $ECHO_N "checking for strcasecmp() in strings.h... $ECHO_C" >&6 +if test "${ac_cv_strings_strcasecmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + #include + int main () { -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - *t++ = 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif + strcasecmp("foo", "bar"); ; 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 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' + { 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' + { 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_c_const=yes + ac_cv_strings_strcasecmp=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_const=no +ac_cv_strings_strcasecmp=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: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then +echo "$as_me:$LINENO: result: $ac_cv_strings_strcasecmp" >&5 +echo "${ECHO_T}$ac_cv_strings_strcasecmp" >&6 -cat >>confdefs.h <<\_ACEOF -#define const + if test x"$ac_cv_strings_strcasecmp" = "xyes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STRCASECMP_IN_STRINGS_H 1 _ACEOF -fi + else + { { echo "$as_me:$LINENO: error: No case-insensitive string comparison function found." >&5 +echo "$as_me: error: No case-insensitive string comparison function found." >&2;} + { (exit 1); exit 1; }; } + fi + fi -echo "$as_me:$LINENO: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${ac_cv_c_inline+set}" = set; then + ;; +esac + + +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif +#include +#include +#include +#include + +int +main () +{ + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -17931,7 +20265,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -17943,40 +20278,61 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break + ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_header_stdc=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + 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 "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no fi -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 +rm -f conftest* +fi -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF - ;; -esac +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* +fi -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 $ECHO_N "(cached) $ECHO_C" >&6 +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -17984,79 +20340,92 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) int main () { -if ((char *) 0) - return 0; -if (sizeof (char)) - return 0; - ; - return 0; + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (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 +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='test -s conftest.$ac_objext' + (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_type_char=yes + : else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_char=no +( exit $ac_status ) +ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + fi -echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 -echo "${ECHO_T}$ac_cv_type_char" >&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 +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.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 $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_char" = 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 + 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 (char))) >= 0)]; -test_array [0] = 0 - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -18067,7 +20436,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18079,24 +20449,50 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f 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 + +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` +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 + 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 (char))) <= $ac_mid)]; -test_array [0] = 0 - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -18107,7 +20503,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18119,40 +20516,46 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_hi=$ac_mid; break + eval "$as_ac_Header=yes" 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` +eval "$as_ac_Header=no" 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 +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 -cat >conftest.$ac_ext <<_ACEOF +fi + +done + + +if test "$ac_cv_header_wchar_h" != "yes"; then + +for ac_header in wcstr.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 $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 () -{ -static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)]; -test_array [0] = 0 - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -18163,7 +20566,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18175,24 +20579,58 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f 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 + +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 +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 $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 () -{ -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)]; -test_array [0] = 0 - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -18203,7 +20641,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18215,44 +20654,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_lo=$ac_mid; break + eval "$as_ac_Header=yes" 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` +eval "$as_ac_Header=no" 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 +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 -ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +done + 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` + + +echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +if test "${ac_cv_c_const+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 () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; -test_array [0] = 0 +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } +#endif ; return 0; @@ -18267,7 +20752,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18279,104 +20765,95 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_hi=$ac_mid + ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` +ac_cv_c_const=no 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 -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char), 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; }; } +fi +echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 +if test $ac_cv_c_const = no; then + +cat >>confdefs.h <<\_ACEOF +#define const +_ACEOF + +fi + +echo "$as_me:$LINENO: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6 +if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; 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 -long longval () { return (long) (sizeof (char)); } -unsigned long ulongval () { return (long) (sizeof (char)); } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); - if (((long) (sizeof (char))) < 0) - { - long i = longval (); - if (i != ((long) (sizeof (char)))) - exit (1); - fprintf (f, "%ld\n", i); - } - else - { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (char)))) - exit (1); - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif - ; - return 0; -} _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +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='./conftest$ac_exeext' + (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_sizeof_char=`cat conftest.val` + ac_cv_c_inline=$ac_kw; break else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&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 -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char), 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_char=0 fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done + fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 -echo "${ECHO_T}$ac_cv_sizeof_char" >&6 -cat >>confdefs.h <<_ACEOF -#define SIZEOF_CHAR $ac_cv_sizeof_char +echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6 + + +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif _ACEOF + ;; +esac echo "$as_me:$LINENO: checking for short" >&5 @@ -18411,7 +20888,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18473,7 +20951,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18513,7 +20992,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18569,7 +21049,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18609,7 +21090,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18673,7 +21155,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18704,8 +21187,10 @@ See \`config.log' for more details." >&2;} 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;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -18817,7 +21302,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18879,7 +21365,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18919,7 +21406,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -18975,7 +21463,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19015,7 +21504,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19079,7 +21569,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19110,8 +21601,10 @@ See \`config.log' for more details." >&2;} 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;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -19223,7 +21716,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19285,7 +21779,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19325,7 +21820,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19381,7 +21877,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19421,7 +21918,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19485,7 +21983,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19516,8 +22015,10 @@ See \`config.log' for more details." >&2;} 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;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -19629,7 +22130,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19691,7 +22193,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19731,7 +22234,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19787,7 +22291,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19827,7 +22332,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19891,7 +22397,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -19922,8 +22429,10 @@ See \`config.log' for more details." >&2;} 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;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -20035,7 +22544,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20097,7 +22607,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20137,7 +22648,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20193,7 +22705,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20233,7 +22746,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20297,7 +22811,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20328,8 +22843,10 @@ See \`config.log' for more details." >&2;} 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;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -20444,7 +22961,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20506,7 +23024,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20546,7 +23065,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20602,7 +23122,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20642,7 +23163,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20706,7 +23228,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20737,8 +23260,10 @@ See \`config.log' for more details." >&2;} 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;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -20852,7 +23377,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20914,7 +23440,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -20954,7 +23481,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21010,7 +23538,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21050,7 +23579,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21114,7 +23644,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21145,8 +23676,10 @@ See \`config.log' for more details." >&2;} 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;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -21263,7 +23796,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21325,7 +23859,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21365,7 +23900,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21421,7 +23957,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21461,7 +23998,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21525,7 +24063,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21556,8 +24095,10 @@ See \`config.log' for more details." >&2;} 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;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -21688,7 +24229,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21767,7 +24309,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21824,7 +24367,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21897,7 +24441,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -21954,7 +24499,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -22035,7 +24581,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -22066,8 +24613,10 @@ See \`config.log' for more details." >&2;} 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;} + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -22176,6 +24725,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 @@ -22202,7 +24757,8 @@ 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_cxx_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=$? @@ -22224,6 +24780,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 @@ -22301,12 +24863,20 @@ _ACEOF fi fi +if test "$wxUSE_VARARG_MACROS" = "yes"; then + echo "$as_me:$LINENO: checking whether the compiler supports variadic macros" >&5 echo $ECHO_N "checking whether the compiler supports variadic macros... $ECHO_C" >&6 if test "${wx_cv_have_variadic_macros+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 @@ -22337,7 +24907,8 @@ 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_cxx_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=$? @@ -22358,6 +24929,12 @@ wx_cv_have_variadic_macros=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi @@ -22371,6 +24948,7 @@ _ACEOF fi +fi # Check whether --enable-largefile or --disable-largefile was given. if test "${enable_largefile+set}" = set; then enableval="$enable_largefile" @@ -22413,7 +24991,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -22483,7 +25062,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -22543,6 +25123,12 @@ if test "${wx_cv_STDC_EXT_required+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 @@ -22571,7 +25157,8 @@ 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_cxx_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=$? @@ -22592,6 +25179,12 @@ wx_cv_STDC_EXT_required=yes 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 @@ -22635,7 +25228,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -22679,7 +25273,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -22744,7 +25339,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -22816,7 +25412,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -22857,7 +25454,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -22956,25 +25554,19 @@ 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 "$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 @@ -22986,7 +25578,8 @@ 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_cxx_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=$? @@ -22998,100 +25591,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 + 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 - -# 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 - -# 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 @@ -23111,11 +25621,11 @@ _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 + 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 @@ -23164,7 +25674,8 @@ 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_cxx_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=$? @@ -23190,11 +25701,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - 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 + 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 @@ -23253,7 +25764,8 @@ 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_cxx_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=$? @@ -23296,7 +25808,8 @@ 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_cxx_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=$? @@ -23327,11 +25840,11 @@ wx_cv_explicit=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - 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 + 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 @@ -23383,7 +25896,8 @@ 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_cxx_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=$? @@ -23403,11 +25917,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_cxx_const_cast=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - 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 + 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 @@ -23463,7 +25977,8 @@ 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_cxx_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=$? @@ -23483,11 +25998,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_cxx_reinterpret_cast=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - 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 + 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 @@ -23542,7 +26057,8 @@ 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_cxx_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=$? @@ -23562,11 +26078,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_cxx_static_cast=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - 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 + 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 @@ -23607,6 +26123,13 @@ if test "x$COMPAQCXX" = "xyes"; then CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit" 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_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then if test "$wxUSE_UNICODE" = "yes"; then std_string="std::wstring" @@ -23618,7 +26141,11 @@ if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then echo "$as_me:$LINENO: checking for $std_string in " >&5 echo $ECHO_N "checking for $std_string in ... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF +if test "${wx_cv_class_stdstring+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23642,7 +26169,8 @@ 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_cxx_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=$? @@ -23654,44 +26182,59 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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_STD_WSTRING 1 -_ACEOF - + wx_cv_class_stdstring=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 - echo "$as_me:$LINENO: checking if std::basic_string<$char_type> works" >&5 +wx_cv_class_stdstring=no + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +echo "$as_me:$LINENO: result: $wx_cv_class_stdstring" >&5 +echo "${ECHO_T}$wx_cv_class_stdstring" >&6 + + if test "$wx_cv_class_stdstring" = yes; then + if test "$wxUSE_UNICODE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_WSTRING 1 +_ACEOF + + fi + else + echo "$as_me:$LINENO: checking if std::basic_string<$char_type> works" >&5 echo $ECHO_N "checking if std::basic_string<$char_type> works... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF +if test "${wx_cv_class_stdbasicstring+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #ifdef HAVE_WCHAR_H - # ifdef __CYGWIN__ - # include - # endif - # include - #endif - #ifdef HAVE_STDLIB_H - # include - #endif - #include - #include + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + #include int main () { std::basic_string<$char_type> foo; - const $char_type* dummy = foo.c_str(); + const $char_type* dummy = foo.c_str(); ; return 0; } @@ -23705,7 +26248,8 @@ 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_cxx_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=$? @@ -23717,34 +26261,37 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 + wx_cv_class_stdbasicstring=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 - if test "$wxUSE_STL" = "yes"; then - { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5 -echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;} - { (exit 1); exit 1; }; } - elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then - { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5 -echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5 -echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;} - wxUSE_STD_STRING=no - fi - +wx_cv_class_stdbasicstring=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $wx_cv_class_stdbasicstring" >&5 +echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6 + + if test "$wx_cv_class_stdbasicstring" != yes; then + if test "$wxUSE_STL" = "yes"; then + { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5 +echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;} + { (exit 1); exit 1; }; } + elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then + { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5 +echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5 +echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;} + wxUSE_STD_STRING=no + fi + fi + fi fi if test "$wxUSE_STD_IOSTREAM" = "yes"; then @@ -23781,7 +26328,8 @@ 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_cxx_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=$? @@ -23847,7 +26395,8 @@ 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_cxx_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=$? @@ -23897,25 +26446,28 @@ fi if test "$wxUSE_STL" = "yes"; then echo "$as_me:$LINENO: checking for basic STL functionality" >&5 echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF +if test "${wx_cv_lib_stl+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 - #include - #include - #include - #include + #include + #include + #include + #include int main () { std::vector moo; - std::list foo; - std::vector::iterator it = - std::find_if(moo.begin(), moo.end(), - std::bind2nd(std::less(), 3)); + std::list foo; + std::vector::iterator it = + std::find_if(moo.begin(), moo.end(), + std::bind2nd(std::less(), 3)); ; return 0; } @@ -23929,7 +26481,8 @@ 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_cxx_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=$? @@ -23941,23 +26494,32 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 + wx_cv_lib_stl=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 - { { echo "$as_me:$LINENO: error: Basic STL functionality missing" >&5 -echo "$as_me: error: Basic STL functionality missing" >&2;} - { (exit 1); exit 1; }; } +wx_cv_lib_stl=no + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5 +echo "${ECHO_T}$wx_cv_lib_stl" >&6 + + if test "$wx_cv_lib_stl" != yes; then + { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5 +echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missing" >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5 echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF +if test "${wx_cv_func_stdstring_compare+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 @@ -23968,12 +26530,12 @@ int main () { std::string foo, bar; - foo.compare(bar); - foo.compare(1, 1, bar); - foo.compare(1, 1, bar, 1, 1); - foo.compare(""); - foo.compare(1, 1, ""); - foo.compare(1, 1, "", 2); + foo.compare(bar); + foo.compare(1, 1, bar); + foo.compare(1, 1, bar, 1, 1); + foo.compare(""); + foo.compare(1, 1, ""); + foo.compare(1, 1, "", 2); ; return 0; } @@ -23987,7 +26549,8 @@ 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_cxx_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=$? @@ -23999,40 +26562,41 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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_STD_STRING_COMPARE 1 -_ACEOF - + wx_cv_func_stdstring_compare=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 +wx_cv_func_stdstring_compare=no + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - if test "${ac_cv_header_hash_map+set}" = set; then - echo "$as_me:$LINENO: checking for hash_map" >&5 +fi +echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5 +echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6 + + if test "$wx_cv_func_stdstring_compare" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_STRING_COMPARE 1 +_ACEOF + + fi + + 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 @@ -24044,7 +26608,8 @@ 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_cxx_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=$? @@ -24056,116 +26621,36 @@ 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 hash_map and hash_set" >&5 -echo $ECHO_N "checking for hash_map and hash_set... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF + 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 +if test "${wx_cv_class_stdhashmapset+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 - #include + #include int main () { std::hash_map, std::equal_to > test1; - std::hash_set, std::equal_to > test2; + std::hash_set, std::equal_to > test2; ; return 0; } @@ -24179,7 +26664,8 @@ 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_cxx_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=$? @@ -24191,48 +26677,48 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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_HASH_MAP 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define HAVE_STD_HASH_MAP 1 -_ACEOF - + wx_cv_class_stdhashmapset=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 +wx_cv_class_stdhashmapset=no fi 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 - if test "${ac_cv_header_ext_hash_map+set}" = set; then - echo "$as_me:$LINENO: checking for ext/hash_map" >&5 + if test "$wx_cv_class_stdhashmapset" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_HASH_MAP 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_HASH_MAP 1 +_ACEOF + + fi + + 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 @@ -24244,7 +26730,8 @@ 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_cxx_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=$? @@ -24256,116 +26743,36 @@ 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 hash_map and hash_set" >&5 -echo $ECHO_N "checking for hash_map and hash_set... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF + 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 +if test "${wx_cv_class_gnuhashmapset+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 - #include + #include int main () { __gnu_cxx::hash_map, std::equal_to > test1; - __gnu_cxx::hash_set, std::equal_to > test2; + __gnu_cxx::hash_set, std::equal_to > test2; ; return 0; } @@ -24379,7 +26786,8 @@ 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_cxx_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=$? @@ -24391,30 +26799,42 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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_EXT_HASH_MAP 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define HAVE_GNU_CXX_HASH_MAP 1 -_ACEOF - + wx_cv_class_gnuhashmapset=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 +wx_cv_class_gnuhashmapset=no fi 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 + + + + if test "$wx_cv_class_gnuhashmapset" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_EXT_HASH_MAP 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_GNU_CXX_HASH_MAP 1 +_ACEOF + fi 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 + + SEARCH_INCLUDE="\ /usr/local/include \ @@ -24482,7 +26902,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -24681,7 +27102,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -24798,7 +27220,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -24899,7 +27322,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -25012,7 +27436,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -25113,7 +27538,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -25157,157 +27583,251 @@ 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 -if test "$wxUSE_REGEX" != "no"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_REGEX 1 + for wx_func in wcstoull + 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. */ - if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then - { echo "$as_me:$LINENO: WARNING: Defaulting to the the builtin regex library for Unicode build." >&5 -echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode build." >&2;} - wxUSE_REGEX=builtin + $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 - 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 $ECHO_N "checking for regex.h... $ECHO_C" >&6 -if test "${ac_cv_header_regex_h+set}" = set; then +else + + for wx_func in strtoull + 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 -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 -/* confdefs.h. */ + + 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_includes_default + +int +main () +{ + + #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 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' + { 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' + { 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_header_compiler=yes + eval wx_cv_func_$wx_func=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +eval wx_cv_func_$wx_func=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 +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -# 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 +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=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 "$wxUSE_REGEX" != "no"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_REGEX 1 +_ACEOF + + + if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then + { echo "$as_me:$LINENO: WARNING: Defaulting to the the builtin regex library for Unicode build." >&5 +echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode build." >&2;} + wxUSE_REGEX=builtin + fi + + if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then + 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 + 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 +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_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 + (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_regex_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +ac_cv_header_regex_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_cxx_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 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 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 @@ -25379,7 +27899,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -25505,25 +28026,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 @@ -25535,7 +28050,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -25547,101 +28063,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 -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 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_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 + ac_cv_header_zlib_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +ac_cv_header_zlib_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_cxx_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 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 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 @@ -25686,7 +28119,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -25810,25 +28244,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 @@ -25840,7 +28268,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -25852,101 +28281,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_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: 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 @@ -25988,7 +28334,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -26034,8 +28381,6 @@ echo "$as_me: WARNING: system png library not found or too old, will use built-i fi fi fi - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" fi @@ -26088,7 +28433,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -26154,7 +28500,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -26197,6 +28544,529 @@ echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" fi else wxUSE_LIBJPEG=sys + + if test "$wxUSE_MSW" = 1; then + echo "$as_me:$LINENO: checking for boolean" >&5 +echo $ECHO_N "checking for boolean... $ECHO_C" >&6 +if test "${ac_cv_type_boolean+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 () +{ +if ((boolean *) 0) + return 0; +if (sizeof (boolean)) + 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_boolean=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_boolean=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5 +echo "${ECHO_T}$ac_cv_type_boolean" >&6 +if test $ac_cv_type_boolean = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_BOOLEAN 1 +_ACEOF + + + echo "$as_me:$LINENO: checking for boolean" >&5 +echo $ECHO_N "checking for boolean... $ECHO_C" >&6 +if test "${ac_cv_type_boolean+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. */ + + #undef HAVE_BOOLEAN + #include + #include + + +int +main () +{ +if ((boolean *) 0) + return 0; +if (sizeof (boolean)) + 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_boolean=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_boolean=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5 +echo "${ECHO_T}$ac_cv_type_boolean" >&6 + +echo "$as_me:$LINENO: checking size of boolean" >&5 +echo $ECHO_N "checking size of boolean... $ECHO_C" >&6 +if test "${ac_cv_sizeof_boolean+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$ac_cv_type_boolean" = 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. */ + + #undef HAVE_BOOLEAN + #include + #include + + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (boolean))) >= 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. */ + + #undef HAVE_BOOLEAN + #include + #include + + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (boolean))) <= $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. */ + + #undef HAVE_BOOLEAN + #include + #include + + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (boolean))) < 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. */ + + #undef HAVE_BOOLEAN + #include + #include + + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (boolean))) >= $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. */ + + #undef HAVE_BOOLEAN + #include + #include + + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (boolean))) <= $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_boolean=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (boolean), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (boolean), 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: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&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. */ + + #undef HAVE_BOOLEAN + #include + #include + + +long longval () { return (long) (sizeof (boolean)); } +unsigned long ulongval () { return (long) (sizeof (boolean)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (boolean))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (boolean)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (boolean)))) + 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_boolean=`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 (boolean), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (boolean), 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_boolean=0 +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_boolean" >&5 +echo "${ECHO_T}$ac_cv_sizeof_boolean" >&6 +cat >>confdefs.h <<_ACEOF +#define SIZEOF_BOOLEAN $ac_cv_sizeof_boolean +_ACEOF + + + cat >>confdefs.h <<_ACEOF +#define wxHACK_BOOLEAN wxInt`expr 8 \* $ac_cv_sizeof_boolean` +_ACEOF + + +fi + + fi fi fi fi @@ -26218,25 +29088,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 @@ -26248,7 +29113,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -26260,100 +29126,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_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: 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 @@ -26394,7 +29177,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -26424,7 +29208,6 @@ if test $ac_cv_lib_tiff_TIFFError = yes; then fi - fi @@ -26471,25 +29254,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 @@ -26501,7 +29278,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -26513,100 +29291,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_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: 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 @@ -26619,6 +29314,12 @@ if test "${wx_cv_expat_is_not_broken+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 @@ -26643,7 +29344,8 @@ 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_cxx_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=$? @@ -26664,6 +29366,12 @@ wx_cv_expat_is_not_broken=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi @@ -26708,7 +29416,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -26764,25 +29473,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 @@ -26794,7 +29497,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -26806,100 +29510,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_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: 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 @@ -26944,7 +29565,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -27000,172 +29622,21 @@ 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 "$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 -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 - 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_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: $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_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 @@ -27175,7 +29646,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -27187,100 +29659,74 @@ 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 windows.h presence" >&5 -echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF +fi + +done + + 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 _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_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 + (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 - -# 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: 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 +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 - -fi if test $ac_cv_header_windows_h = yes; then : else @@ -27322,9 +29768,9 @@ _ACEOF WIN32INSTALL=win32install - echo "$as_me:$LINENO: checking for boolean" >&5 -echo $ECHO_N "checking for boolean... $ECHO_C" >&6 -if test "${ac_cv_type_boolean+set}" = set; then + 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 cat >conftest.$ac_ext <<_ACEOF @@ -27333,85 +29779,9 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int -main () -{ -if ((boolean *) 0) - return 0; -if (sizeof (boolean)) - 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_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 - ac_cv_type_boolean=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_boolean=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5 -echo "${ECHO_T}$ac_cv_type_boolean" >&6 -if test $ac_cv_type_boolean = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_BOOLEAN 1 -_ACEOF - - -fi - - - -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 @@ -27422,7 +29792,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -27434,105 +29805,19 @@ 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_pbt_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no +ac_cv_header_pbt_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_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: $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 - +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 @@ -27540,7 +29825,6 @@ _ACEOF fi -done fi @@ -27566,8 +29850,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 @@ -27583,14 +29867,7 @@ echo "$as_me: WARNING: Drag Image and DandD not supported under wxCocoa yet, dis fi if test "$wxUSE_GTK" = 1; then - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - echo "$as_me:$LINENO: checking for GTK+ version" >&5 + echo "$as_me:$LINENO: checking for GTK+ version" >&5 echo $ECHO_N "checking for GTK+ version... $ECHO_C" >&6 gtk_version_cached=1 @@ -27613,7 +29890,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 @@ -27877,7 +30154,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -27922,11 +30200,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 @@ -28198,7 +30472,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28513,7 +30788,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28650,7 +30926,85 @@ 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_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_have_decl_gtk_icon_size_lookup=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_have_decl_gtk_icon_size_lookup=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_icon_size_lookup" >&5 +echo "${ECHO_T}$ac_cv_have_decl_gtk_icon_size_lookup" >&6 +if test $ac_cv_have_decl_gtk_icon_size_lookup = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 0 +_ACEOF + +cat >>confdefs.h <<\_ACEOF +#define NEED_GTK_ICON_SIZE_LOOKUP 1 +_ACEOF + +fi + + + + + 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 +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + #if !GTK_CHECK_VERSION(2,10,0) + Not GTK+ 2.10 + #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=$? @@ -28662,55 +31016,54 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_have_decl_gtk_icon_size_lookup=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_decl_gtk_icon_size_lookup=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_icon_size_lookup" >&5 -echo "${ECHO_T}$ac_cv_have_decl_gtk_icon_size_lookup" >&6 -if test $ac_cv_have_decl_gtk_icon_size_lookup = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 1 + cat >>confdefs.h <<\_ACEOF +#define __WXGTK210__ 1 _ACEOF - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 0 + cat >>confdefs.h <<\_ACEOF +#define __WXGTK26__ 1 _ACEOF -cat >>confdefs.h <<\_ACEOF -#define NEED_GTK_ICON_SIZE_LOOKUP 1 + cat >>confdefs.h <<\_ACEOF +#define __WXGTK24__ 1 _ACEOF -fi + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + ac_wxgtk210=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_wxgtk210=0 - echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5 +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 + 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,6,0) - Not GTK+ 2.6 - #endif + #if !GTK_CHECK_VERSION(2,6,0) + Not GTK+ 2.6 + #endif ; return 0; @@ -28725,7 +31078,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28738,49 +31092,50 @@ 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 __WXGTK26__ 1 _ACEOF - 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 - ac_wxgtk26=1 + 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 "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - ac_wxgtk26=0 + 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; @@ -28795,7 +31150,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28808,11 +31164,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 @@ -28820,7 +31176,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 @@ -28874,7 +31230,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -28906,16 +31263,8 @@ _ACEOF 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 "$USE_DARWIN" != 1; then + if test "$USE_DARWIN" != 1; then for ac_func in poll do @@ -28985,7 +31334,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -29017,6 +31367,7 @@ _ACEOF fi done + fi fi TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" @@ -29249,6 +31600,7 @@ echo "${ECHO_T}no" >&6 fi + pkg_failed=no echo "$as_me:$LINENO: checking for DIRECTFB" >&5 echo $ECHO_N "checking for DIRECTFB... $ECHO_C" >&6 @@ -29258,12 +31610,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.22\"") >&5 - ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.22") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\"") >&5 + ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.23") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 0.9.22" 2>/dev/null` + pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= 0.9.23" 2>/dev/null` else pkg_failed=yes fi @@ -29276,12 +31628,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.22\"") >&5 - ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.22") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.23\"") >&5 + ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.23") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= 0.9.22" 2>/dev/null` + pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= 0.9.23" 2>/dev/null` else pkg_failed=yes fi @@ -29300,9 +31652,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb >= 0.9.22"` + DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb >= 0.9.23"` else - DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb >= 0.9.22"` + DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb >= 0.9.23"` fi # Put the nasty error message in config.log where it belongs echo "$DIRECTFB_PKG_ERRORS" >&5 @@ -29371,12 +31723,9 @@ echo "$as_me: error: Cannot find MicroWindows libraries, make sure they are comp fi if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then - -if test "x$ac_path_x_has_been_run" != xyes; then - echo "$as_me:$LINENO: checking for X" >&5 + echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 -ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -29469,7 +31818,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for a specified header file. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -29477,7 +31826,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -29488,8 +31837,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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 + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag else ac_cpp_err= fi @@ -29504,7 +31853,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break fi @@ -29518,18 +31867,18 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" + LIBS="-lXt $LIBS" 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 () { -XrmInitialize () +XtMalloc (0) ; return 0; } @@ -29543,7 +31892,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -29567,7 +31917,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libX11.$ac_extension; then + if test -r $ac_dir/libXt.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi @@ -29603,15 +31953,10 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - # It might be that x_includes is empty (headers are found in the - # standard search path. Then output the corresponding message - ac_out_x_includes=$x_includes - test "x$x_includes" = x && ac_out_x_includes="in standard search path" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi -fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. @@ -29659,7 +32004,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -29710,7 +32056,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -29786,7 +32133,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -29841,7 +32189,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -29909,7 +32258,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30017,7 +32367,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30081,7 +32432,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30149,7 +32501,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30253,7 +32606,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30317,7 +32671,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30414,7 +32769,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30478,7 +32834,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30575,7 +32932,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30639,7 +32997,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30718,7 +33077,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -30787,6 +33147,112 @@ _ACEOF if test "$wxUSE_UNICODE" = "yes"; then + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + +if test -n "$ac_pt_PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + PKG_CONFIG=$ac_pt_PKG_CONFIG +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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 + PKG_CONFIG="" + fi + +fi + + pkg_failed=no echo "$as_me:$LINENO: checking for PANGOX" >&5 echo $ECHO_N "checking for PANGOX... $ECHO_C" >&6 @@ -30846,14 +33312,14 @@ fi echo "$PANGOX_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: pangox library not found, library cannot be compiled in Unicode mode" >&5 + { { echo "$as_me:$LINENO: error: pangox library not found, library cannot be compiled in Unicode mode" >&5 echo "$as_me: error: pangox library not found, library cannot be compiled in Unicode mode" >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then - { { echo "$as_me:$LINENO: error: pangox library not found, library cannot be compiled in Unicode mode" >&5 + { { echo "$as_me:$LINENO: error: pangox library not found, library cannot be compiled in Unicode mode" >&5 echo "$as_me: error: pangox library not found, library cannot be compiled in Unicode mode" >&2;} { (exit 1); exit 1; }; } @@ -30864,8 +33330,9 @@ else echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS" + CFLAGS="$PANGOX_CFLAGS $CFLAGS" + CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS" fi @@ -30928,16 +33395,16 @@ fi echo "$PANGOFT2_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5 + { echo "$as_me:$LINENO: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5 echo "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;} - wxUSE_PRINTING_ARCHITECTURE="no" + wxUSE_PRINTING_ARCHITECTURE="no" elif test $pkg_failed = untried; then - { echo "$as_me:$LINENO: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5 + { echo "$as_me:$LINENO: WARNING: pangoft2 library not found, library will be compiled without printing support" >&5 echo "$as_me: WARNING: pangoft2 library not found, library will be compiled without printing support" >&2;} - wxUSE_PRINTING_ARCHITECTURE="no" + wxUSE_PRINTING_ARCHITECTURE="no" else @@ -30946,8 +33413,9 @@ else echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS" + CFLAGS="$PANGOFT2_CFLAGS $CFLAGS" + CXXFLAGS="$PANGOFT2_CFLAGS $CXXFLAGS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS" fi @@ -31010,13 +33478,13 @@ fi echo "$PANGOXFT_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&5 + { echo "$as_me:$LINENO: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&5 echo "$as_me: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&2;} elif test $pkg_failed = untried; then - { echo "$as_me:$LINENO: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&5 + { echo "$as_me:$LINENO: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&5 echo "$as_me: WARNING: pangoxft library not found, library will be compiled without anti-aliasing support" >&2;} @@ -31026,18 +33494,17 @@ else echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_PANGO_XFT 1 _ACEOF - CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS" + CFLAGS="$PANGOXFT_CFLAGS $CFLAGS" + CXXFLAGS="$PANGOXFT_CFLAGS $CXXFLAGS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS" fi - save_CXXFLAGS="$CXXFLAGS" - save_LIBS="$LIBS" - CXXFLAGS="$PANGOX_CFLAGS $CXXFLAGS" - LIBS="$LIBS $PANGOX_LIBS" + save_LIBS="$LIBS" + LIBS="$LIBS $PANGOX_LIBS" for ac_func in pango_font_family_is_monospace do @@ -31107,7 +33574,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -31139,8 +33607,7 @@ _ACEOF fi done - CXXFLAGS="$save_CXXFLAGS" - LIBS="$save_LIBS" + LIBS="$save_LIBS" fi wxUSE_UNIVERSAL="yes" @@ -31158,12 +33625,6 @@ done fi if test "$wxUSE_MOTIF" = 1; then - if test "$wxUSE_UNICODE" = "yes"; then - { { echo "$as_me:$LINENO: error: Unicode configuration not supported with Motif" >&5 -echo "$as_me: error: Unicode configuration not supported with Motif" >&2;} - { (exit 1); exit 1; }; } - fi - echo "$as_me:$LINENO: checking for Motif/Lesstif headers" >&5 echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6 @@ -31194,8 +33655,8 @@ echo "${ECHO_T}found in $ac_find_includes" >&6 TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include" else - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS" + save_CFLAGS=$CFLAGS + CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -31226,7 +33687,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -31258,7 +33720,7 @@ echo "$as_me: error: please set CPPFLAGS to contain the location of Xm/Xm.h" >&2 fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS=$save_CXXFLAGS + CFLAGS=$save_CFLAGS fi @@ -31296,8 +33758,8 @@ echo "${ECHO_T}found in $ac_find_libraries" >&6 GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" else - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS" + save_CFLAGS=$CFLAGS + CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" save_LIBS="$LIBS" LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11" @@ -31330,7 +33792,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -31363,7 +33826,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CXXFLAGS=$save_CXXFLAGS + CFLAGS=$save_CFLAGS LIBS="$save_LIBS" fi @@ -31378,8 +33841,8 @@ echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6 if test "$libs_found" = "0"; then save_LIBS="$LIBS" LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11" - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS" + save_CFLAGS=$CFLAGS + CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -31413,7 +33876,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -31443,7 +33907,7 @@ rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" - CXXFLAGS=$save_CXXFLAGS + CFLAGS=$save_CFLAGS fi done fi @@ -31495,7 +33959,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -31525,8 +33990,8 @@ if test $ac_cv_lib_Sgm_SgCreateList = yes; then fi - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS" + save_CFLAGS=$CFLAGS + CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" echo "$as_me:$LINENO: checking for Motif 2" >&5 echo $ECHO_N "checking for Motif 2... $ECHO_C" >&6 @@ -31563,7 +34028,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -31633,7 +34099,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -31669,7 +34136,7 @@ _ACEOF fi - CXXFLAGS=$save_CXXFLAGS + CFLAGS=$save_CFLAGS GUI_TK_LIBRARY="$GUI_TK_LIBRARY${libsgm_link} -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11" TOOLKIT=MOTIF @@ -31716,8 +34183,8 @@ if test "${wx_cv_x11_xpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS" + save_CFLAGS=$CFLAGS + CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -31748,7 +34215,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -31770,7 +34238,7 @@ wx_cv_x11_xpm_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS=$save_CXXFLAGS + CFLAGS=$save_CFLAGS fi @@ -31829,7 +34297,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -31863,8 +34332,8 @@ fi if test "$wxHAVE_XEXT_LIB" = 1; then - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$TOOLKIT_INCLUDE $CXXFLAGS" + save_CFLAGS="$CFLAGS" + CFLAGS="$TOOLKIT_INCLUDE $CFLAGS" echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5 echo $ECHO_N "checking for X11/extensions/shape.h... $ECHO_C" >&6 @@ -31899,7 +34368,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -31929,7 +34399,7 @@ echo "${ECHO_T}not found" >&6 fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" + CFLAGS="$save_CFLAGS" fi fi @@ -32004,7 +34474,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -32066,31 +34537,37 @@ else fi + +if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then + if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then + wxUSE_UNICODE_UTF8=yes + elif test "$USE_OS2" = "1" ; then + 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 "$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 @@ -32102,7 +34579,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -32114,100 +34592,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 + 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 - -# 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 - -# 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 @@ -32249,7 +34644,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -32293,25 +34689,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 @@ -32323,7 +34713,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -32335,100 +34726,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_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: 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 @@ -32473,7 +34781,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -32540,7 +34849,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -32607,7 +34917,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -32763,7 +35074,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -32810,13 +35122,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 @@ -32827,7 +35135,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 @@ -32838,7 +35146,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -32850,41 +35159,88 @@ 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 +echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5 +echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6 + + fi fi -done +if test "$wxUSE_DETECT_SM" = "yes"; then + if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then + echo "$as_me:$LINENO: checking for -lSM - X11 session management" >&5 +echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6 + ac_find_libraries= + for ac_dir in $SEARCH_LIB; + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libSM.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "$ac_find_libraries" != "" ; then + + if test "$ac_find_libraries" = "default location"; then + ac_path_to_link="" + else + echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link=" -L$ac_find_libraries" + fi + fi + + if test "$ac_path_to_link" != " -L/usr/lib" ; then + LDFLAGS="$LDFLAGS $ac_path_to_link" + fi + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM" + 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 + { echo "$as_me:$LINENO: WARNING: libSM not found; disabling session management detection" >&5 +echo "$as_me: WARNING: libSM not found; disabling session management detection" >&2;} + wxUSE_DETECT_SM="no" + fi + else + wxUSE_DETECT_SM="no" fi fi + USE_OPENGL=0 if test "$wxUSE_OPENGL" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then + if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = "1"; then + { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 +echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} + wxUSE_OPENGL="no" + elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then OPENGL_LIBS="-framework OpenGL -framework AGL" elif test "$wxUSE_MSW" = 1; then OPENGL_LIBS="-lopengl32 -lglu32" else - + echo "$as_me:$LINENO: checking for OpenGL headers" >&5 +echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6 ac_find_includes= -for ac_dir in $SEARCH_INCLUDE /usr/include; +for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include; do if test -f "$ac_dir/GL/gl.h"; then ac_find_includes=$ac_dir @@ -32909,27 +35265,24 @@ echo "${ECHO_T}found in $ac_find_includes" >&6 fi CPPFLAGS="$ac_path_to_include $CPPFLAGS" + else + echo "$as_me:$LINENO: result: not found" >&5 +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 @@ -32941,7 +35294,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -32953,101 +35307,68 @@ 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 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 +if test $ac_cv_header_GL_gl_h = yes; then -# 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 + echo "$as_me:$LINENO: checking for GL/glu.h" >&5 +echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_glu_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 + + +#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_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 + (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_GL_glu_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no +ac_cv_header_GL_glu_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_cxx_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 - +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -if test $ac_cv_header_GL_gl_h = yes; then +echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6 +if test $ac_cv_header_GL_glu_h = yes; then found_gl=0 @@ -33055,7 +35376,7 @@ if test $ac_cv_header_GL_gl_h = yes; then echo $ECHO_N "checking for -lGL... $ECHO_C" >&6 ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib; do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libGL.$ac_extension"; then @@ -33066,8 +35387,8 @@ echo $ECHO_N "checking for -lGL... $ECHO_C" >&6 done if test "$ac_find_libraries" != "" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: result: found in $ac_find_libraries" >&5 +echo "${ECHO_T}found in $ac_find_libraries" >&6 if test "$ac_find_libraries" = "default location"; then @@ -33175,6 +35496,10 @@ fi +fi + + + if test "x$OPENGL_LIBS" = "x"; then { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5 echo "$as_me: error: OpenGL libraries not available" >&2;} @@ -33216,102 +35541,307 @@ fi if test "$wxUSE_SHARED" = "yes"; then - found_versioning=no - + case "${host}" in + *-*-cygwin* | *-*-mingw* ) + wx_cv_version_script=no + ;; - if test $found_versioning = no ; then - echo "$as_me:$LINENO: checking if the linker accepts --version-script" >&5 + *) + echo "$as_me:$LINENO: checking if the linker accepts --version-script" >&5 echo $ECHO_N "checking if the linker accepts --version-script... $ECHO_C" >&6 if test "${wx_cv_version_script+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "VER_1 { *; };" >conftest.sym - echo "int main() { return 0; }" >conftest.cpp + echo "VER_1 { *; };" >conftest.sym + echo "int main() { return 0; }" >conftest.cpp - if { ac_try=' - $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp - -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr' + if { ac_try=' + $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp + -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr' { (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 - if test -s conftest.stderr ; then - wx_cv_version_script=no - else - wx_cv_version_script=yes - fi - else - wx_cv_version_script=no - fi + if test -s conftest.stderr ; then + wx_cv_version_script=no + else + wx_cv_version_script=yes + fi + else + wx_cv_version_script=no + fi - if test $wx_cv_version_script = yes - then - echo "struct B { virtual ~B() { } }; \ - struct D : public B { }; \ - void F() { D d; }" > conftest.cpp + if test $wx_cv_version_script = yes + then + echo "struct B { virtual ~B() { } }; \ + struct D : public B { }; \ + void F() { D d; }" > conftest.cpp - if { ac_try=' - $CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp - -Wl,--version-script,conftest.sym >/dev/null 2>/dev/null' + if { ac_try=' + $CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp + -Wl,--version-script,conftest.sym >/dev/null 2>/dev/null' { (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=' - $CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp - -Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null' + { ac_try=' + $CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp + -Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null' { (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 - if { ac_try=' - $CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp - -Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null' + then + if { ac_try=' + $CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp + -Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null' { (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_version_script=yes - else - wx_cv_version_script=no - fi - fi - fi + then + wx_cv_version_script=yes + else + wx_cv_version_script=no + fi + fi + fi - rm -f conftest.output conftest.stderr conftest.sym conftest.cpp - rm -f conftest1.output conftest2.output conftest3.output + rm -f conftest.output conftest.stderr conftest.sym conftest.cpp + rm -f conftest1.output conftest2.output conftest3.output fi echo "$as_me:$LINENO: result: $wx_cv_version_script" >&5 echo "${ECHO_T}$wx_cv_version_script" >&6 - if test $wx_cv_version_script = yes ; then - LDFLAGS_VERSIONING="-Wl,--version-script,\$(top_builddir)version-script" + + if test $wx_cv_version_script = yes ; then + LDFLAGS_VERSIONING="-Wl,--version-script,\$(wx_top_builddir)/version-script" + fi + ;; + esac + + + if test "$wxUSE_VISIBILITY" != "no"; then + + + 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 + + /* visibility only makes sense for ELF shared libs: */ + #if !defined(__ELF__) && !defined(__APPLE__) + error this platform has no visibility; + #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 + + + echo "$as_me:$LINENO: checking for broken libstdc++ visibility" >&5 +echo $ECHO_N "checking for broken libstdc++ visibility... $ECHO_C" >&6 + if test "${wx_cv_cc_broken_libstdcxx_visibility+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + wx_save_CXXFLAGS="$CXXFLAGS" + wx_save_LDFLAGS="$LDFLAGS" + CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" + LDFLAGS="$LDFLAGS -shared -fPIC" + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + std::string s("hello"); + return s.length(); + + ; + 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 + wx_cv_cc_broken_libstdcxx_visibility=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +wx_cv_cc_broken_libstdcxx_visibility=yes +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 + + CXXFLAGS="$wx_save_CXXFLAGS" + LDFLAGS="$wx_save_LDFLAGS" +fi + + echo "$as_me:$LINENO: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5 +echo "${ECHO_T}$wx_cv_cc_broken_libstdcxx_visibility" >&6 + if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1 +_ACEOF + fi + + else + CFLAGS_VISIBILITY="" + CXXFLAGS_VISIBILITY="" + fi + + 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,\$(top_builddir)lib" + SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" WXCONFIG_RPATH="-Wl,-rpath,\$libdir" ;; *-*-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 @@ -33335,7 +35865,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -33348,22 +35879,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,\$(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 @@ -33387,7 +35918,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -33400,17 +35932,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,\$(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 @@ -33420,17 +35952,13 @@ 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\$(top_builddir)lib" - WXCONFIG_RPATH="-R\$libdir" - fi + LDFLAGS="$saveLdflags" ;; *-*-darwin* ) install_name_tool=`which install_name_tool` if test "$install_name_tool" -a -x "$install_name_tool"; then - SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@" + SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@" cat <change-install-names #!/bin/sh libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` @@ -33449,11 +35977,12 @@ EOF ;; *-*-hpux* ) - SAMPLES_RPATH_FLAG="-Wl,+b,\$(top_builddir)lib" + SAMPLES_RPATH_FLAG="-Wl,+b,\$(wx_top_builddir)/lib" WXCONFIG_RPATH="-Wl,+b,\$libdir" ;; esac + fi if test $wxUSE_RPATH = "no"; then SAMPLES_RPATH_FLAG='' @@ -33557,7 +36086,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33606,7 +36136,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -33640,157 +36171,15 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - 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 - -fi - -if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then - WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r" - WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc" - - LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}" - - # Extract the first word of "Rez", so it can be a program name with args. -set dummy Rez; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_REZ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$REZ"; then - ac_cv_prog_REZ="$REZ" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_REZ="Rez" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez" -fi -fi -REZ=$ac_cv_prog_REZ -if test -n "$REZ"; then - echo "$as_me:$LINENO: result: $REZ" >&5 -echo "${ECHO_T}$REZ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "DeRez", so it can be a program name with args. -set dummy DeRez; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_DEREZ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DEREZ"; then - ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_DEREZ="DeRez" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez" -fi -fi -DEREZ=$ac_cv_prog_DEREZ -if test -n "$DEREZ"; then - echo "$as_me:$LINENO: result: $DEREZ" >&5 -echo "${ECHO_T}$DEREZ" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "SetFile", so it can be a program name with args. -set dummy SetFile; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_SETFILE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$SETFILE"; then - ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_SETFILE="SetFile" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile" -fi -fi -SETFILE=$ac_cv_prog_SETFILE -if test -n "$SETFILE"; then - echo "$as_me:$LINENO: result: $SETFILE" >&5 -echo "${ECHO_T}$SETFILE" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - - MACSETFILE="\$(SETFILE)" - - if test "$wxUSE_MAC" = 1; then - POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o" - RESCOMP="$REZ" - WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o" - else - POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}" - RESCOMP="echo -n \| $REZ" - WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII" - fi - -else - MACSETFILE="@true" - - if test "$wxUSE_PM" = 1; then - RESCOMP="emxbind" - WXCONFIG_RESFLAGS="-ep" - - POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS" - else - POSTLINK_COMMAND="@true" - fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu fi - echo "$as_me:$LINENO: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 if test "${ac_cv_type_mode_t+set}" = set; then @@ -33823,7 +36212,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -33888,7 +36278,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -33953,7 +36344,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -34018,7 +36410,113 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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_size_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +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_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 +if test $ac_cv_type_size_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF +#define size_t unsigned +_ACEOF + +fi + +echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 +echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 +if test "${ac_cv_type_uid_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. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "uid_t" >/dev/null 2>&1; then + ac_cv_type_uid_t=yes +else + ac_cv_type_uid_t=no +fi +rm -f conftest* + +fi +echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6 +if test $ac_cv_type_uid_t = no; then + +cat >>confdefs.h <<\_ACEOF +#define uid_t int +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define gid_t int +_ACEOF + +fi + + +echo "$as_me:$LINENO: checking for ssize_t" >&5 +echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 +if test "${ac_cv_type_ssize_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. */ +$ac_includes_default +int +main () +{ +if ((ssize_t *) 0) + return 0; +if (sizeof (ssize_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=$? @@ -34030,85 +36528,55 @@ 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_ssize_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no +ac_cv_type_ssize_t=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 -if test $ac_cv_type_size_t = yes; then - : -else +echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 +echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 +if test $ac_cv_type_ssize_t = yes; then cat >>confdefs.h <<_ACEOF -#define size_t unsigned -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 -if test "${ac_cv_type_uid_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. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes -else - ac_cv_type_uid_t=no -fi -rm -f conftest* - -fi -echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6 -if test $ac_cv_type_uid_t = no; then - -cat >>confdefs.h <<\_ACEOF -#define uid_t int +#define HAVE_SSIZE_T 1 _ACEOF -cat >>confdefs.h <<\_ACEOF -#define gid_t int -_ACEOF - fi -echo "$as_me:$LINENO: checking for ssize_t" >&5 -echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 -if test "${ac_cv_type_ssize_t+set}" = set; then +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 if size_t is unsigned int" >&5 +echo $ECHO_N "checking if size_t is unsigned int... $ECHO_C" >&6 +if test "${wx_cv_size_t_is_uint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default +#include int main () { -if ((ssize_t *) 0) - return 0; -if (sizeof (ssize_t)) - return 0; + + return 0; } + + struct Foo { void foo(size_t); void foo(unsigned int); }; + + int bar() { + ; return 0; } @@ -34122,7 +36590,8 @@ 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_cxx_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=$? @@ -34134,34 +36603,33 @@ 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_ssize_t=yes + wx_cv_size_t_is_uint=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_ssize_t=no +wx_cv_size_t_is_uint=yes + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 -echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 -if test $ac_cv_type_ssize_t = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_SSIZE_T 1 -_ACEOF fi +echo "$as_me:$LINENO: result: $wx_cv_size_t_is_uint" >&5 +echo "${ECHO_T}$wx_cv_size_t_is_uint" >&6 +if test "$wx_cv_size_t_is_uint" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxSIZE_T_IS_UINT 1 +_ACEOF -echo "$as_me:$LINENO: checking if size_t is unsigned int" >&5 -echo $ECHO_N "checking if size_t is unsigned int... $ECHO_C" >&6 -if test "${wx_cv_size_t_is_uint+set}" = set; then +else + echo "$as_me:$LINENO: checking if size_t is unsigned long" >&5 +echo $ECHO_N "checking if size_t is unsigned long... $ECHO_C" >&6 +if test "${wx_cv_size_t_is_ulong+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -34172,11 +36640,11 @@ int main () { - return 0; } + return 0; } - struct Foo { void foo(size_t); void foo(unsigned int); }; + struct Foo { void foo(size_t); void foo(unsigned long); }; - int bar() { + int bar() { ; return 0; @@ -34191,7 +36659,8 @@ 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_cxx_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=$? @@ -34203,30 +36672,31 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - wx_cv_size_t_is_uint=no + wx_cv_size_t_is_ulong=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -wx_cv_size_t_is_uint=yes +wx_cv_size_t_is_ulong=yes fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi -echo "$as_me:$LINENO: result: $wx_cv_size_t_is_uint" >&5 -echo "${ECHO_T}$wx_cv_size_t_is_uint" >&6 +echo "$as_me:$LINENO: result: $wx_cv_size_t_is_ulong" >&5 +echo "${ECHO_T}$wx_cv_size_t_is_ulong" >&6 -if test "$wx_cv_size_t_is_uint" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxSIZE_T_IS_UINT 1 + if test "$wx_cv_size_t_is_ulong" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxSIZE_T_IS_ULONG 1 _ACEOF -else - echo "$as_me:$LINENO: checking if size_t is unsigned long" >&5 -echo $ECHO_N "checking if size_t is unsigned long... $ECHO_C" >&6 -if test "${wx_cv_size_t_is_ulong+set}" = set; then + 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 @@ -34235,16 +36705,19 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { - return 0; } + return 0; } - struct Foo { void foo(size_t); void foo(unsigned long); }; + struct Foo { void foo(wchar_t); + void foo(unsigned short); + void foo(unsigned int); + void foo(unsigned long); }; - int bar() { + int bar() { ; return 0; @@ -34259,7 +36732,8 @@ 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_cxx_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=$? @@ -34271,28 +36745,38 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - wx_cv_size_t_is_ulong=no + wx_cv_wchar_t_is_separate_type=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -wx_cv_size_t_is_ulong=yes +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_size_t_is_ulong" >&5 -echo "${ECHO_T}$wx_cv_size_t_is_ulong" >&6 +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_size_t_is_ulong" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxSIZE_T_IS_ULONG 1 +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 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 + echo "$as_me:$LINENO: checking for pw_gecos in struct passwd" >&5 echo $ECHO_N "checking for pw_gecos in struct passwd... $ECHO_C" >&6 @@ -34328,7 +36812,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -34444,7 +36929,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -34517,7 +37003,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -34585,7 +37072,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -34627,6 +37115,109 @@ _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 + +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 + +fi +done + + if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" fi @@ -34664,7 +37255,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -34762,7 +37354,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -34871,7 +37464,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -34948,7 +37542,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -35025,7 +37620,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -35104,7 +37700,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -35180,7 +37777,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -35245,7 +37843,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); @@ -35360,7 +37958,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -35432,7 +38031,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -35467,18 +38067,17 @@ _ACEOF fi fi + wchar_headers="#include +#include " + case "${host}" in + *-*-solaris2* ) - - - - - -for ac_func in wputc wputchar putws fputws wprintf vswprintf +for ac_header in widec.h 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 +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 $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -35487,207 +38086,91 @@ _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 +$ac_includes_default -int -main () -{ -return f != $ac_func; - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 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); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { 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' + { 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 - eval "$as_ac_var=yes" + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext 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 +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_func" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi + done + if test "$ac_cv_header_widec_h" = "yes"; then + wchar_headers="$wchar_headers +#include " + fi + esac - echo "$as_me:$LINENO: checking for _vsnwprintf" >&5 -echo $ECHO_N "checking for _vsnwprintf... $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 () -{ -&_vsnwprintf; - ; - 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 - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF -#define HAVE__VSNWPRINTF 1 -_ACEOF + for wx_func in wputc wputchar putws fputws wprintf vswprintf + 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 - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext; -fi - -if test "x$ac_cv_header_fnmatch_h" = "xyes"; then + cat >conftest.$ac_ext <<_ACEOF -for ac_func in fnmatch -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. */ + /* 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 + $wchar_headers + $ac_includes_default int main () { -return f != $ac_func; + + #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 @@ -35698,7 +38181,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -35710,191 +38194,123 @@ 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" + eval wx_cv_func_$wx_func=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +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 '${'$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 +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 -fi -done -fi + else + : -if test "$wxUSE_FILE" = "yes"; then + fi + done -for ac_func in fsync -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 + + echo "$as_me:$LINENO: checking for _vsnwprintf" >&5 +echo $ECHO_N "checking for _vsnwprintf... $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. */ -/* 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 - +#include int main () { -return f != $ac_func; +&_vsnwprintf; ; 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 +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' + { 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' + { 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 - eval "$as_ac_var=yes" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\_ACEOF +#define HAVE__VSNWPRINTF 1 +_ACEOF + 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 - +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -done - +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext; fi +if test "x$ac_cv_header_fnmatch_h" = "xyes"; then -for ac_func in round -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 + for wx_func in fnmatch + 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. */ + + 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 + #include + $ac_includes_default int main () { -return f != $ac_func; + + #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 @@ -35905,7 +38321,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -35917,100 +38334,215 @@ 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" + eval wx_cv_func_$wx_func=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +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 '${'$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 +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 -done -if test "$ac_cv_func_round" = yes; then - echo "$as_me:$LINENO: checking whether round is declared" >&5 -echo $ECHO_N "checking whether round is declared... $ECHO_C" >&6 -if test "${ac_cv_have_decl_round+set}" = set; then +if test "$wxUSE_FILE" = "yes"; then + + for wx_func in fsync + 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. */ + + 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 round - char *p = (char *) round; -#endif + + #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 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' + { 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' + { 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_have_decl_round=yes + eval wx_cv_func_$wx_func=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_decl_round=no +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: $ac_cv_have_decl_round" >&5 -echo "${ECHO_T}$ac_cv_have_decl_round" >&6 -if test $ac_cv_have_decl_round = yes; then +echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5 +echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&6 -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ROUND 1 + 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 >>confdefs.h <<_ACEOF -#define HAVE_DECL_ROUND 0 + + 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 -fi +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 @@ -36065,7 +38597,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -36115,7 +38648,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -36189,7 +38723,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -36304,7 +38839,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -36350,6 +38886,12 @@ if test "${wx_cv_type_sa_handler+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 @@ -36379,7 +38921,8 @@ 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_cxx_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=$? @@ -36403,6 +38946,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_type_sa_handler" >&5 @@ -36422,6 +38971,12 @@ if test "${wx_cv_func_backtrace+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 @@ -36452,7 +39007,8 @@ 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_cxx_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=$? @@ -36473,6 +39029,12 @@ wx_cv_func_backtrace=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi @@ -36491,6 +39053,12 @@ if test "${wx_cv_func_cxa_demangle+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 @@ -36518,7 +39086,8 @@ 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_cxx_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=$? @@ -36540,6 +39109,12 @@ wx_cv_func_cxa_demangle=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 @@ -36632,7 +39207,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -36708,7 +39284,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -36740,7 +39317,13 @@ echo $ECHO_N "checking for statfs declaration... $ECHO_C" >&6 if test "${wx_cv_func_statfs_decl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + 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 @@ -36774,7 +39357,8 @@ 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_cxx_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=$? @@ -36795,6 +39379,12 @@ wx_cv_func_statfs_decl=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi echo "$as_me:$LINENO: result: $wx_cv_func_statfs_decl" >&5 @@ -36847,7 +39437,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -36879,7 +39470,13 @@ echo $ECHO_N "checking for statvfs argument type... $ECHO_C" >&6 if test "${wx_cv_type_statvfs_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + 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 @@ -36912,7 +39509,8 @@ 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_cxx_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=$? @@ -36963,7 +39561,8 @@ 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_cxx_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=$? @@ -36988,6 +39587,12 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 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_type_statvfs_t" >&5 @@ -37085,7 +39690,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -37194,7 +39800,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -37229,7 +39836,7 @@ done -for ac_func in putenv setenv +for ac_func in setenv putenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -37297,7 +39904,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -37329,6 +39937,110 @@ _ACEOF fi done +if test "$ac_cv_func_setenv" = "yes"; then + +for ac_func in unsetenv +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 + +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 + +fi +done + +fi HAVE_SOME_SLEEP_FUNC=0 if test "$USE_BEOS" = 1; then @@ -37418,7 +40130,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -37490,7 +40203,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -37526,64 +40240,38 @@ _ACEOF else -for ac_func in usleep -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 + for wx_func in usleep + 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. */ + + 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 + $ac_includes_default int main () { -return f != $ac_func; + + #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 @@ -37594,7 +40282,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -37606,32 +40295,34 @@ 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" + eval wx_cv_func_$wx_func=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +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 '${'$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_USLEEP 1 +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 - { echo "$as_me:$LINENO: WARNING: wxSleep() function will not work" >&5 + + else + : + { echo "$as_me:$LINENO: WARNING: wxSleep() function will not work" >&5 echo "$as_me: WARNING: wxSleep() function will not work" >&2;} -fi -done + fi + done @@ -37645,65 +40336,122 @@ done fi - -for ac_func in uname gethostname -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 + for wx_func in uname + 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. */ + + 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. */ + #include + $ac_includes_default -#ifdef __STDC__ -# include -#else -# include -#endif +int +main () +{ -#undef $ac_func + #ifndef $wx_func + &$wx_func; + #endif -/* 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 + + ; + return 0; } -#endif + +_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 + +if test "$wx_cv_func_uname" != yes; then + + for wx_func in gethostname + 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 () { -return f != $ac_func; + + #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 @@ -37714,7 +40462,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -37726,27 +40475,35 @@ 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" + eval wx_cv_func_$wx_func=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" +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 '${'$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 +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 - break -fi -done + else + : + + fi + done + +fi + for wx_func in strtok_r do @@ -37790,7 +40547,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -37900,7 +40658,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -37972,7 +40731,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -38039,7 +40799,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -38106,7 +40867,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -38219,7 +40981,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -38292,7 +41055,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -38337,39 +41101,39 @@ _ACEOF INET_LINK=" -l$INET_LINK" fi -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 + 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lesd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + + 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 esd_close (); + + $ac_includes_default + int main () { -esd_close (); + + #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 @@ -38380,7 +41144,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -38392,237 +41157,38 @@ 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 wx_cv_func_$wx_func=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_esd_esd_close=no +eval wx_cv_func_$wx_func=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> -_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 - 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_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: $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 +echo "$as_me:$LINENO: result: `eval echo '${'wx_cv_func_$wx_func'}'`" >&5 +echo "${ECHO_T}`eval echo '${'wx_cv_func_$wx_func'}'`" >&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 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 - EXTRALIBS_ESD="-lesd" -fi + else + : -done + fi + done fi -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. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __linux__ - #include - #else - /* For Solaris */ - #include - #endif - -int -main () -{ -struct cdrom_tocentry entry, old_entry; - ; - 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 - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF -#define HAVE_KNOWN_CDROM_INTERFACE 1 -_ACEOF - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -38683,7 +41249,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then THREADS_LINK= - THREADS_CXXFLAGS= + THREADS_CFLAGS= if test "$wxUSE_THREADS" = "yes" ; then if test "$USE_BEOS" = 1; then @@ -38697,12 +41263,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*) @@ -38749,7 +41317,7 @@ echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6 -*) echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5 echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6 - THREADS_CXXFLAGS="$flag" + THREADS_CFLAGS="$flag" ;; *) @@ -38760,9 +41328,9 @@ echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6 esac save_LIBS="$LIBS" - save_CXXFLAGS="$CXXFLAGS" + save_CFLAGS="$CFLAGS" LIBS="$THREADS_LINK $LIBS" - CXXFLAGS="$THREADS_CXXFLAGS $CXXFLAGS" + CFLAGS="$THREADS_CFLAGS $CFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -38788,7 +41356,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -38810,7 +41379,7 @@ rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS="$save_LIBS" - CXXFLAGS="$save_CXXFLAGS" + CFLAGS="$save_CFLAGS" echo "$as_me:$LINENO: result: $THREADS_OK" >&5 echo "${ECHO_T}$THREADS_OK" >&6 @@ -38819,7 +41388,7 @@ echo "${ECHO_T}$THREADS_OK" >&6 fi THREADS_LINK="" - THREADS_CXXFLAGS="" + THREADS_CFLAGS="" done if test "x$THREADS_OK" != "xyes"; then @@ -38827,7 +41396,7 @@ echo "${ECHO_T}$THREADS_OK" >&6 { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5 echo "$as_me: WARNING: No thread support on this system... disabled" >&2;} else - LDFLAGS="$THREADS_CXXFLAGS $LDFLAGS" + LDFLAGS="$THREADS_CFLAGS $LDFLAGS" LIBS="$THREADS_LINK $LIBS" echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 @@ -38854,10 +41423,10 @@ echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_ echo "$as_me:$LINENO: result: ${flag}" >&5 echo "${ECHO_T}${flag}" >&6 if test "x$flag" != xno; then - THREADS_CXXFLAGS="$THREADS_CXXFLAGS $flag" + THREADS_CFLAGS="$THREADS_CFLAGS $flag" fi - WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS $THREADS_CXXFLAGS" + WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS $THREADS_CFLAGS" fi fi @@ -38931,7 +41500,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -38970,6 +41540,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 @@ -39000,7 +41576,8 @@ 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_cxx_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=$? @@ -39025,6 +41602,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 @@ -39040,25 +41623,19 @@ _ACEOF 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 "$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 @@ -39070,7 +41647,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -39082,100 +41660,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 + 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 - -# 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 - -# 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 @@ -39251,7 +41746,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -39320,7 +41816,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -39428,7 +41925,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -39518,7 +42016,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -39608,7 +42107,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -39673,7 +42173,126 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -39685,49 +42304,32 @@ 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_posix4_sched_get_priority_max=yes + ac_cv_func_pthread_cancel=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_posix4_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 -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: 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 - +else + { 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 @@ -39736,12 +42338,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. */ @@ -39751,7 +42353,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 @@ -39760,14 +42362,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 } @@ -39776,7 +42378,7 @@ char (*f) () = pthread_cancel; int main () { -return f != pthread_cancel; +return f != pthread_mutex_timedlock; ; return 0; } @@ -39790,7 +42392,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -39802,26 +42405,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 @@ -39890,7 +42493,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -39956,7 +42560,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -40021,7 +42626,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -40085,7 +42691,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -40136,8 +42743,8 @@ if test "${wx_cv_cflags_mthread+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - CXXFLAGS_OLD="$CXXFLAGS" - CXXFLAGS="-mthreads $CXXFLAGS" + CFLAGS_OLD="$CFLAGS" + CFLAGS="-mthreads $CFLAGS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -40162,7 +42769,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -40190,15 +42798,14 @@ echo "$as_me:$LINENO: result: $wx_cv_cflags_mthread" >&5 echo "${ECHO_T}$wx_cv_cflags_mthread" >&6 if test "$wx_cv_cflags_mthread" = "yes"; then - WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -mthreads" + WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads" LDFLAGS="$LDFLAGS -mthreads" else - CXXFLAGS="$CXXFLAGS_OLD" + CFLAGS="$CFLAGS_OLD" fi ;; *-pc-os2*emx ) WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__" - WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -Zmt -D__ST_MT_ERRNO__" LDFLAGS="$LDFLAGS -Zmt" ;; esac @@ -40270,7 +42877,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -40366,7 +42974,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -40462,7 +43071,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -40550,7 +43160,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40608,7 +43219,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40668,7 +43280,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40726,7 +43339,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -40798,16 +43412,16 @@ echo "$as_me: error: internal error" >&2;} ;; esac -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 +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$ac_cv_func_which_gethostbyname_r" = "xno" -o \ - "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then + "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then echo "$as_me:$LINENO: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then @@ -40873,7 +43487,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -40912,6 +43527,13 @@ if test "${ac_cv_func_which_getservbyname_r+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 @@ -40943,7 +43565,8 @@ 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_cxx_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=$? @@ -40992,7 +43615,8 @@ 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_cxx_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=$? @@ -41040,7 +43664,8 @@ 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_cxx_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=$? @@ -41069,6 +43694,12 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext 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 @@ -41094,7 +43725,7 @@ fi if test "x$ac_cv_func_which_getservbyname_r" = "xno" -o \ - "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then + "x$ac_cv_func_which_getservbyname_r" = "xunknown" ; then for ac_func in getservbyname do @@ -41164,7 +43795,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -41346,18 +43978,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 @@ -41459,7 +44091,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -41534,7 +44167,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -41639,7 +44273,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -41714,7 +44349,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -41828,7 +44464,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -41900,7 +44537,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -42003,6 +44641,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 @@ -42018,27 +44663,28 @@ _ACEOF fi if test "$USE_UNIX" = "1" ; then - echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 + if test "$wxUSE_MGL" != 1; then + echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6 if test "${ac_cv_header_sys_soundcard+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include int main () { - ioctl(0, SNDCTL_DSP_SPEED, 0); + ioctl(0, SNDCTL_DSP_SPEED, 0); ; return 0; @@ -42053,7 +44699,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -42071,23 +44718,23 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - saveLibs="$LIBS" - LIBS="$saveLibs -lossaudio" - cat >conftest.$ac_ext <<_ACEOF + saveLibs="$LIBS" + LIBS="$saveLibs -lossaudio" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include int main () { - ioctl(0, SNDCTL_DSP_SPEED, 0); + ioctl(0, SNDCTL_DSP_SPEED, 0); ; return 0; @@ -42102,7 +44749,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -42120,8 +44768,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - LIBS="$saveLibs" - ac_cv_header_sys_soundcard=no + LIBS="$saveLibs" + ac_cv_header_sys_soundcard=no fi @@ -42136,16 +44784,16 @@ rm -f conftest.err conftest.$ac_objext \ fi echo "$as_me:$LINENO: result: $ac_cv_header_sys_soundcard" >&5 echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6 + fi if test "$ac_cv_header_sys_soundcard" = "yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_SOUNDCARD_H 1 _ACEOF - else - DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia" fi fi + WITH_PLUGIN_SDL=0 if test "$wxUSE_SOUND" = "yes"; then if test "$USE_UNIX" = "1" ; then @@ -42354,6 +45002,7 @@ fi echo "${ECHO_T}yes" >&6 EXTRALIBS_SDL="$SDL_LIBS" + CFLAGS="$SDL_CFLAGS $CFLAGS" CXXFLAGS="$SDL_CFLAGS $CXXFLAGS" cat >>confdefs.h <<\_ACEOF #define wxUSE_LIBSDL 1 @@ -42408,7 +45057,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -42457,8 +45107,16 @@ rm -f conftest.err conftest.$ac_objext \ WITH_PLUGIN_SDL=1 fi fi + else + if test "$wxUSE_MGL" = 1; then + { echo "$as_me:$LINENO: WARNING: wxSound not supported in MGL under DOS... disabled" >&5 +echo "$as_me: WARNING: wxSound not supported in MGL under DOS... disabled" >&2;} + wxUSE_SOUND="no" + fi fi +fi +if test "$wxUSE_SOUND" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SOUND 1 _ACEOF @@ -42467,7 +45125,204 @@ _ACEOF fi if test "$WXGTK20" = 1; then + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG + +if test -n "$ac_pt_PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + PKG_CONFIG=$ac_pt_PKG_CONFIG +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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 + PKG_CONFIG="" + fi + +fi + if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then + + if test "$wxUSE_GTKPRINT" = "yes" ; then + + +pkg_failed=no +echo "$as_me:$LINENO: checking for GTKPRINT" >&5 +echo $ECHO_N "checking for GTKPRINT... $ECHO_C" >&6 + +if test -n "$PKG_CONFIG"; then + if test -n "$GTKPRINT_CFLAGS"; then + pkg_cv_GTKPRINT_CFLAGS="$GTKPRINT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTKPRINT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GTKPRINT_LIBS"; then + pkg_cv_GTKPRINT_LIBS="$GTKPRINT_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTKPRINT_LIBS=`$PKG_CONFIG --libs "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"` + else + GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKPRINT_PKG_ERRORS" >&5 + + + { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 +echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} + wxUSE_GTKPRINT="no" + + +elif test $pkg_failed = untried; then + + { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 +echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} + wxUSE_GTKPRINT="no" + + +else + GTKPRINT_CFLAGS=$pkg_cv_GTKPRINT_CFLAGS + GTKPRINT_LIBS=$pkg_cv_GTKPRINT_LIBS + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + + CFLAGS="$GTKPRINT_CFLAGS $CFLAGS" + CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS" + cat >>confdefs.h <<\_ACEOF +#define wxUSE_GTKPRINT 1 +_ACEOF + + +fi + fi + if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then @@ -42548,6 +45403,7 @@ else echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 + CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS" CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS" cat >>confdefs.h <<\_ACEOF #define wxUSE_LIBGNOMEPRINT 1 @@ -42557,9 +45413,7 @@ _ACEOF fi fi fi -fi -if test "$WXGTK20" = 1; then if test "$wxUSE_MIMETYPE" = "yes" ; then if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then @@ -42641,6 +45495,7 @@ else echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 + CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS" CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS" cat >>confdefs.h <<\_ACEOF #define wxUSE_LIBGNOMEVFS 1 @@ -42650,9 +45505,7 @@ _ACEOF fi fi fi -fi -if test "$WXGTK20" = 1; then if test "$wxUSE_LIBHILDON" = "yes" ; then pkg_failed=no @@ -42733,6 +45586,7 @@ else echo "${ECHO_T}yes" >&6 EXTRALIBS_HILDON="$HILDON_LIBS" + CFLAGS="$CFLAGS $HILDON_CFLAGS" CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS" cat >>confdefs.h <<\_ACEOF #define wxUSE_LIBHILDON 1 @@ -42771,44 +45625,85 @@ _ACEOF fi -if test "$wxUSE_FFILE" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_FFILE 1 +if test "$wxUSE_FFILE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FFILE 1 +_ACEOF + +fi + +if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then + if test "$wxUSE_STREAMS" != yes; then + { echo "$as_me:$LINENO: WARNING: wxArchive requires wxStreams... disabled" >&5 +echo "$as_me: WARNING: wxArchive requires wxStreams... disabled" >&2;} + wxUSE_ARCHIVE_STREAMS=no + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ARCHIVE_STREAMS 1 +_ACEOF + + fi +fi + +if test "$wxUSE_ZIPSTREAM" = "yes"; then + if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then + { echo "$as_me:$LINENO: WARNING: wxZip requires wxArchive... disabled" >&5 +echo "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;} + elif test "$wxUSE_ZLIB" = "no"; then + { echo "$as_me:$LINENO: WARNING: wxZip requires wxZlib... disabled" >&5 +echo "$as_me: WARNING: wxZip requires wxZlib... disabled" >&2;} + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ZIPSTREAM 1 +_ACEOF + + fi +fi + +if test "$wxUSE_TARSTREAM" = "yes"; then + if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then + { echo "$as_me:$LINENO: WARNING: wxTar requires wxArchive... disabled" >&5 +echo "$as_me: WARNING: wxTar requires wxArchive... disabled" >&2;} + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TARSTREAM 1 _ACEOF + fi fi if test "$wxUSE_FILESYSTEM" = "yes"; then - cat >>confdefs.h <<\_ACEOF + if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then + { echo "$as_me:$LINENO: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5 +echo "$as_me: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&2;} + wxUSE_FILESYSTEM=no + else + cat >>confdefs.h <<\_ACEOF #define wxUSE_FILESYSTEM 1 _ACEOF + fi fi -if test "$wxUSE_FS_ZIP" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_FS_ZIP 1 -_ACEOF - -fi - -if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_ARCHIVE_STREAMS 1 +if test "$wxUSE_FS_ARCHIVE" = "yes"; then + if test "$wxUSE_FILESYSTEM" != yes -o "$wxUSE_ARCHIVE_STREAMS" != yes; then + { echo "$as_me:$LINENO: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&5 +echo "$as_me: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&2;} + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FS_ARCHIVE 1 _ACEOF + fi fi -if test "$wxUSE_ZIPSTREAM" = "yes"; then - if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then - { echo "$as_me:$LINENO: WARNING: wxZip requires wxArchive... disabled" >&5 -echo "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;} - elif test "$wxUSE_ZLIB" = "no"; then - { echo "$as_me:$LINENO: WARNING: wxZip requires wxZlib... disabled" >&5 -echo "$as_me: WARNING: wxZip requires wxZlib... disabled" >&2;} +if test "$wxUSE_FS_ZIP" = "yes"; then + if test "$wxUSE_FS_ARCHIVE" != yes; then + { echo "$as_me:$LINENO: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&5 +echo "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&2;} else cat >>confdefs.h <<\_ACEOF -#define wxUSE_ZIPSTREAM 1 +#define wxUSE_FS_ZIP 1 _ACEOF fi @@ -42979,6 +45874,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 @@ -42993,11 +45895,107 @@ _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 +if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_CONSOLE_EVENTLOOP 1 +_ACEOF + + + if test "$wxUSE_UNIX" = "yes"; then + if test "$wxUSE_SELECT_DISPATCHER" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_SELECT_DISPATCHER 1 +_ACEOF + + fi + + if test "$wxUSE_EPOLL_DISPATCHER" = "yes"; then + +for ac_header in sys/epoll.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 $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (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 + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f 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 + +done -for ac_func in strptime + if test "$ac_cv_header_sys_epoll_h" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_EPOLL_DISPATCHER 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5 +echo "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;} + fi + fi + fi +fi + + + + +for ac_func in gettimeofday ftime do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -43065,7 +46063,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -43093,150 +46092,34 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - + break fi done - if test "$ac_cv_func_strptime" = "yes"; then - echo "$as_me:$LINENO: checking for strptime declaration" >&5 -echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6 -if test "${wx_cv_func_strptime_decl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - 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 () -{ - - struct tm t; - strptime("foo", "bar", &t); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_func_strptime_decl=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -wx_cv_func_strptime_decl=no - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - - -fi -echo "$as_me:$LINENO: result: $wx_cv_func_strptime_decl" >&5 -echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6 - fi - if test "$wx_cv_func_strptime_decl" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRPTIME_DECL 1 -_ACEOF - - fi - echo "$as_me:$LINENO: checking for timezone variable in " >&5 -echo $ECHO_N "checking for timezone variable in ... $ECHO_C" >&6 -if test "${wx_cv_var_timezone+set}" = set; then +if test "$ac_cv_func_gettimeofday" = "yes"; then + echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5 +echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6 +if test "${wx_cv_func_gettimeofday_has_2_args+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 () -{ - - int tz; - tz = timezone; - - ; - 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_var_timezone=timezone - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - 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 + #include int main () { - int tz; - tz = _timezone; + struct timeval tv; + gettimeofday(&tv, NULL); ; return 0; @@ -43251,7 +46134,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -43263,29 +46147,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - wx_cv_var_timezone=_timezone - + wx_cv_func_gettimeofday_has_2_args=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - 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 + #include int main () { - int tz; - tz = __timezone; + struct timeval tv; + gettimeofday(&tv); ; return 0; @@ -43300,7 +46182,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -43312,50 +46195,39 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - wx_cv_var_timezone=__timezone - + wx_cv_func_gettimeofday_has_2_args=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - if test "$USE_DOS" = 0 ; then - { echo "$as_me:$LINENO: WARNING: no timezone variable" >&5 -echo "$as_me: WARNING: no timezone variable" >&2;} - fi - - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5 +echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;} + wx_cv_func_gettimeofday_has_2_args=unknown fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi -echo "$as_me:$LINENO: result: $wx_cv_var_timezone" >&5 -echo "${ECHO_T}$wx_cv_var_timezone" >&6 +echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5 +echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6 - if test "x$wx_cv_var_timezone" != x ; then - cat >>confdefs.h <<_ACEOF -#define WX_TIMEZONE $wx_cv_var_timezone + if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then + cat >>confdefs.h <<\_ACEOF +#define WX_GETTIMEOFDAY_NO_TZ 1 _ACEOF fi +fi - -for ac_func in localtime -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 @@ -43364,12 +46236,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. */ @@ -43379,7 +46251,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif -#undef $ac_func +#undef strptime /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus @@ -43388,14 +46260,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 } @@ -43404,7 +46276,7 @@ char (*f) () = $ac_func; int main () { -return f != $ac_func; +return f != strptime; ; return 0; } @@ -43418,7 +46290,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -43430,49 +46303,47 @@ 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_localtime" = "yes"; then - echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5 -echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6 -if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then + if test "$ac_cv_func_strptime" = "yes"; then + echo "$as_me:$LINENO: checking for strptime declaration" >&5 +echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6 +if test "${wx_cv_func_strptime_decl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main () { - struct tm tm; - tm.tm_gmtoff++; + struct tm t; + strptime("foo", "bar", &t); ; return 0; @@ -43487,7 +46358,8 @@ 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_cxx_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=$? @@ -43499,156 +46371,172 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - wx_cv_struct_tm_has_gmtoff=yes - + wx_cv_func_strptime_decl=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -wx_cv_struct_tm_has_gmtoff=no +wx_cv_func_strptime_decl=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + fi -echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5 -echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6 +echo "$as_me:$LINENO: result: $wx_cv_func_strptime_decl" >&5 +echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6 fi - - if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then + if test "$wx_cv_func_strptime_decl" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define WX_GMTOFF_IN_TM 1 +#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" -for ac_func in gettimeofday ftime -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 + $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 +echo $ECHO_N "checking for timezone variable in ... $ECHO_C" >&6 +if test "${wx_cv_var_timezone+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + 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. */ -/* 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 + #include int main () { -return f != $ac_func; + + int tz; + tz = timezone; + ; 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 +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' + { 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' + { 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 - eval "$as_ac_var=yes" + + wx_cv_var_timezone=timezone + 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 - break -fi -done - - - if test "$ac_cv_func_gettimeofday" = "yes"; then - echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5 -echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6 -if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include int main () { - struct timeval tv; - gettimeofday(&tv, NULL); + int tz; + tz = _timezone; ; return 0; @@ -43663,7 +46551,8 @@ 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_cxx_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=$? @@ -43675,27 +46564,29 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - wx_cv_func_gettimeofday_has_2_args=yes + + wx_cv_var_timezone=_timezone + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -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 + #include int main () { - struct timeval tv; - gettimeofday(&tv); + int tz; + tz = __timezone; ; return 0; @@ -43710,7 +46601,8 @@ 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_cxx_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=$? @@ -43722,33 +46614,223 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - wx_cv_func_gettimeofday_has_2_args=no + + wx_cv_var_timezone=__timezone + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5 -echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;} - wx_cv_func_gettimeofday_has_2_args=unknown + if test "$USE_DOS" = 0 ; then + { echo "$as_me:$LINENO: WARNING: no timezone variable" >&5 +echo "$as_me: WARNING: no timezone variable" >&2;} + fi fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + fi -echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5 -echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6 +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 - if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then - cat >>confdefs.h <<\_ACEOF -#define WX_GETTIMEOFDAY_NO_TZ 1 + + +fi +echo "$as_me:$LINENO: result: $wx_cv_var_timezone" >&5 +echo "${ECHO_T}$wx_cv_var_timezone" >&6 + + if test "x$wx_cv_var_timezone" != x ; then + cat >>confdefs.h <<_ACEOF +#define WX_TIMEZONE $wx_cv_var_timezone +_ACEOF + + fi + + +for ac_func in localtime +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 + +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 + +fi +done + + + if test "$ac_cv_func_localtime" = "yes"; then + echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5 +echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6 +if test "${wx_cv_struct_tm_has_gmtoff+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 () +{ + + struct tm tm; + tm.tm_gmtoff++; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + wx_cv_struct_tm_has_gmtoff=yes + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +wx_cv_struct_tm_has_gmtoff=no + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5 +echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6 + fi + + if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define WX_GMTOFF_IN_TM 1 _ACEOF - fi fi SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" @@ -43830,7 +46912,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -43896,7 +46979,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -43949,6 +47033,12 @@ if test "${wx_cv_type_getsockname3+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 @@ -43979,7 +47069,8 @@ 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_cxx_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=$? @@ -43997,9 +47088,9 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - CXXFLAGS_OLD="$CXXFLAGS" + CFLAGS_OLD="$CFLAGS" if test "$GCC" = yes ; then - CXXFLAGS="-Werror $CXXFLAGS" + CFLAGS="-Werror $CFLAGS" fi cat >conftest.$ac_ext <<_ACEOF @@ -44032,7 +47123,8 @@ 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_cxx_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=$? @@ -44079,7 +47171,8 @@ 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_cxx_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=$? @@ -44104,11 +47197,17 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$CXXFLAGS_OLD" + CFLAGS="$CFLAGS_OLD" 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_type_getsockname3" >&5 @@ -44130,6 +47229,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 @@ -44160,7 +47265,8 @@ 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_cxx_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=$? @@ -44178,11 +47284,6 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - CXXFLAGS_OLD="$CXXFLAGS" - if test "$GCC" = yes ; then - CXXFLAGS="-Werror $CXXFLAGS" - fi - cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -44213,7 +47314,8 @@ 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_cxx_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=$? @@ -44260,7 +47362,8 @@ 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_cxx_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=$? @@ -44285,11 +47388,15 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$CXXFLAGS_OLD" - 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_type_getsockopt5" >&5 @@ -44395,6 +47502,12 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then if test "$USE_DARWIN" = 1; then echo "$as_me:$LINENO: checking headers have declarations needed for joystick support" >&5 echo $ECHO_N "checking headers have declarations needed for joystick support... $ECHO_C" >&6 + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -44421,7 +47534,8 @@ 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_cxx_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=$? @@ -44441,34 +47555,35 @@ 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 + echo "$as_me:$LINENO: result: $wxUSE_JOYSTICK" >&5 echo "${ECHO_T}$wxUSE_JOYSTICK" >&6 fi else + if test "$wxUSE_MGL" != "1"; then for ac_header in linux/joystick.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 @@ -44480,7 +47595,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -44492,100 +47608,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 + 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 - -# 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 - -# 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 @@ -44595,6 +47628,7 @@ fi done + fi fi if test "$wxUSE_JOYSTICK" = "yes"; then @@ -44611,6 +47645,13 @@ fi +if test "$wxUSE_FONTENUM" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FONTENUM 1 +_ACEOF + +fi + if test "$wxUSE_FONTMAP" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_FONTMAP 1 @@ -44661,7 +47702,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -44706,31 +47748,20 @@ fi fi fi -if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_EXPERIMENTAL_PRINTF 1 +if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UNICODE_UTF8 1 _ACEOF -fi - -if test "$wxUSE_POSTSCRIPT" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_POSTSCRIPT 1 + if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UTF8_LOCALE_ONLY 1 _ACEOF + fi fi -cat >>confdefs.h <<\_ACEOF -#define wxUSE_AFM_FOR_POSTSCRIPT 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define wxUSE_NORMALIZED_PS_FONTS 1 -_ACEOF - - if test "$wxUSE_CONSTRAINTS" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -44809,10 +47840,23 @@ _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; }; } +if test "$wxUSE_POSTSCRIPT" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_POSTSCRIPT 1 +_ACEOF + +fi + +cat >>confdefs.h <<\_ACEOF +#define wxUSE_AFM_FOR_POSTSCRIPT 1 +_ACEOF + + +if test "$wxUSE_SVG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_SVG 1 +_ACEOF + fi @@ -44829,30 +47873,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 @@ -44863,7 +47897,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -44875,108 +47910,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_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 +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_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_ole2_h" = "yes" ; then @@ -45008,7 +47953,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -45042,7 +47988,7 @@ _ACEOF _ACEOF cat >>confdefs.h <<\_ACEOF -#define wxUSE_OLE_ACTIVEX 1 +#define wxUSE_ACTIVEX 1 _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto" @@ -45095,9 +48041,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 @@ -45113,9 +48059,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 @@ -45136,21 +48082,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 @@ -45238,6 +48173,15 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret" fi +if test "$wxUSE_COLLPANE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_COLLPANE 1 +_ACEOF + + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS collpane" +fi + if test "$wxUSE_COMBOBOX" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_COMBOBOX 1 @@ -45284,7 +48228,6 @@ if test "$wxUSE_CHECKLST" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then @@ -45328,11 +48271,24 @@ _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" + fi +fi + +if test "$wxUSE_DETECT_SM" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DETECT_SM 1 +_ACEOF + fi if test "$wxUSE_GAUGE" = "yes"; then @@ -45398,7 +48354,6 @@ if test "$wxUSE_LISTBOX" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox" fi if test "$wxUSE_LISTCTRL" = "yes"; then @@ -45415,6 +48370,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 @@ -45433,7 +48397,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo" fi - if test "$wxUSE_RADIOBOX" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_RADIOBOX 1 @@ -45467,6 +48430,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 @@ -45665,9 +48636,9 @@ _ACEOF fi if test "$wxUSE_DIALUP_MANAGER" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then - { echo "$as_me:$LINENO: WARNING: Dialup manager not yet supported under Mac OS X... disabled" >&5 -echo "$as_me: WARNING: Dialup manager not yet supported under Mac OS X... disabled" >&2;} + if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then + { echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform... disabled" >&5 +echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;} else cat >>confdefs.h <<\_ACEOF #define wxUSE_DIALUP_MANAGER 1 @@ -45705,13 +48676,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" fi -if test "$wxUSE_DC_CACHEING" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_DC_CACHEING 1 -_ACEOF - -fi - if test "$wxUSE_DRAGIMAGE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_DRAGIMAGE 1 @@ -45760,7 +48724,10 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + + #include + #include + #include _ACEOF @@ -45773,7 +48740,8 @@ 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_cxx_werror_flag" || test ! -s conftest.err' + { 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=$? @@ -45850,6 +48818,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 @@ -45877,7 +48855,6 @@ if test "$wxUSE_MINIFRAME" = "yes"; then #define wxUSE_MINIFRAME 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" fi if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then @@ -45885,10 +48862,14 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then #define wxUSE_SYSTEM_OPTIONS 1 _ACEOF - if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \ - "$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" - fi +fi + +if test "$wxUSE_TASKBARICON" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TASKBARICON 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" fi @@ -45901,10 +48882,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 @@ -45942,6 +48929,13 @@ _ACEOF fi + if test "$wxUSE_TGA" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TGA 1 +_ACEOF + + fi + if test "$wxUSE_IFF" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_IFF 1 @@ -46088,6 +49082,63 @@ _ACEOF fi +if test "$wxUSE_MSW" = 1 ; then + + if test "$wxUSE_DC_CACHEING" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DC_CACHEING 1 +_ACEOF + + fi + + if test "$wxUSE_DIB" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WXDIB 1 +_ACEOF + + fi + + if test "$wxUSE_OWNER_DRAWN" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OWNER_DRAWN 1 +_ACEOF + + fi + + if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 +_ACEOF + + fi + + if test "$wxUSE_UXTHEME" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UXTHEME 1 +_ACEOF + + fi + +fi + + +if test "$USE_WIN32" = 1 ; then + if test "$wxUSE_INICONF" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_INICONF 1 +_ACEOF + + fi + + if test "$wxUSE_REGKEY" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_REGKEY 1 +_ACEOF + + fi +fi + + if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then cat >>confdefs.h <<\_ACEOF @@ -46159,28 +49210,22 @@ fi # Put the nasty error message in config.log where it belongs echo "$CAIRO_PKG_ERRORS" >&5 - - { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5 + { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5 echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&2;} - elif test $pkg_failed = untried; then - - { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5 + { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5 echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&2;} - else CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS CAIRO_LIBS=$pkg_cv_CAIRO_LIBS echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define wxUSE_GRAPHICS_CONTEXT 1 _ACEOF - fi fi fi @@ -46366,14 +49411,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" @@ -46422,42 +49459,60 @@ _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" -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" + BUILT_WX_LIBS="odbc $BUILT_WX_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 -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 @@ -46491,9 +49546,9 @@ 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" + erase event exec font image minimal mobile \ + mobile/wxedit mobile/styles render \ + shaped svg taborder vscroll widgets" if test "$wxUSE_MONOLITHIC" != "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" @@ -46530,13 +49585,13 @@ WXCONFIG_CXXFLAGS=`echo $WXCONFIG_CFLAGS $WXCONFIG_CXXFLAGS` CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \ - -I\\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \ + -I\\${wx_top_builddir}/lib/wx/include/${TOOLCHAIN_FULLNAME} \ -I\\${top_srcdir}/include $TOOLKIT_INCLUDE \ $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` @@ -46553,7 +49608,9 @@ 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 $EXTRALIBS_GTKPRINT` EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT` fi if test "$wxUSE_OPENGL" = "yes"; then @@ -46673,6 +49730,8 @@ fi + + @@ -46690,6 +49749,9 @@ case "$TOOLKIT" in TOOLKIT_DESC="GTK+" if test "$WXGTK20" = 1; then TOOLKIT_DESC="$TOOLKIT_DESC 2" + if test "$wxUSE_GTKPRINT" = "yes" ; then + TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing"; + fi if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint"; fi @@ -46719,21 +49781,51 @@ if test "$wxUSE_WINE" = "yes"; then BAKEFILE_FORCE_PLATFORM=win32 fi -if test "$wxUSE_MAC" = 1 ; then - if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then - if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then - OSX_UNIV_OPTS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk" - else - OSX_UNIV_OPTS=${wxUSE_UNIVERSAL_BINARY:+"-isysroot '$wxUSE_UNIVERSAL_BINARY'"} - fi - OSX_UNIV_OPTS="$OSX_UNIV_OPTS -arch ppc -arch i386" - CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS" - CFLAGS="$OSX_UNIV_OPTS $CFLAGS" - LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS" - bk_use_pch=no +if test "$wxUSE_UNICODE" = yes -a "$GCC" = yes -a "$bk_use_pch" != no +then + echo "$as_me:$LINENO: checking for gcc precompiled header bug" >&5 +echo $ECHO_N "checking for gcc precompiled header bug... $ECHO_C" >&6 +if test "${wx_cv_gcc_pch_bug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + echo '#include + const wchar_t test_var[] = L"awidetest";' > conftest.h + + echo '#include "conftest.h" + int main() + { + printf("%ls", test_var); + return 0; + }' > conftest.cpp + + wx_cv_gcc_pch_bug="pch not supported" + + if $CXX conftest.h >/dev/null 2>&1 + then + wx_cv_gcc_pch_bug= + + if $CXX -o conftest$PROGRAM_EXT conftest.cpp >/dev/null 2>&1 + then + if tr -dc '[a-z]' < conftest$PROGRAM_EXT | + grep awidetest >/dev/null + then + wx_cv_gcc_pch_bug=no + else + wx_cv_gcc_pch_bug=yes + fi + fi + fi + + rm -f conftest.h conftest.gch conftest.cpp conftest$PROGRAM_EXT + +fi +echo "$as_me:$LINENO: result: $wx_cv_gcc_pch_bug" >&5 +echo "${ECHO_T}$wx_cv_gcc_pch_bug" >&6 + + if test "$wx_cv_gcc_pch_bug" = yes; then + bk_use_pch=no fi - # TODO: where do we add "-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" for libtool (static builds only)? - # The makefile currently uses AR and RANLIB, which libtool apparently supercedes. fi @@ -46953,7 +50045,16 @@ fi - if test -n "$ac_tool_prefix"; then + 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. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -47033,6 +50134,10 @@ else AR="$ac_cv_prog_AR" fi + AROPTIONS=rcu + fi + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -47198,7 +50303,8 @@ fi *-hp-hpux* ) INSTALL_DIR="mkdir -p" ;; - *) INSTALL_DIR="$INSTALL -d" + * ) + INSTALL_DIR='$(INSTALL) -d' ;; esac @@ -47294,10 +50400,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 @@ -47440,74 +50543,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" @@ -47651,7 +50697,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -48255,6 +51302,7 @@ EOF powerpc-apple-macos* | \ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ + *-*-mirbsd* | \ *-*-sunos4* | \ *-*-osf* | \ *-*-dgux5* | \ @@ -48263,7 +51311,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" @@ -48294,7 +51345,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 @@ -48337,6 +51392,7 @@ fi; echo "$as_me:$LINENO: checking for dependency tracking method" >&5 echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6 + BK_DEPS="" if test "x$bk_use_trackdeps" = "xno" ; then DEPS_TRACKING=0 echo "$as_me:$LINENO: result: disabled" >&5 @@ -48493,12 +51549,14 @@ fi EOF chmod +x bk-deps + BK_DEPS="`pwd`/bk-deps" fi fi + case ${BAKEFILE_HOST} in *-*-cygwin* | *-*-mingw32* ) if test -n "$ac_tool_prefix"; then @@ -48663,10 +51721,10 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.2.0" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.0" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" @@ -48679,6 +51737,7 @@ fi; GCC_PCH=0 ICC_PCH=0 USE_PCH=0 + BK_MAKE_PCH="" case ${BAKEFILE_HOST} in *-*-cygwin* ) @@ -48727,7 +51786,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -48778,7 +51838,8 @@ 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_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -48878,6 +51939,7 @@ fi EOF chmod +x bk-make-pch + BK_MAKE_PCH="`pwd`/bk-make-pch" fi fi fi @@ -48885,6 +51947,7 @@ EOF + COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then COND_BUILD_DEBUG="" @@ -49015,6 +52078,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="" @@ -49065,11 +52133,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="" @@ -49080,6 +52178,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="" @@ -49145,11 +52263,6 @@ EOF COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="" - fi - COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="" @@ -49205,6 +52318,16 @@ EOF COND_PLATFORM_UNIX_1="" fi + COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#" + if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then + COND_PLATFORM_UNIX_1_TOOLKIT_MGL="" + fi + + COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#" + if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="" + fi + COND_PLATFORM_UNIX_1_USE_GUI_1="#" if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then COND_PLATFORM_UNIX_1_USE_GUI_1="" @@ -49265,6 +52388,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="" @@ -49505,6 +52633,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="" @@ -49585,6 +52718,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="" @@ -49670,6 +52808,112 @@ echo "$as_me: error: Versions of Bakefile used to generate makefiles ($BAKEFILE_ fi +case ${INSTALL} in + /* ) # Absolute + ;; + ?:* ) # Drive letter, considered as absolute. + ;; + *) + INSTALL=`pwd`/${INSTALL} ;; +esac + +if test "$wxUSE_GUI" = "yes"; then + +if test "$wxUSE_MSW" = 1 ; then + if test "x$WINDRES" = "x"; then + { { echo "$as_me:$LINENO: error: Required windres program not found" >&5 +echo "$as_me: error: Required windres program not found" >&2;} + { (exit 1); exit 1; }; } + fi + + RESCOMP="$WINDRES" +fi + +if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then + WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r" + WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc" + + LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}" + + # Extract the first word of "DeRez", so it can be a program name with args. +set dummy DeRez; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_DEREZ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$DEREZ"; then + ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DEREZ="DeRez" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez" +fi +fi +DEREZ=$ac_cv_prog_DEREZ +if test -n "$DEREZ"; then + echo "$as_me:$LINENO: result: $DEREZ" >&5 +echo "${ECHO_T}$DEREZ" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + + MACSETFILE="\$(SETFILE)" + + if test "$wxUSE_MAC" = 1; then + POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o" + RESCOMP="$REZ" + WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o" + else + POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}" + RESCOMP="cat /dev/null \| $REZ" + WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII" + fi + +else + MACSETFILE="@true" + + if test "$wxUSE_PM" = 1; then + RESCOMP="emxbind" + WXCONFIG_RESFLAGS="-ep" + + POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS" + else + POSTLINK_COMMAND="@true" + fi +fi + +fi + + +if test $GCC_PCH = 1 +then + if test "$wx_cv_gcc_pch_bug" = yes; then + { echo "$as_me:$LINENO: WARNING: *** Precompiled header support is broken on this compiler" >&5 +echo "$as_me: WARNING: *** Precompiled header support is broken on this compiler" >&2;} + { echo "$as_me:$LINENO: WARNING: *** --enable-precomp-headers is not recommended" >&5 +echo "$as_me: WARNING: *** --enable-precomp-headers is not recommended" >&2;} + { echo "$as_me:$LINENO: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&5 +echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&2;} + fi + + CPPFLAGS="-DWX_PRECOMP $CPPFLAGS" +fi + if test "$wxUSE_MAC" = 1 ; then if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then @@ -49688,8 +52932,8 @@ if test "$wxUSE_SHARED" = "yes"; then *-pc-os2_emx | *-pc-os2-emx ) SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" SHARED_LD_CXX="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" - cp -p ${srcdir}/src/os2/dllnames.sh . - cp -p ${srcdir}/src/os2/dllar.sh . + cp -p ${srcdir}/src/os2/dllnames.sh . + cp -p ${srcdir}/src/os2/dllar.sh . ;; esac else @@ -49707,12 +52951,30 @@ if test "$wxUSE_OMF" = "yes"; then esac fi -if test $GCC_PCH = 1 ; then - CPPFLAGS="-DWX_PRECOMP $CPPFLAGS" -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'`" @@ -49822,7 +53084,11 @@ fi ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" - ac_config_files="$ac_config_files version-script Makefile" +if test "$wx_cv_version_script" = "yes"; then + ac_config_files="$ac_config_files version-script" + +fi + ac_config_files="$ac_config_files Makefile" ac_config_commands="$ac_config_commands wx-config" @@ -49831,7 +53097,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 @@ -49978,7 +53244,7 @@ for subdir in `echo $SUBDIRS`; do disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`; eval "disabled=\$$disabled_var" disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ - makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"` + makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"` fi else if test ${subdir} = "samples"; then makefiles="samples/Makefile.in samples/console/Makefile.in" @@ -50365,7 +53631,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by wxWidgets $as_me 2.7.1, 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 @@ -50428,7 +53694,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.7.1 +wxWidgets config.status 2.9.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -50653,6 +53919,7 @@ s,@target@,$target,;t t s,@target_cpu@,$target_cpu,;t t s,@target_vendor@,$target_vendor,;t t s,@target_os@,$target_os,;t t +s,@wx_top_builddir@,$wx_top_builddir,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t @@ -50665,22 +53932,8 @@ s,@EGREP@,$EGREP,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@AR@,$AR,;t t s,@ac_ct_AR@,$ac_ct_AR,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@WINDRES@,$WINDRES,;t t -s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t -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 @@ -50699,14 +53952,14 @@ 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,@REZ@,$REZ,;t t -s,@DEREZ@,$DEREZ,;t t -s,@SETFILE@,$SETFILE,;t t +s,@CFLAGS_VISIBILITY@,$CFLAGS_VISIBILITY,;t t +s,@CXXFLAGS_VISIBILITY@,$CXXFLAGS_VISIBILITY,;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 +s,@GTKPRINT_CFLAGS@,$GTKPRINT_CFLAGS,;t t +s,@GTKPRINT_LIBS@,$GTKPRINT_LIBS,;t t s,@LIBGNOMEPRINTUI_CFLAGS@,$LIBGNOMEPRINTUI_CFLAGS,;t t s,@LIBGNOMEPRINTUI_LIBS@,$LIBGNOMEPRINTUI_LIBS,;t t s,@GNOMEVFS_CFLAGS@,$GNOMEVFS_CFLAGS,;t t @@ -50717,8 +53970,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 @@ -50733,6 +53988,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 @@ -50741,6 +53997,7 @@ s,@EXTRALIBS_GUI@,$EXTRALIBS_GUI,;t t s,@EXTRALIBS_OPENGL@,$EXTRALIBS_OPENGL,;t t s,@EXTRALIBS_SDL@,$EXTRALIBS_SDL,;t t s,@WITH_PLUGIN_SDL@,$WITH_PLUGIN_SDL,;t t +s,@EXTRALIBS_GTKPRINT@,$EXTRALIBS_GTKPRINT,;t t s,@EXTRALIBS_GNOMEPRINT@,$EXTRALIBS_GNOMEPRINT,;t t s,@EXTRALIBS_GNOMEVFS@,$EXTRALIBS_GNOMEVFS,;t t s,@EXTRALIBS_HILDON@,$EXTRALIBS_HILDON,;t t @@ -50755,12 +54012,22 @@ s,@SAMPLES_RPATH_POSTLINK@,$SAMPLES_RPATH_POSTLINK,;t t s,@HOST_SUFFIX@,$HOST_SUFFIX,;t t s,@CPPUNIT_CFLAGS@,$CPPUNIT_CFLAGS,;t t s,@CPPUNIT_LIBS@,$CPPUNIT_LIBS,;t t +s,@RANLIB@,$RANLIB,;t t +s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@LN_S@,$LN_S,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@MAKE_SET@,$MAKE_SET,;t t +s,@AROPTIONS@,$AROPTIONS,;t t +s,@STRIP@,$STRIP,;t t +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@NM@,$NM,;t t s,@ac_ct_NM@,$ac_ct_NM,;t t s,@INSTALL_DIR@,$INSTALL_DIR,;t t s,@LDFLAGS_GUI@,$LDFLAGS_GUI,;t t +s,@IF_GNU_MAKE@,$IF_GNU_MAKE,;t t s,@PLATFORM_UNIX@,$PLATFORM_UNIX,;t t s,@PLATFORM_WIN32@,$PLATFORM_WIN32,;t t s,@PLATFORM_MSDOS@,$PLATFORM_MSDOS,;t t @@ -50792,8 +54059,14 @@ s,@USE_MACVERSION@,$USE_MACVERSION,;t t s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t s,@SONAME_FLAG@,$SONAME_FLAG,;t t s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t +s,@BK_DEPS@,$BK_DEPS,;t t +s,@WINDRES@,$WINDRES,;t t +s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t +s,@REZ@,$REZ,;t t +s,@SETFILE@,$SETFILE,;t t s,@GCC_PCH@,$GCC_PCH,;t t s,@ICC_PCH@,$ICC_PCH,;t t +s,@BK_MAKE_PCH@,$BK_MAKE_PCH,;t t s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t s,@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT,;t t s,@COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT,;t t @@ -50820,6 +54093,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 @@ -50830,9 +54104,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 @@ -50846,7 +54130,6 @@ s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,; s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1,;t t -s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0,;t t s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF,;t t s,@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@,$COND_PLATFORM_MACOSX_1_TOOLKIT_X11,;t t s,@COND_PLATFORM_MACOSX_1_USE_GUI_1@,$COND_PLATFORM_MACOSX_1_USE_GUI_1,;t t @@ -50858,6 +54141,8 @@ s,@COND_PLATFORM_MSDOS_1@,$COND_PLATFORM_MSDOS_1,;t t s,@COND_PLATFORM_OS2_1@,$COND_PLATFORM_OS2_1,;t t s,@COND_PLATFORM_UNIX_0@,$COND_PLATFORM_UNIX_0,;t t s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t +s,@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@,$COND_PLATFORM_UNIX_1_TOOLKIT_MGL,;t t +s,@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@,$COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1,;t t s,@COND_PLATFORM_UNIX_1_USE_GUI_1@,$COND_PLATFORM_UNIX_1_USE_GUI_1,;t t s,@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@,$COND_PLATFORM_UNIX_1_USE_PLUGINS_0,;t t s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t @@ -50870,6 +54155,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 @@ -50918,6 +54204,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 @@ -50934,6 +54221,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 @@ -50948,6 +54236,7 @@ s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t +s,@DEREZ@,$DEREZ,;t t s,@SHARED@,$SHARED,;t t s,@WX_LIBRARY_BASENAME_NOGUI@,$WX_LIBRARY_BASENAME_NOGUI,;t t s,@WX_LIBRARY_BASENAME_GUI@,$WX_LIBRARY_BASENAME_GUI,;t t @@ -50989,6 +54278,7 @@ s,@LIBWXMACRES@,$LIBWXMACRES,;t t s,@POSTLINK_COMMAND@,$POSTLINK_COMMAND,;t t s,@MACSETFILE@,$MACSETFILE,;t t s,@GCC@,$GCC,;t t +s,@DLLTOOL@,$DLLTOOL,;t t s,@CPPUNIT_CONFIG@,$CPPUNIT_CONFIG,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t @@ -51158,6 +54448,11 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -51196,12 +54491,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;} fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub @@ -51786,7 +55075,7 @@ echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} { (exit 1); exit 1; }; } fi - cd "$ac_popdir" + cd $ac_popdir done fi @@ -51799,13 +55088,23 @@ 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 $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C" +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 " STL ${wxUSE_STL}" echo " jpeg ${wxUSE_LIBJPEG-none}" echo " png ${wxUSE_LIBPNG-none}" echo " regex ${wxUSE_REGEX}"