X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c122b1645e4783f42548f1dccdec4637489dcb83..61c213fe224da24ce33c9187263e75a17ca83a04:/configure?ds=sidebyside diff --git a/configure b/configure index 62b8478861..09504b3a7c 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Id: configure.in. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for wxWidgets 2.5.3. +# Generated by GNU Autoconf 2.59 for wxWidgets 2.6.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.5.3' -PACKAGE_STRING='wxWidgets 2.5.3' +PACKAGE_VERSION='2.6.0' +PACKAGE_STRING='wxWidgets 2.6.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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_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 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 ac_ct_AR ac_ct_STRIP 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 AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_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_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_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_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_OPENGL_1 COND_USE_PLUGINS_0 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_XRC_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_0 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_EXTRALIBS WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL CPPUNIT_CONFIG LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS GST_INSPECT CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WX_FLAVOUR WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GNOMEPRINT UNICODE BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET ac_ct_AR ac_ct_STRIP 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 AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_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_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_USE_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_OPENGL_1 COND_USE_PLUGINS_0 COND_USE_RTTI_0 COND_USE_RTTI_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_THREADS_0 COND_USE_THREADS_1 COND_USE_XRC_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_0 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_EXTRALIBS WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL CPPUNIT_CONFIG LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -794,7 +794,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 2.5.3 to adapt to many kinds of systems. +\`configure' configures wxWidgets 2.6.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -860,7 +860,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.5.3:";; + short | recursive ) echo "Configuration of wxWidgets 2.6.0:";; esac cat <<\_ACEOF @@ -903,10 +903,12 @@ Optional Features: --enable-dataobj use data object classes --enable-ipc use interprocess communication (wxSocket etc.) --enable-apple_ieee use the Apple IEEE codec - --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only) + --enable-arcstream use wxArchive streams --enable-backtrace use wxStackWalker class for getting backtraces + --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only) --enable-cmdline use wxCmdLineParser class --enable-datetime use wxDateTime class + --enable-debugreport use wxDebugReport class --enable-dialupman use dialup network classes --enable-dynlib use wxLibrary class for DLL loading --enable-dynamicloader use (new) wxDynamicLibrary class @@ -923,9 +925,11 @@ Optional Features: --enable-mimetype use wxMimeTypesManager --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only) --enable-snglinst use wxSingleInstanceChecker class - --enable-streams use wxStream etc classes --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-textbuf use wxTextBuffer class --enable-textfile use wxTextFile class @@ -934,7 +938,7 @@ Optional Features: --enable-sound use wxSound class --enable-mediactrl use wxMediaCtrl class --enable-wxprintfv use wxWidgets implementation of vprintf() - --enable-zipstream use wxZipInputStream + --enable-zipstream use wxZip streams --enable-url use wxURL class --enable-protocol use wxProtocol class --enable-protocol-http HTTP support in wxProtocol @@ -972,6 +976,7 @@ Optional Features: --enable-choice use wxChoice class --enable-choicebook use wxChoicebook class --enable-combobox use wxComboBox class + --enable-datepick use wxDatePickerCtrl class --enable-display use wxDisplay class --enable-gauge use wxGauge class --enable-grid use wxGrid class @@ -1020,9 +1025,10 @@ Optional Features: --enable-miniframe use wxMiniFrame class --enable-tooltips use wxToolTip class --enable-splines use spline drawing code + --enable-mousewheel use mousewheel --enable-validators use wxValidator and derived classes --enable-busyinfo use wxBusyInfo - --enable-joystick use wxJoystick (Linux only) + --enable-joystick use wxJoystick --enable-metafiles use wxMetaFile (Windows only) --enable-dragimage use wxDragImage --enable-accessibility enable accessibility support @@ -1047,7 +1053,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-gtk use GTK+ + --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any" --with-motif use Motif/Lesstif --with-mac use Mac OS X --with-cocoa use Cocoa @@ -1191,7 +1197,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.5.3 +wxWidgets configure 2.6.0 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1205,7 +1211,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.5.3, which was +It was created by wxWidgets $as_me 2.6.0, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1655,9 +1661,9 @@ test -n "$target_alias" && wx_major_version_number=2 -wx_minor_version_number=5 -wx_release_number=3 -wx_subrelease_number=3 +wx_minor_version_number=6 +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 @@ -1665,9 +1671,9 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number -WX_CURRENT=3 +WX_CURRENT=0 WX_REVISION=0 -WX_AGE=3 +WX_AGE=0 @@ -1720,6 +1726,8 @@ SO_SUFFIX=so SAMPLES_RPATH_FLAG= SAMPLES_RPATH_POSTLINK= +DEFAULT_STD_FLAG=yes + case "${host}" in *-hp-hpux* ) USE_HPUX=1 @@ -1923,6 +1931,7 @@ _ACEOF PROGRAM_EXT=".exe" RESCOMP=windres DEFAULT_DEFAULT_wxUSE_MSW=1 + DEFAULT_STD_FLAG=no ;; *-pc-msdosdjgpp ) @@ -1966,6 +1975,7 @@ _ACEOF done export PATH="$ac_TEMP_PATH" unset ac_TEMP_PATH + DEFAULT_STD_FLAG=no ;; powerpc-*-darwin* ) @@ -1978,10 +1988,6 @@ _ACEOF cat >>confdefs.h <<\_ACEOF #define __DARWIN__ 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define __POWERPC__ 1 _ACEOF cat >>confdefs.h <<\_ACEOF @@ -1989,12 +1995,14 @@ _ACEOF _ACEOF DEFAULT_DEFAULT_wxUSE_MAC=1 + DEFAULT_STD_FLAG=no ;; powerpc-apple-macos* ) USE_UNIX=0 ac_cv_c_bigendian=yes SO_SUFFIX=shlib DEFAULT_DEFAULT_wxUSE_MAC=1 + DEFAULT_STD_FLAG=no ;; *-*-beos* ) @@ -2071,14 +2079,17 @@ if test $DEBUG_CONFIGURE = 1; then 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 @@ -2107,6 +2118,7 @@ if test $DEBUG_CONFIGURE = 1; then 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 @@ -2153,6 +2165,7 @@ if test $DEBUG_CONFIGURE = 1; then 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 @@ -2166,6 +2179,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_CHOICEBOOK=no DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_DATEPICKCTRL=no DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no @@ -2262,14 +2276,17 @@ else DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes DEFAULT_wxUSE_STACKWALKER=yes + DEFAULT_wxUSE_DEBUGREPORT=yes DEFAULT_wxUSE_SNGLINST_CHECKER=yes - DEFAULT_wxUSE_STD_IOSTREAM=no + 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 @@ -2298,6 +2315,7 @@ else 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 @@ -2344,6 +2362,7 @@ else 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 @@ -2357,6 +2376,7 @@ else DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_CHOICEBOOK=yes DEFAULT_wxUSE_COMBOBOX=yes + DEFAULT_wxUSE_DATEPICKCTRL=yes DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes @@ -2411,12 +2431,18 @@ fi + for toolkit in `echo $ALL_TOOLKITS`; do LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}` if test "x$LINE" != "x" ; then has_toolkit_in_cache=1 eval "DEFAULT_$LINE" eval "CACHE_$toolkit=1" + + LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}` + if test "x$LINE" != "x" ; then + eval "DEFAULT_$LINE" + fi fi done @@ -2690,48 +2716,12 @@ echo "${ECHO_T}no" >&6 fi - - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gtk2" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-gtk2... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-gtk2 or --disable-gtk2 was given. +# Check whether --enable-gtk2 or --disable-gtk2 was given. if test "${enable_gtk2+set}" = set; then enableval="$enable_gtk2" - - if test "$enableval" = yes; then - ac_cv_use_gtk2='wxUSE_GTK2=yes' - else - ac_cv_use_gtk2='wxUSE_GTK2=no' - fi - -else - - LINE=`grep "wxUSE_GTK2" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_gtk2='wxUSE_GTK2='$DEFAULT_wxUSE_GTK2 - + wxUSE_GTK2="$enableval" fi; - eval "$ac_cv_use_gtk2" - if test "$no_cache" != 1; then - echo $ac_cv_use_gtk2 >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_GTK2" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6 @@ -3620,6 +3610,7 @@ echo "${ECHO_T}no" >&6 fi if test "$USE_OS2" = "1"; then + DEFAULT_wxUSE_OMF=no enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5 @@ -4667,38 +4658,38 @@ echo "${ECHO_T}no" >&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 + 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-catch_segvs or --disable-catch_segvs was given. -if test "${enable_catch_segvs+set}" = set; then - enableval="$enable_catch_segvs" + # 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_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes' + ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes' else - ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' + ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no' fi else - LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_ARCHIVE_STREAMS" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION + ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS='$DEFAULT_wxUSE_ARCHIVE_STREAMS fi; - eval "$ac_cv_use_catch_segvs" + eval "$ac_cv_use_arcstream" if test "$no_cache" != 1; then - echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_arcstream >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then + if test "$wxUSE_ARCHIVE_STREAMS" = yes; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else @@ -4748,6 +4739,47 @@ echo "${ECHO_T}no" >&6 fi + 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" + + if test "$enableval" = yes; then + ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes' + else + ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' + fi + +else + + LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION + +fi; + + eval "$ac_cv_use_catch_segvs" + if test "$no_cache" != 1; then + echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + + enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6 @@ -4830,6 +4862,47 @@ echo "${ECHO_T}no" >&6 fi + 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" + + if test "$enableval" = yes; then + ac_cv_use_debugreport='wxUSE_DEBUGREPORT=yes' + else + ac_cv_use_debugreport='wxUSE_DEBUGREPORT=no' + fi + +else + + LINE=`grep "wxUSE_DEBUGREPORT" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_debugreport='wxUSE_DEBUGREPORT='$DEFAULT_wxUSE_DEBUGREPORT + +fi; + + eval "$ac_cv_use_debugreport" + if test "$no_cache" != 1; then + echo $ac_cv_use_debugreport >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DEBUGREPORT" = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + + enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6 @@ -5487,38 +5560,38 @@ echo "${ECHO_T}no" >&6 enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6 + 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-streams or --disable-streams was given. -if test "${enable_streams+set}" = set; then - enableval="$enable_streams" + # 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_streams='wxUSE_STREAMS=yes' + ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' else - ac_cv_use_streams='wxUSE_STREAMS=no' + ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' fi else - LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS + ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM fi; - eval "$ac_cv_use_streams" + eval "$ac_cv_use_std_iostreams" if test "$no_cache" != 1; then - echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STREAMS" = yes; then + if test "$wxUSE_STD_IOSTREAM" = yes; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else @@ -5528,38 +5601,79 @@ echo "${ECHO_T}no" >&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 + 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_iostreams or --disable-std_iostreams was given. -if test "${enable_std_iostreams+set}" = set; then - enableval="$enable_std_iostreams" + # Check whether --enable-std_string or --disable-std_string was given. +if test "${enable_std_string+set}" = set; then + enableval="$enable_std_string" if test "$enableval" = yes; then - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' + ac_cv_use_std_string='wxUSE_STD_STRING=yes' else - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' + ac_cv_use_std_string='wxUSE_STD_STRING=no' fi else - LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_STD_STRING" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM + ac_cv_use_std_string='wxUSE_STD_STRING='$DEFAULT_wxUSE_STD_STRING fi; - eval "$ac_cv_use_std_iostreams" + eval "$ac_cv_use_std_string" if test "$no_cache" != 1; then - echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_std_string >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STD_IOSTREAM" = yes; then + if test "$wxUSE_STD_STRING" = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + + + enablestring= + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6 + no_cache=0 + # 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_stdpaths='wxUSE_STDPATHS=yes' + else + ac_cv_use_stdpaths='wxUSE_STDPATHS=no' + fi + +else + + LINE=`grep "wxUSE_STDPATHS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_stdpaths='wxUSE_STDPATHS='$DEFAULT_wxUSE_STDPATHS + +fi; + + eval "$ac_cv_use_stdpaths" + if test "$no_cache" != 1; then + echo $ac_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STDPATHS" = yes; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else @@ -5609,6 +5723,47 @@ echo "${ECHO_T}no" >&6 fi + 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" + + if test "$enableval" = yes; then + ac_cv_use_streams='wxUSE_STREAMS=yes' + else + ac_cv_use_streams='wxUSE_STREAMS=no' + fi + +else + + LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS + +fi; + + eval "$ac_cv_use_streams" + if test "$no_cache" != 1; then + echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STREAMS" = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + + enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6 @@ -7106,13 +7261,14 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_ACCEL=yes DEFAULT_wxUSE_BMPBUTTON=yes DEFAULT_wxUSE_BUTTON=yes - DEFAULT_wxUSE_CALCTRL=no + 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_DATEPICKCTRL=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes @@ -7152,6 +7308,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_CHECKLISTBOX=no DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_CHOICEBOOK=no + DEFAULT_wxUSE_DATEPICKCTRL=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_IMAGLIST=no @@ -7593,6 +7750,47 @@ echo "${ECHO_T}no" >&6 fi + 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" + + if test "$enableval" = yes; then + ac_cv_use_datepick='wxUSE_DATEPICKCTRL=yes' + else + ac_cv_use_datepick='wxUSE_DATEPICKCTRL=no' + fi + +else + + LINE=`grep "wxUSE_DATEPICKCTRL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_datepick='wxUSE_DATEPICKCTRL='$DEFAULT_wxUSE_DATEPICKCTRL + +fi; + + eval "$ac_cv_use_datepick" + if test "$no_cache" != 1; then + echo $ac_cv_use_datepick >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DATEPICKCTRL" = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + + enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6 @@ -9565,6 +9763,47 @@ echo "${ECHO_T}no" >&6 fi + 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" + + if test "$enableval" = yes; then + ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes' + else + ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no' + fi + +else + + LINE=`grep "wxUSE_MOUSEWHEEL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL='$DEFAULT_wxUSE_MOUSEWHEEL + +fi; + + eval "$ac_cv_use_mousewheel" + if test "$no_cache" != 1; then + echo $ac_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_MOUSEWHEEL" = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + + enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6 @@ -10221,6 +10460,7 @@ if test "$wxUSE_WINE" = "yes"; then wxUSE_SHARED=no fi + if test "$wxUSE_GUI" = "yes"; then if test "$USE_BEOS" = 1; then @@ -10233,7 +10473,15 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} for toolkit in `echo $ALL_TOOLKITS`; do var=wxUSE_$toolkit eval "value=\$${var}" - eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`" + 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 @@ -10241,6 +10489,11 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} 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 @@ -10269,6 +10522,13 @@ echo "$as_me: error: Please specify at most one toolkit (maybe some are cached i { (exit 1); exit 1; }; } esac + # 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 + for toolkit in `echo $ALL_TOOLKITS`; do var=wxUSE_$toolkit eval "value=\$${var}" @@ -10277,6 +10537,10 @@ echo "$as_me: error: Please specify at most one toolkit (maybe some are cached i 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]"` @@ -10434,7 +10698,9 @@ echo "$as_me: error: $build_alias -> $host_alias cross compilation not supported 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' @@ -11358,6 +11624,281 @@ 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 the C compiler requires -ext o" >&5 +echo $ECHO_N "checking if the C compiler requires -ext o... $ECHO_C" >&6 +if test "${wx_cv_c_exto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +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 () +{ + + ; + 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) + wx_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; }; } + +fi + +rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $wx_cv_c_exto" >&5 +echo "${ECHO_T}$wx_cv_c_exto" >&6 +if test "x$wx_cv_c_exto" '!=' "x"; then + if test "c" = "c"; then + CFLAGS="$wx_cv_c_exto $CFLAGS" + fi + if test "c" = "cxx"; then + CXXFLAGS="$wx_cv_c_exto $CXXFLAGS" + fi +fi + + if test "x$wx_cv_c_exto" '!=' "x"; then + unset ac_cv_prog_cc_g + ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +CFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +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. */ + +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_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 +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +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 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_compiler_mwerks=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_c_compiler_mwerks=$bakefile_compiler_mwerks + +fi +echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_mwerks" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler_mwerks" >&6 + +MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes` +ac_ext=c +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 "${wx_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 + wx_compiler_xlc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +wx_compiler_xlc=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + wx_cv_c_compiler_xlc=$wx_compiler_xlc + +fi +echo "$as_me:$LINENO: result: $wx_cv_c_compiler_xlc" >&5 +echo "${ECHO_T}$wx_cv_c_compiler_xlc" >&6 + +XLCC=`test $wx_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 + + ac_ext=c @@ -11671,7 +12212,9 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu CXXFLAGS=${CXXFLAGS:=} -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' @@ -12022,6 +12565,282 @@ 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 the C++ compiler requires -ext o" >&5 +echo $ECHO_N "checking if the C++ compiler requires -ext o... $ECHO_C" >&6 +if test "${wx_cv_cxx_exto+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +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 () +{ + + ; + 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) + wx_cv_cxx_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; }; } + +fi + +rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:$LINENO: result: $wx_cv_cxx_exto" >&5 +echo "${ECHO_T}$wx_cv_cxx_exto" >&6 +if test "x$wx_cv_cxx_exto" '!=' "x"; then + if test "cxx" = "c"; then + CFLAGS="$wx_cv_cxx_exto $CFLAGS" + fi + if test "cxx" = "cxx"; then + CXXFLAGS="$wx_cv_cxx_exto $CXXFLAGS" + fi +fi + + if test "x$wx_cv_cxx_exto" '!=' "x"; then + unset ac_cv_prog_cxx_g + ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +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. */ + +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 + ac_cv_prog_cxx_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +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 + fi + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +echo "$as_me:$LINENO: checking whether we are using the 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. */ +_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_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_compiler_mwerks=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 + +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 + + + 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 "${wx_cv_cxx_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_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_compiler_xlc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +wx_compiler_xlc=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + wx_cv_cxx_compiler_xlc=$wx_compiler_xlc + +fi +echo "$as_me:$LINENO: result: $wx_cv_cxx_compiler_xlc" >&5 +echo "${ECHO_T}$wx_cv_cxx_compiler_xlc" >&6 + +XLCXX=`test $wx_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 + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -12383,41 +13202,36 @@ fi +if test "x$XLCXX" = "xyes"; then + CXXFLAGS="$CXXFLAGS -qunique" +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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcExt $LIBS" -cat >conftest.$ac_ext <<_ACEOF + 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. */ -/* 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 (); +#ifndef __POWERPC__ + choke me for lack of PowerPC +#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 @@ -12430,53 +13244,41 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 + 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_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 +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + cat >>confdefs.h <<\_ACEOF +#define __POWERPC__ 1 +_ACEOF - else - RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" - fi - echo "$as_me:$LINENO: checking for gcc version" >&5 -echo $ECHO_N "checking for gcc version... $ECHO_C" >&6 -if test "${wx_cv_gccversion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + 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 int main () { - #if (__GNUC__ < 3) - #error old gcc - #endif - ; return 0; } @@ -12502,22 +13304,29 @@ 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 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - 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. */ +#define __CF_USE_FRAMEWORK_INCLUDES__ +#include int main () { - #if (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2))) - #error intermediate gcc - #endif - ; return 0; } @@ -12543,47 +13352,181 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - wx_cv_gccversion=Innotek - + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + CPPFLAGS="$CPPFLAGS -D__CF_USE_FRAMEWORK_INCLUDES__" 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; }; } - wx_cv_gccversion=3 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + ;; +esac +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 + 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. */ + +/* 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 conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_cExt_drand48=yes 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" +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. */ - wx_cv_gccversion=2 + #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 +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 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $wx_cv_gccversion" >&5 echo "${ECHO_T}$wx_cv_gccversion" >&6 - if test "$wx_cv_gccversion" = "2"; then + if test "$wx_cv_gccversion" = "EMX2"; then LIBS="$LIBS -lstdcpp" LDFLAGS="$LDFLAGS -Zsysv-signals" else - if test "$wx_cv_gccversion" = "3"; then + if test "$wx_cv_gccversion" = "EMX3"; then LIBS="$LIBS -lstdcxx" LDFLAGS="$LDFLAGS -Zsysv-signals" else LIBS="$LIBS -lstdc++" fi fi - if test "$wxUSE_OMF" = "yes"; then - LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK" + 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 ;; *) @@ -12597,8 +13540,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -echo "$as_me:$LINENO: checking for strcasecmp() in string.h" >&5 + 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 @@ -14139,7 +15081,10 @@ done case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) - if test $ac_cv_header_langinfo_h = "yes"; then + 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 ;; @@ -18207,24 +19152,10 @@ _ACEOF esac -echo "$as_me:$LINENO: checking size of wchar_t" >&5 -echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 -if test "${wx_cv_sizeof_wchar_t+set}" = set; then +echo "$as_me:$LINENO: checking for wchar_t" >&5 +echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 +if test "${ac_cv_type_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test "$cross_compiling" = yes; then - - case "${host}" in - *-pc-msdosdjgpp ) - wx_cv_sizeof_wchar_t=0 - ;; - * ) - wx_cv_sizeof_wchar_t=4 - ;; - esac - - else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -18233,87 +19164,37 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - /* DJGPP only has fake wchar_t: */ - #ifdef __DJGPP__ - # error "fake wchar_t" - #endif - #ifdef HAVE_WCHAR_H - # ifdef __CYGWIN__ - # include - # endif - # include - #endif - #ifdef HAVE_STDLIB_H - # include - #endif - #include - int main() - { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%i", sizeof(wchar_t)); - 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_sizeof_wchar_t=`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_sizeof_wchar_t=0 -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_sizeof_wchar_t" >&5 -echo "${ECHO_T}$wx_cv_sizeof_wchar_t" >&6 - -cat >>confdefs.h <<_ACEOF -#define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t -_ACEOF + /* DJGPP only has fake wchar_t: */ + #ifdef __DJGPP__ + # error "fake wchar_t" + #endif + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include -echo "$as_me:$LINENO: checking for va_copy" >&5 -echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 -if test "${wx_cv_func_va_copy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF - #include - void foo(char *f, ...) - { - va_list ap1, ap2; - va_start(ap1, f); - va_copy(ap2, ap1); - va_end(ap2); - va_end(ap1); - } - int main() - { - foo("hi", 17); - return 0; - } +int +main () +{ +if ((wchar_t *) 0) + return 0; +if (sizeof (wchar_t)) + return 0; + ; + 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 @@ -18326,127 +19207,636 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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 - wx_cv_func_va_copy=yes + ac_cv_type_wchar_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -wx_cv_func_va_copy=no - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - -fi -echo "$as_me:$LINENO: result: $wx_cv_func_va_copy" >&5 -echo "${ECHO_T}$wx_cv_func_va_copy" >&6 - -if test $wx_cv_func_va_copy = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_VA_COPY 1 -_ACEOF - -else - echo "$as_me:$LINENO: checking if va_list can be copied by value" >&5 -echo $ECHO_N "checking if va_list can be copied by value... $ECHO_C" >&6 -if test "${wx_cv_type_va_list_lvalue+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test "$cross_compiling" = yes; then - wx_cv_type_va_list_lvalue=yes - -else - cat >conftest.$ac_ext <<_ACEOF - - #include - int foo(char *f, ...) - { - va_list ap1, ap2; - va_start(ap1, f); - ap2 = ap1; - if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 ) - return 1; - va_end(ap2); - va_end(ap1); - return 0; - } - int main() - { - return foo("hi", 17); - } -_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_type_va_list_lvalue=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_type_va_list_lvalue=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - +ac_cv_type_wchar_t=no fi -echo "$as_me:$LINENO: result: $wx_cv_type_va_list_lvalue" >&5 -echo "${ECHO_T}$wx_cv_type_va_list_lvalue" >&6 - - if test $wx_cv_type_va_list_lvalue != "yes"; then - cat >>confdefs.h <<\_ACEOF -#define VA_LIST_IS_ARRAY 1 -_ACEOF - - fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5 +echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -# Check whether --enable-largefile or --disable-largefile was given. -if test "${enable_largefile+set}" = set; then - enableval="$enable_largefile" - -fi; -if test "$enable_largefile" != no; then - wx_largefile=no - - echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 -if test "${ac_cv_sys_file_offset_bits+set}" = set; then +echo "$as_me:$LINENO: checking size of wchar_t" >&5 +echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 +if test "${ac_cv_sizeof_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF + if test "$ac_cv_type_wchar_t" = yes; then + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#define _FILE_OFFSET_BITS 64 - #include + + /* DJGPP only has fake wchar_t: */ + #ifdef __DJGPP__ + # error "fake wchar_t" + #endif + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + + + int main () { -typedef struct { - unsigned int field: sizeof(off_t) == 8; -} wxlf; +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) >= 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. */ + + /* DJGPP only has fake wchar_t: */ + #ifdef __DJGPP__ + # error "fake wchar_t" + #endif + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + + + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) <= $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. */ + + /* DJGPP only has fake wchar_t: */ + #ifdef __DJGPP__ + # error "fake wchar_t" + #endif + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + + + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) < 0)]; +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. */ + + /* DJGPP only has fake wchar_t: */ + #ifdef __DJGPP__ + # error "fake wchar_t" + #endif + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + + + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) >= $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. */ + + /* DJGPP only has fake wchar_t: */ + #ifdef __DJGPP__ + # error "fake wchar_t" + #endif + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + + + +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (wchar_t))) <= $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_wchar_t=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (wchar_t), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 +echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + /* DJGPP only has fake wchar_t: */ + #ifdef __DJGPP__ + # error "fake wchar_t" + #endif + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + + + +long longval () { return (long) (sizeof (wchar_t)); } +unsigned long ulongval () { return (long) (sizeof (wchar_t)); } +#include +#include +int +main () +{ + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (wchar_t))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (wchar_t)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (wchar_t)))) + 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_wchar_t=`cat conftest.val` +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (wchar_t), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (wchar_t), 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_wchar_t=0 +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_wchar_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 +cat >>confdefs.h <<_ACEOF +#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t +_ACEOF + + + +echo "$as_me:$LINENO: checking for va_copy" >&5 +echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 +if test "${wx_cv_func_va_copy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF + + #include + void foo(char *f, ...) + { + va_list ap1, ap2; + va_start(ap1, f); + va_copy(ap2, ap1); + va_end(ap2); + va_end(ap1); + } + int main() + { + foo("hi", 17); + return 0; + } +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + wx_cv_func_va_copy=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +wx_cv_func_va_copy=no + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + +fi +echo "$as_me:$LINENO: result: $wx_cv_func_va_copy" >&5 +echo "${ECHO_T}$wx_cv_func_va_copy" >&6 + +if test $wx_cv_func_va_copy = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_VA_COPY 1 +_ACEOF + +else + echo "$as_me:$LINENO: checking if va_list can be copied by value" >&5 +echo $ECHO_N "checking if va_list can be copied by value... $ECHO_C" >&6 +if test "${wx_cv_type_va_list_lvalue+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test "$cross_compiling" = yes; then + wx_cv_type_va_list_lvalue=yes + +else + cat >conftest.$ac_ext <<_ACEOF + + #include + int foo(char *f, ...) + { + va_list ap1, ap2; + va_start(ap1, f); + ap2 = ap1; + if ( va_arg(ap1, int) != 17 || va_arg(ap2, int) != 17 ) + return 1; + va_end(ap2); + va_end(ap1); + return 0; + } + int main() + { + return foo("hi", 17); + } +_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_type_va_list_lvalue=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_type_va_list_lvalue=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_type_va_list_lvalue" >&5 +echo "${ECHO_T}$wx_cv_type_va_list_lvalue" >&6 + + if test $wx_cv_type_va_list_lvalue != "yes"; then + cat >>confdefs.h <<\_ACEOF +#define VA_LIST_IS_ARRAY 1 +_ACEOF + + fi +fi + +# Check whether --enable-largefile or --disable-largefile was given. +if test "${enable_largefile+set}" = set; then + enableval="$enable_largefile" + +fi; +if test "$enable_largefile" != no; then + wx_largefile=no + + echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_file_offset_bits+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 _FILE_OFFSET_BITS 64 + #include +int +main () +{ +typedef struct { + unsigned int field: sizeof(off_t) == 8; +} wxlf; ; return 0; @@ -19795,7 +21185,8 @@ _ACEOF fi -if test "$wxUSE_STL" = "yes"; then +if test "$wxUSE_UNICODE" = "yes" -a \ + \( "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes" \); then ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -19803,8 +21194,8 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - echo "$as_me:$LINENO: checking for basic STL functionality" >&5 -echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for std::wstring in " >&5 +echo $ECHO_N "checking for std::wstring in ... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19812,18 +21203,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #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::wstring foo; ; return 0; } @@ -19851,20 +21234,103 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 + 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;} + echo "$as_me:$LINENO: checking if std::basic_string works" >&5 +echo $ECHO_N "checking if std::basic_string works... $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 HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + #include + +int +main () +{ +std::basic_string foo; + const wchar_t* dummy = foo.c_str(); + ; + 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 +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: Can't compile without unicode string class" >&5 +echo "$as_me: error: Can't compile without unicode string class" >&2;} { (exit 1); exit 1; }; } + fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: checking for std::wstring in " >&5 -echo $ECHO_N "checking for std::wstring in ... $ECHO_C" >&6 +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 + +if test "$wxUSE_STL" = "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 for basic STL functionality" >&5 +echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -19872,10 +21338,18 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include + #include + #include + #include + #include int main () { -std::wstring foo; +std::vector moo; + std::list foo; + std::vector::iterator it = + std::find_if(moo.begin(), moo.end(), + std::bind2nd(std::less(), 3)); ; return 0; } @@ -19903,16 +21377,15 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 - 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; }; } fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext @@ -20449,7 +21922,7 @@ SEARCH_INCLUDE="\ \ /usr/openwin/share/include" -SEARCH_LIB="/usr/lib /usr/lib32 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g` /usr/lib64 /usr/X11R6/lib64" +SEARCH_LIB="/usr/lib /usr/lib32 /usr/lib64 /usr/X11R6/lib64 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g`" cat >confcache <<\_ACEOF @@ -22809,8 +24282,8 @@ echo "${ECHO_T}" >&6 GTK_MODULES=gthread fi - wx_cv_lib_gtk= - if test "x$wxUSE_GTK2" = "xyes"; then + wx_cv_lib_gtk= + if test "x$wxGTK_VERSION" != "x1"; then # Check whether --enable-gtktest or --disable-gtktest was given. if test "${enable_gtktest+set}" = set; then enableval="$enable_gtktest" @@ -23113,7 +24586,10 @@ rm -f conftest.err conftest.$ac_objext \ rm -f conf.gtktest - else + fi + + if test -z "$wx_cv_lib_gtk"; then + if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then # Check whether --with-gtk-prefix or --without-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then @@ -23428,7 +24904,7 @@ rm -f conftest.err conftest.$ac_objext \ rm -f conf.gtktest - if test -z "$wx_cv_lib_gtk"; then + if test -z "$wx_cv_lib_gtk"; then # Check whether --with-gtk-prefix or --without-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then @@ -23742,6 +25218,7 @@ rm -f conftest.err conftest.$ac_objext \ rm -f conf.gtktest + fi fi fi @@ -23771,16 +25248,20 @@ echo "${ECHO_T}$wx_cv_lib_gtk" >&6 1.2.3) WXGTK12=1 ;; *) { { echo "$as_me:$LINENO: error: -Please check that gtk-config is in path, the directory -where GTK+ libraries are installed (returned by -'gtk-config --libs' command) is in LD_LIBRARY_PATH or -equivalent variable and GTK+ is version 1.2.3 or above. +The development files for GTK+ were not found. For GTK+ 2, please +ensure that pkg-config is in the path and that gtk+-2.0.pc is +installed. For GTK+ 1.2 please check that gtk-config is in the path, +and that the version is 1.2.3 or above. Also check that the +libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config +--libs' are in the LD_LIBRARY_PATH or equivalent. " >&5 echo "$as_me: error: -Please check that gtk-config is in path, the directory -where GTK+ libraries are installed (returned by -'gtk-config --libs' command) is in LD_LIBRARY_PATH or -equivalent variable and GTK+ is version 1.2.3 or above. +The development files for GTK+ were not found. For GTK+ 2, please +ensure that pkg-config is in the path and that gtk+-2.0.pc is +installed. For GTK+ 1.2 please check that gtk-config is in the path, +and that the version is 1.2.3 or above. Also check that the +libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config +--libs' are in the LD_LIBRARY_PATH or equivalent. " >&2;} { (exit 1); exit 1; }; } ;; @@ -23789,8 +25270,8 @@ equivalent variable and GTK+ is version 1.2.3 or above. if test "$WXGTK20" = 1; then save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" + CFLAGS="$CFLAGS $wx_cv_cflags_gtk" + LIBS="$LIBS $wx_cv_lib_gtk" for ac_func in pango_font_family_is_monospace @@ -26152,6 +27633,12 @@ 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 @@ -27266,23 +28753,24 @@ echo "$as_me: WARNING: system ODBC library not found, will use built-in instead" wxUSE_ODBC=sys fi fi - if test "$wxUSE_ODBC" != "no" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_ODBC 1 -_ACEOF - if test "$wxUSE_ODBC" = "builtin" ; then - cat >>confdefs.h <<\_ACEOF + if test "$wxUSE_ODBC" = "builtin" ; then + cat >>confdefs.h <<\_ACEOF #define wxUSE_BUILTIN_IODBC 1 _ACEOF - fi - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" - - WXODBCFLAG="-D_IODBC_" fi fi +if test "$wxUSE_ODBC" != "no" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ODBC 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" + + WXODBCFLAG="-D_IODBC_" +fi if test "$wxUSE_DISPLAY" = "yes"; then @@ -27485,93 +28973,6 @@ done fi -if test "$wxUSE_MEDIACTRL" = "yes"; then - if test "$wxUSE_MSW" = 1; then - wxUSE_DIRECTSHOW="yes" - -for ac_header in dshow.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. */ -#include - -#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 - -else - - wxUSE_DIRECTSHOW="no" - { echo "$as_me:$LINENO: WARNING: DirectShow not installed; consider installing the DirectX7 SDK or higher" >&5 -echo "$as_me: WARNING: DirectShow not installed; consider installing the DirectX7 SDK or higher" >&2;} - -fi - -done - - - if test "$wxUSE_DIRECTSHOW" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_DIRECTSHOW 1 -_ACEOF - - LIBS="$LIBS -lstrmiids" - fi - fi - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer" - cat >>confdefs.h <<\_ACEOF -#define wxUSE_MEDIACTRL 1 -_ACEOF - -fi - - USE_OPENGL=0 if test "$wxUSE_OPENGL" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then @@ -27764,6 +29165,9 @@ for ac_dir in $SEARCH_LIB /usr/lib; done if test "$ac_find_libraries" != "" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null result=$? @@ -27777,6 +29181,8 @@ for ac_dir in $SEARCH_LIB /usr/lib; LDFLAGS_GL="$ac_path_to_link" fi + echo "$as_me:$LINENO: checking for -lGLU" >&5 +echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6 ac_find_libraries= for ac_dir in $SEARCH_LIB /usr/lib; @@ -27808,12 +29214,16 @@ for ac_dir in $SEARCH_LIB /usr/lib; OPENGL_LIBS="-lGL -lGLU" 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 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test "$found_gl" != 1; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 echo "$as_me:$LINENO: checking for -lMesaGL" >&5 echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6 @@ -27922,7 +29332,48 @@ else 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 { 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' + { (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' + { (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 + 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 @@ -28081,6 +29532,11 @@ EOF TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1" ;; + *-*-hpux* ) + SAMPLES_RPATH_FLAG="-Wl,+b,\$(top_builddir)lib" + WXCONFIG_RPATH="-Wl,+b,\$libdir" + ;; + esac if test $wxUSE_RPATH = "no"; then @@ -28142,6 +29598,136 @@ WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_u +if test "$wxUSE_COCOA" = 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 + +ac_ext=m + + echo "$as_me:$LINENO: checking if AppKit/NSEvent.h conflicts with CoreFoundation" >&5 +echo $ECHO_N "checking if AppKit/NSEvent.h conflicts with CoreFoundation... $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 +#include + +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_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: no" >&5 +echo "${ECHO_T}no" >&6 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking if defining __Point__ will fix it" >&5 +echo $ECHO_N "checking if defining __Point__ will fix it... $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 __Point__ 1 +#include +#include + +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_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 + cat >>confdefs.h <<\_ACEOF +#define __Point__ 1 +_ACEOF + + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: no +See \`config.log' for more details." >&5 +echo "$as_me: error: no +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + +fi +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 + 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" @@ -28260,9 +29846,9 @@ fi MACSETFILE="\$(SETFILE)" if test "$wxUSE_MAC" = 1; then - MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o" + MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r -o" - MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o" + MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r -o" else MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o" MACRESWXCONFIG="echo -n \\\| ${RESCOMP} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o" @@ -28871,7 +30457,7 @@ _ACEOF fi -if test "$wx_cv_sizeof_wchar_t" != "0"; then +if test "$ac_cv_sizeof_wchar_t" != "0"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_WCHAR_T 1 _ACEOF @@ -29131,7 +30717,7 @@ _ACEOF fi - if test "$USE_HPUX" = 1 -a "x$GCC" != "xyes"; then + if test "$USE_HPUX" = 1; then CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE " fi @@ -30185,9 +31771,9 @@ 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 @@ -30200,7 +31786,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' + { ac_try='test -s conftest$ac_exeext' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -30214,7 +31800,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 wx_cv_func_cxa_demangle=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 @@ -30237,6 +31824,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi +if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then + { echo "$as_me:$LINENO: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5 +echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;} + wxUSE_STACKWALKER=no +fi + + for ac_func in mkstemp mktemp @@ -34699,8 +36293,10 @@ echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6 sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` if test "x$enable_sdltest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" rm -f conf.sdltest if test "$cross_compiling" = yes; then @@ -34794,6 +36390,7 @@ fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi CFLAGS="$ac_save_CFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" LIBS="$ac_save_LIBS" fi fi @@ -34822,6 +36419,7 @@ echo "${ECHO_T}no" >&6 else echo "*** Could not run SDL test program, checking why..." CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" LIBS="$LIBS $SDL_LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -34888,6 +36486,7 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" LIBS="$ac_save_LIBS" fi fi @@ -35077,11 +36676,26 @@ _ACEOF fi -if test "$wxUSE_ZIPSTREAM" = "yes"; then +if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then cat >>confdefs.h <<\_ACEOF +#define wxUSE_ARCHIVE_STREAMS 1 +_ACEOF + +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_ON_FATAL_EXCEPTION" = "yes"; then @@ -35098,6 +36712,22 @@ _ACEOF fi +if test "$wxUSE_DEBUGREPORT" = "yes"; then + if test "$USE_OS2" = "1"; then + { echo "$as_me:$LINENO: WARNING: Creating debug reports not supported under OS/2 yet, disabled" >&5 +echo "$as_me: WARNING: Creating debug reports not supported under OS/2 yet, disabled" >&2;} + wxUSE_DEBUGREPORT=no + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DEBUGREPORT 1 +_ACEOF + + if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt" + fi + fi +fi + if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SNGLINST_CHECKER 1 @@ -35119,6 +36749,20 @@ _ACEOF fi +if test "$wxUSE_STD_STRING" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_STD_STRING 1 +_ACEOF + +fi + +if test "$wxUSE_STDPATHS" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_STDPATHS 1 +_ACEOF + +fi + if test "$wxUSE_TEXTBUFFER" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_TEXTBUFFER 1 @@ -35145,6 +36789,10 @@ echo "$as_me: WARNING: wxConfig requires wxTextFile... disabled" >&2;} else cat >>confdefs.h <<\_ACEOF #define wxUSE_CONFIG 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_CONFIG_NATIVE 1 _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config" @@ -35191,6 +36839,8 @@ _ACEOF _ACEOF fi + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS keyboard" fi if test "$wxUSE_LONGLONG" = "yes"; then @@ -35207,14 +36857,6 @@ _ACEOF fi -if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_DIALUP_MANAGER 1 -_ACEOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" -fi - if test "$wxUSE_STREAMS" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_STREAMS 1 @@ -36565,15 +38207,9 @@ fi if test "$wxUSE_GUI" = "yes"; then + if test "$wxUSE_JOYSTICK" = "yes"; then - if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then - { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Mac OS X... disabled" >&5 -echo "$as_me: WARNING: Joystick not yet supported under Mac OS X... disabled" >&2;} - wxUSE_JOYSTICK=no - fi - - if test "$TOOLKIT" != "MSW"; then - if test "$wxUSE_JOYSTICK" = "yes"; then + if test "$TOOLKIT" != "MAC" -a "$TOOLKIT" != "COCOA" -a "$TOOLKIT" != "MSW"; then for ac_header in linux/joystick.h do @@ -36728,15 +38364,22 @@ done { echo "$as_me:$LINENO: WARNING: Joystick not supported by this system... disabled" >&5 echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;} fi + else + if test "$USE_DARWIN" != 1 -a "$TOOLKIT" != "MSW"; then + wxUSE_JOYSTICK=no + { echo "$as_me:$LINENO: WARNING: Joystick not supported by this system... disabled" >&5 +echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;} + fi fi - fi - if test "$wxUSE_JOYSTICK" = "yes"; then - cat >>confdefs.h <<\_ACEOF + + if test "$wxUSE_JOYSTICK" = "yes"; then + cat >>confdefs.h <<\_ACEOF #define wxUSE_JOYSTICK 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" + fi fi fi @@ -37174,6 +38817,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu #define wxUSE_OLE 1 _ACEOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto" fi fi @@ -37207,15 +38851,19 @@ _ACEOF fi if test "$wxUSE_IPC" = "yes"; then - if test "$wxUSE_SOCKETS" != "yes"; then + if test "$wxUSE_SOCKETS" != "yes" -a "$USE_WIN32" != 1; then { echo "$as_me:$LINENO: WARNING: wxWidgets IPC classes require sockets... disabled" >&5 echo "$as_me: WARNING: wxWidgets IPC classes require sockets... disabled" >&2;} + wxUSE_IPC=no fi - cat >>confdefs.h <<\_ACEOF + if test "$wxUSE_IPC" = "yes"; then + cat >>confdefs.h <<\_ACEOF #define wxUSE_IPC 1 _ACEOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc" + fi fi if test "$wxUSE_CLIPBOARD" = "yes"; then @@ -37285,6 +38933,13 @@ _ACEOF fi +if test "$wxUSE_MOUSEWHEEL" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_MOUSEWHEEL 1 +_ACEOF + +fi + USES_CONTROLS=0 if test "$wxUSE_CONTROLS" = "yes"; then @@ -37374,12 +39029,20 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi +if test "$wxUSE_DATEPICKCTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DATEPICKCTRL 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_DISPLAY" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_DISPLAY 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon" fi if test "$wxUSE_GAUGE" = "yes"; then @@ -37420,6 +39083,7 @@ if test "$wxUSE_LISTBOX" = "yes"; then _ACEOF USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox" fi if test "$wxUSE_LISTCTRL" = "yes"; then @@ -37562,7 +39226,6 @@ if test "$wxUSE_TABDIALOG" = "yes"; then #define wxUSE_TAB_DIALOG 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" fi if test "$wxUSE_TEXTCTRL" = "yes"; then @@ -37579,12 +39242,6 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5 echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;} wxUSE_TOGGLEBTN=no - else - if test "$wxUSE_PM" = 1; then - { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under PM... disabled" >&5 -echo "$as_me: WARNING: Toggle button not yet supported under PM... disabled" >&2;} - wxUSE_TOGGLEBTN=no - fi fi if test "$wxUSE_UNIVERSAL" = "yes"; then { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&5 @@ -37676,12 +39333,26 @@ echo "$as_me: WARNING: wxPopupWindow not yet supported under PM... disabled" >&2 #define wxUSE_POPUPWIN 1 _ACEOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup" USES_CONTROLS=1 fi fi 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;} + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DIALUP_MANAGER 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" + fi +fi + if test "$wxUSE_TIPWINDOW" = "yes"; then if test "$wxUSE_PM" = 1; then { echo "$as_me:$LINENO: WARNING: wxTipWindow not yet supported under PM... disabled" >&5 @@ -37783,279 +39454,625 @@ 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_WebKit_HIWebView_h=yes + ac_cv_header_WebKit_HIWebView_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_WebKit_HIWebView_h=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_header_WebKit_HIWebView_h" >&5 +echo "${ECHO_T}$ac_cv_header_WebKit_HIWebView_h" >&6 +if test $ac_cv_header_WebKit_HIWebView_h = yes; then + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WEBKIT 1 +_ACEOF + + WEBKIT_LINK="-framework WebKit" + +else + + { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling wxWebKit" >&5 +echo "$as_me: WARNING: WebKit headers not found; disabling wxWebKit" >&2;} + wxUSE_WEBKIT=no + +fi + + + CPPFLAGS="$old_CPPFLAGS" + elif test "$wxUSE_COCOA" = 1; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WEBKIT 1 +_ACEOF + + else + wxUSE_WEBKIT=no + fi +fi + +USE_XRC=0 +if test "$wxUSE_XRC" = "yes"; then + if test "$wxUSE_XML" != "yes"; then + { echo "$as_me:$LINENO: WARNING: XML library not built, XRC resources disabled" >&5 +echo "$as_me: WARNING: XML library not built, XRC resources disabled" >&2;} + wxUSE_XRC=no + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_XRC 1 +_ACEOF + + USE_XRC=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc" + fi +fi + +if test "$wxUSE_MENUS" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_MENUS 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu" +fi + +if test "$wxUSE_METAFILE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_METAFILE 1 +_ACEOF + +fi + +if test "$wxUSE_MIMETYPE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_MIMETYPE 1 +_ACEOF + +fi + +if test "$wxUSE_MINIFRAME" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_MINIFRAME 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" +fi + +if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#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_VALIDATORS" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_VALIDATORS 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" +fi + +if test "$wxUSE_PALETTE" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_PALETTE 1 +_ACEOF + +fi + +if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then + LIBS=" -lunicows $LIBS" +fi + + +if test "$wxUSE_IMAGE" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_IMAGE 1 +_ACEOF + + + if test "$wxUSE_GIF" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_GIF 1 +_ACEOF + + fi + + if test "$wxUSE_PCX" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_PCX 1 +_ACEOF + + fi + + if test "$wxUSE_IFF" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_IFF 1 +_ACEOF + + fi + + if test "$wxUSE_PNM" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_PNM 1 +_ACEOF + + fi + + if test "$wxUSE_XPM" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_XPM 1 +_ACEOF + + fi + + if test "$wxUSE_ICO_CUR" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ICO_CUR 1 +_ACEOF + + fi +fi + + +if test "$wxUSE_CHOICEDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_CHOICEDLG 1 +_ACEOF + +fi + +if test "$wxUSE_COLOURDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_COLOURDLG 1 +_ACEOF + +fi + +if test "$wxUSE_FILEDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FILEDLG 1 +_ACEOF + +fi + +if test "$wxUSE_FINDREPLDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FINDREPLDLG 1 +_ACEOF + +fi + +if test "$wxUSE_FONTDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FONTDLG 1 +_ACEOF + +fi + +if test "$wxUSE_DIRDLG" = "yes"; then + if test "$wxUSE_TREECTRL" != "yes"; then + { echo "$as_me:$LINENO: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&5 +echo "$as_me: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&2;} + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DIRDLG 1 +_ACEOF + + fi +fi + +if test "$wxUSE_MSGDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_MSGDLG 1 +_ACEOF + +fi + +if test "$wxUSE_NUMBERDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_NUMBERDLG 1 +_ACEOF + +fi + +if test "$wxUSE_PROGRESSDLG" = "yes"; then + if test "$wxUSE_CONSTRAINTS" != "yes"; then + { echo "$as_me:$LINENO: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&5 +echo "$as_me: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&2;} + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_PROGRESSDLG 1 +_ACEOF + + fi +fi + +if test "$wxUSE_SPLASH" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_SPLASH 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splash" +fi + +if test "$wxUSE_STARTUP_TIPS" = "yes"; then + if test "$wxUSE_CONSTRAINTS" != "yes"; then + { echo "$as_me:$LINENO: WARNING: Startup tips requires constraints and won't be compiled without them" >&5 +echo "$as_me: WARNING: Startup tips requires constraints and won't be compiled without them" >&2;} + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_STARTUP_TIPS 1 +_ACEOF + + fi +fi + +if test "$wxUSE_TEXTDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TEXTDLG 1 +_ACEOF + +fi + +if test "$wxUSE_WIZARDDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WIZARDDLG 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard" +fi + + +if test "$wxUSE_MEDIACTRL" = "yes"; then + if test "$wxUSE_MSW" = 1; then + wxUSE_DIRECTSHOW="yes" + +for ac_header in dshow.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. */ +#include + +#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 + +else + + wxUSE_DIRECTSHOW="no" + { echo "$as_me:$LINENO: WARNING: DirectShow not installed; consider installing the DirectX7 SDK or higher" >&5 +echo "$as_me: WARNING: DirectShow not installed; consider installing the DirectX7 SDK or higher" >&2;} + +fi + +done + + + if test "$wxUSE_DIRECTSHOW" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DIRECTSHOW 1 +_ACEOF + + LIBS="$LIBS -lstrmiids" + fi + fi + + if test "$wxUSE_GTK" = 1; then + wxUSE_GSTREAMER="yes" + + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # 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_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 + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +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 "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo "$as_me:$LINENO: checking for gstreamer-0.8" >&5 +echo $ECHO_N "checking for gstreamer-0.8... $ECHO_C" >&6 + + if $PKG_CONFIG --exists "gstreamer-0.8" ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + succeeded=yes + + echo "$as_me:$LINENO: checking GSTREAMER_CFLAGS" >&5 +echo $ECHO_N "checking GSTREAMER_CFLAGS... $ECHO_C" >&6 + GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.8"` + echo "$as_me:$LINENO: result: $GSTREAMER_CFLAGS" >&5 +echo "${ECHO_T}$GSTREAMER_CFLAGS" >&6 + + echo "$as_me:$LINENO: checking GSTREAMER_LIBS" >&5 +echo $ECHO_N "checking GSTREAMER_LIBS... $ECHO_C" >&6 + GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.8"` + echo "$as_me:$LINENO: result: $GSTREAMER_LIBS" >&5 +echo "${ECHO_T}$GSTREAMER_LIBS" >&6 + else + GSTREAMER_CFLAGS="" + GSTREAMER_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.8"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + + CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" + LIBS="$LIBS $GSTREAMER_LIBS -lgstplay-0.8" + + else + + { echo "$as_me:$LINENO: WARNING: GStreamer installation not found" >&5 +echo "$as_me: WARNING: GStreamer installation not found" >&2;} + wxUSE_GSTREAMER="no" + + fi + + + + + + if test "x$GST_INSPECT" == "x"; then + # Extract the first word of "gst-inspect", so it can be a program name with args. +set dummy gst-inspect; 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_GST_INSPECT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$GST_INSPECT"; then + ac_cv_prog_GST_INSPECT="$GST_INSPECT" # 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_GST_INSPECT="gst-inspect" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +GST_INSPECT=$ac_cv_prog_GST_INSPECT +if test -n "$GST_INSPECT"; then + echo "$as_me:$LINENO: result: $GST_INSPECT" >&5 +echo "${ECHO_T}$GST_INSPECT" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + fi + + if test "x$GST_INSPECT" != "x"; then + echo "$as_me:$LINENO: checking GStreamer element xvimagesink" >&5 +echo $ECHO_N "checking GStreamer element xvimagesink... $ECHO_C" >&6 + if $GST_INSPECT xvimagesink > /dev/null 2> /dev/null ; then + echo "$as_me:$LINENO: result: found." >&5 +echo "${ECHO_T}found." >&6 + + else + echo "$as_me:$LINENO: result: not found." >&5 +echo "${ECHO_T}not found." >&6 + + wxUSE_GSTREAMER="no" + { echo "$as_me:$LINENO: WARNING: x video sink not found - cannot use GStreamer" >&5 +echo "$as_me: WARNING: x video sink not found - cannot use GStreamer" >&2;} + + fi + fi + + + echo "$as_me:$LINENO: checking for gst/xoverlay/xoverlay.h" >&5 +echo $ECHO_N "checking for gst/xoverlay/xoverlay.h... $ECHO_C" >&6 +if test "${ac_cv_header_gst_xoverlay_xoverlay_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 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_gst_xoverlay_xoverlay_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_WebKit_HIWebView_h=no +ac_cv_header_gst_xoverlay_xoverlay_h=no fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_WebKit_HIWebView_h" >&5 -echo "${ECHO_T}$ac_cv_header_WebKit_HIWebView_h" >&6 -if test $ac_cv_header_WebKit_HIWebView_h = yes; then - - cat >>confdefs.h <<\_ACEOF -#define wxUSE_WEBKIT 1 -_ACEOF - - WEBKIT_LINK="-framework WebKit" - +echo "$as_me:$LINENO: result: $ac_cv_header_gst_xoverlay_xoverlay_h" >&5 +echo "${ECHO_T}$ac_cv_header_gst_xoverlay_xoverlay_h" >&6 +if test $ac_cv_header_gst_xoverlay_xoverlay_h = yes; then + : else - { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling wxWebKit" >&5 -echo "$as_me: WARNING: WebKit headers not found; disabling wxWebKit" >&2;} - wxUSE_WEBKIT=no - -fi - - - CPPFLAGS="$old_CPPFLAGS" - elif test "$wxUSE_COCOA" = 1; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_WEBKIT 1 -_ACEOF - - else - wxUSE_WEBKIT=no - fi -fi - -USE_XRC=0 -if test "$wxUSE_XRC" = "yes"; then - if test "$wxUSE_XML" != "yes"; then - { echo "$as_me:$LINENO: WARNING: XML library not built, XRC resources disabled" >&5 -echo "$as_me: WARNING: XML library not built, XRC resources disabled" >&2;} - wxUSE_XRC=no - else - cat >>confdefs.h <<\_ACEOF -#define wxUSE_XRC 1 -_ACEOF - - USE_XRC=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc" - fi -fi - -if test "$wxUSE_MENUS" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_MENUS 1 -_ACEOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu" -fi - -if test "$wxUSE_METAFILE" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_METAFILE 1 -_ACEOF - -fi - -if test "$wxUSE_MIMETYPE" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_MIMETYPE 1 -_ACEOF - -fi - -if test "$wxUSE_MINIFRAME" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_MINIFRAME 1 -_ACEOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" -fi - -if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#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_VALIDATORS" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_VALIDATORS 1 -_ACEOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" -fi - -if test "$wxUSE_PALETTE" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_PALETTE 1 -_ACEOF - -fi - -if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then - LIBS=" -lunicows $LIBS" -fi - - -if test "$wxUSE_IMAGE" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_IMAGE 1 -_ACEOF - - - if test "$wxUSE_GIF" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_GIF 1 -_ACEOF - - fi - - if test "$wxUSE_PCX" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_PCX 1 -_ACEOF - - fi - - if test "$wxUSE_IFF" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_IFF 1 -_ACEOF - - fi - - if test "$wxUSE_PNM" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_PNM 1 -_ACEOF - - fi - - if test "$wxUSE_XPM" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_XPM 1 -_ACEOF - - fi - - if test "$wxUSE_ICO_CUR" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_ICO_CUR 1 -_ACEOF - - fi -fi - - -if test "$wxUSE_CHOICEDLG" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_CHOICEDLG 1 -_ACEOF - -fi - -if test "$wxUSE_COLOURDLG" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_COLOURDLG 1 -_ACEOF - -fi - -if test "$wxUSE_FILEDLG" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_FILEDLG 1 -_ACEOF - -fi - -if test "$wxUSE_FINDREPLDLG" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_FINDREPLDLG 1 -_ACEOF + wxUSE_GSTREAMER="no" + { echo "$as_me:$LINENO: WARNING: xoverlay header not found, cannot use GStreamer" >&5 +echo "$as_me: WARNING: xoverlay header not found, cannot use GStreamer" >&2;} fi -if test "$wxUSE_FONTDLG" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_FONTDLG 1 -_ACEOF -fi -if test "$wxUSE_DIRDLG" = "yes"; then - if test "$wxUSE_TREECTRL" != "yes"; then - { echo "$as_me:$LINENO: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&5 -echo "$as_me: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&2;} - else - cat >>confdefs.h <<\_ACEOF -#define wxUSE_DIRDLG 1 -_ACEOF + echo "$as_me:$LINENO: checking for gstplay 0.8" >&5 +echo $ECHO_N "checking for gstplay 0.8... $ECHO_C" >&6 - fi -fi - -if test "$wxUSE_MSGDLG" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_MSGDLG 1 -_ACEOF - -fi - -if test "$wxUSE_NUMBERDLG" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_NUMBERDLG 1 -_ACEOF - -fi - -if test "$wxUSE_PROGRESSDLG" = "yes"; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:$LINENO: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&5 -echo "$as_me: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&2;} - else - cat >>confdefs.h <<\_ACEOF -#define wxUSE_PROGRESSDLG 1 -_ACEOF - - fi -fi +ac_find_libraries= +for ac_dir in $SEARCH_LIB /usr/lib; + do + for ac_extension in a so sl dylib; do + if test -f "$ac_dir/libgstplay-0.8.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done -if test "$wxUSE_SPLASH" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_SPLASH 1 -_ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splash" -fi + if test "$ac_find_libraries" = "" ; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + wxUSE_GSTREAMER="no" + else + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + fi -if test "$wxUSE_STARTUP_TIPS" = "yes"; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:$LINENO: WARNING: Startup tips requires constraints and won't be compiled without them" >&5 -echo "$as_me: WARNING: Startup tips requires constraints and won't be compiled without them" >&2;} - else - cat >>confdefs.h <<\_ACEOF -#define wxUSE_STARTUP_TIPS 1 + if test "$wxUSE_GSTREAMER" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_GSTREAMER 1 _ACEOF + echo "$as_me:$LINENO: result: GStreamer detection successful" >&5 +echo "${ECHO_T}GStreamer detection successful" >&6 + fi fi -fi - -if test "$wxUSE_TEXTDLG" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_TEXTDLG 1 -_ACEOF - -fi - -if test "$wxUSE_WIZARDDLG" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer" cat >>confdefs.h <<\_ACEOF -#define wxUSE_WIZARDDLG 1 +#define wxUSE_MEDIACTRL 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard" fi @@ -38098,6 +40115,9 @@ fi if test "$wxUSE_HTML" = "yes" ; then CORE_GUI_LIBS="html $CORE_GUI_LIBS" fi +if test "$wxUSE_DEBUGREPORT" = "yes" ; then + CORE_GUI_LIBS="qa $CORE_GUI_LIBS" +fi if test "$wxUSE_XRC" = "yes" ; then CORE_GUI_LIBS="xrc $CORE_GUI_LIBS" fi @@ -38126,9 +40146,14 @@ if test "$wxUSE_MAC" = 1 ; then else LDFLAGS="$LDFLAGS -lCarbonLib" fi +elif test "$USE_DARWIN" = 1; then + LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System" fi if test "$wxUSE_COCOA" = 1 ; then - LDFLAGS="$LDFLAGS -framework Cocoa" + LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa" + if test "$wxUSE_MEDIACTRL" = "yes"; then + LDFLAGS="$LDFLAGS -framework QuickTime" + fi fi @@ -38567,13 +40592,23 @@ fi if test "$wxUSE_GUI" = "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ - drawing dynamic erase event exec font image \ - minimal propsize rotate shaped widgets render" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ + dynamic erase event exec font image minimal mobile \ + mobile/wxedit mobile/styles propsize render \ + richedit rotate shaped vscroll widgets" if test "$wxUSE_MONOLITHIC" != "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" fi + if test "$TOOLKIT" = "MSW"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest" + if test "$wxUSE_UNIVERSAL" != "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg" + fi + fi + if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw" + fi else SAMPLES_SUBDIRS="console" fi @@ -38593,6 +40628,12 @@ CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS` CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CWARNINGS` CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS` +if test "x$MWCC" = "xyes"; then + + CC="$CC -cwd source -I-" + CXX="$CXX -cwd source -I-" +fi + LIBS=`echo $LIBS` EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" @@ -38600,7 +40641,7 @@ EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_ODBC="$ODBC_LINK" if test "$wxUSE_GUI" = "yes"; then - EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK` + EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_GNOMEPRINT` fi if test "$wxUSE_OPENGL" = "yes"; then EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" @@ -38617,32 +40658,29 @@ fi WXCONFIG_EXTRALIBS="$LIBS" if test "$wxUSE_REGEX" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty regex${lib_unicode_suffix}" + wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty" fi if test "$wxUSE_EXPAT" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty expat" + wxconfig_3rdparty="expat $wxconfig_3rdparty" fi if test "$wxUSE_ODBC" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty odbc" + wxconfig_3rdparty="odbc $wxconfig_3rdparty" fi if test "$wxUSE_LIBTIFF" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty tiff" + wxconfig_3rdparty="tiff $wxconfig_3rdparty" fi if test "$wxUSE_LIBJPEG" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty jpeg" + wxconfig_3rdparty="jpeg $wxconfig_3rdparty" fi if test "$wxUSE_LIBPNG" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty png" + wxconfig_3rdparty="png $wxconfig_3rdparty" fi if test "$wxUSE_ZLIB" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty zlib" -fi -if test "$wxUSE_ODBC" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty odbc" + wxconfig_3rdparty="zlib $wxconfig_3rdparty" fi for i in $wxconfig_3rdparty ; do - WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" + WXCONFIG_EXTRALIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_EXTRALIBS" done @@ -38678,6 +40716,12 @@ else USE_ODBC=0 fi +if test "$wxUSE_DEBUGREPORT" = "yes" ; then + USE_QA=1 +else + USE_QA=0 +fi + if test $wxUSE_OFFICIAL_BUILD = "yes" ; then OFFICIAL_BUILD=1 else @@ -40285,9 +42329,9 @@ echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6 echo "$as_me:$LINENO: result: gcc" >&5 echo "${ECHO_T}gcc" >&6 elif test "x$MWCC" = "xyes"; then - DEPSMODE=gcc + DEPSMODE=mwcc DEPS_TRACKING=1 - DEPSFLAG_GCC="-MMD" + DEPSFLAG_MWCC="-MM" echo "$as_me:$LINENO: result: mwcc" >&5 echo "${ECHO_T}mwcc" >&6 else @@ -40309,6 +42353,7 @@ cat <bk-deps DEPSMODE=${DEPSMODE} DEPSDIR=.deps DEPSFLAG_GCC="${DEPSFLAG_GCC}" +DEPSFLAG_MWCC="${DEPSFLAG_MWCC}" mkdir -p ${D}DEPSDIR @@ -40346,6 +42391,31 @@ if test ${D}DEPSMODE = gcc ; then fi fi exit 0 +elif test ${D}DEPSMODE = mwcc ; then + ${D}* + status=${D}? + if test ${D}{status} != 0 ; then + exit ${D}{status} + fi + # Run mwcc again with -MM and redirect into the dep file we want + # NOTE: We can't use shift here because we need ${D}* to be valid + prevarg= + for arg in ${D}* ; do + if test "${D}prevarg" = "-o"; then + objfile=${D}arg + else + case "${D}arg" in + -* ) + ;; + * ) + srcfile=${D}arg + ;; + esac + fi + prevarg="${D}arg" + done + ${D}* ${D}DEPSFLAG_MWCC >${D}{DEPSDIR}/${D}{objfile}.d + exit 0 else ${D}* exit ${D}? @@ -40485,10 +42555,10 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.1.5" + BAKEFILE_BAKEFILE_M4_VERSION="0.1.8" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.5" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.8" @@ -40721,6 +42791,11 @@ EOF COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="" fi + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="" + fi + COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="" @@ -40751,6 +42826,11 @@ EOF COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="" fi + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="" + fi + COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="" @@ -40936,6 +43016,11 @@ EOF COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" fi + COND_SHARED_0_USE_XRC_1="#" + if test "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then + COND_SHARED_0_USE_XRC_1="" + fi + COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#" if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then COND_SHARED_0_WXUSE_EXPAT_BUILTIN="" @@ -40966,6 +43051,11 @@ EOF COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" fi + COND_SHARED_1_USE_XRC_1="#" + if test "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then + COND_SHARED_1_USE_XRC_1="" + fi + COND_TOOLKIT_="#" if test "x$TOOLKIT" = "x" ; then COND_TOOLKIT_="" @@ -41161,6 +43251,16 @@ EOF COND_USE_PLUGINS_0="" fi + COND_USE_RTTI_0="#" + if test "x$USE_RTTI" = "x0" ; then + COND_USE_RTTI_0="" + fi + + COND_USE_RTTI_1="#" + if test "x$USE_RTTI" = "x1" ; then + COND_USE_RTTI_1="" + fi + COND_USE_SOSYMLINKS_1="#" if test "x$USE_SOSYMLINKS" = "x1" ; then COND_USE_SOSYMLINKS_1="" @@ -41181,6 +43281,16 @@ EOF COND_USE_SOVERSOLARIS_1="" fi + COND_USE_THREADS_0="#" + if test "x$USE_THREADS" = "x0" ; then + COND_USE_THREADS_0="" + fi + + COND_USE_THREADS_1="#" + if test "x$USE_THREADS" = "x1" ; then + COND_USE_THREADS_1="" + fi + COND_USE_XRC_1="#" if test "x$USE_XRC" = "x1" ; then COND_USE_XRC_1="" @@ -41263,6 +43373,15 @@ else EXE_LINKER="$CXX -o" fi +if test "$wxUSE_OMF" = "yes"; then + case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + LDFLAGS="$LDFLAGS -Zlinker /EXEPACK" + LDFLAGS_GUI="-Zlinker /PMTYPE:PM" + WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM" + ;; + esac +fi GCC_PRAGMA_FLAGS="" PCH_FLAGS="" @@ -42036,7 +44155,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by wxWidgets $as_me 2.5.3, which was +This file was extended by wxWidgets $as_me 2.6.0, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -42099,7 +44218,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.5.3 +wxWidgets config.status 2.6.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -42364,6 +44483,9 @@ s,@SDL_CFLAGS@,$SDL_CFLAGS,;t t s,@SDL_LIBS@,$SDL_LIBS,;t t s,@LIBGNOMEPRINTUI_CFLAGS@,$LIBGNOMEPRINTUI_CFLAGS,;t t s,@LIBGNOMEPRINTUI_LIBS@,$LIBGNOMEPRINTUI_LIBS,;t t +s,@GSTREAMER_CFLAGS@,$GSTREAMER_CFLAGS,;t t +s,@GSTREAMER_LIBS@,$GSTREAMER_LIBS,;t t +s,@GST_INSPECT@,$GST_INSPECT,;t t s,@CORE_BASE_LIBS@,$CORE_BASE_LIBS,;t t s,@CORE_GUI_LIBS@,$CORE_GUI_LIBS,;t t s,@wxUSE_ZLIB@,$wxUSE_ZLIB,;t t @@ -42457,12 +44579,14 @@ s,@COND_MONOLITHIC_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;t t s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1,;t t s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1,;t t +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_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_GUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1,;t t s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1,;t t s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1,;t t +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_XRC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1,;t t s,@COND_MONOLITHIC_0_USE_ODBC_1@,$COND_MONOLITHIC_0_USE_ODBC_1,;t t @@ -42500,12 +44624,14 @@ 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_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 s,@COND_SHARED_0_WXUSE_REGEX_BUILTIN@,$COND_SHARED_0_WXUSE_REGEX_BUILTIN,;t t s,@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@,$COND_SHARED_0_WXUSE_ZLIB_BUILTIN,;t t s,@COND_SHARED_1@,$COND_SHARED_1,;t t s,@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1,;t t +s,@COND_SHARED_1_USE_XRC_1@,$COND_SHARED_1_USE_XRC_1,;t t s,@COND_TOOLKIT_@,$COND_TOOLKIT_,;t t s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t s,@COND_TOOLKIT_COCOA_USE_GUI_1@,$COND_TOOLKIT_COCOA_USE_GUI_1,;t t @@ -42545,10 +44671,14 @@ s,@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,; s,@COND_USE_ODBC_1@,$COND_USE_ODBC_1,;t t s,@COND_USE_OPENGL_1@,$COND_USE_OPENGL_1,;t t s,@COND_USE_PLUGINS_0@,$COND_USE_PLUGINS_0,;t t +s,@COND_USE_RTTI_0@,$COND_USE_RTTI_0,;t t +s,@COND_USE_RTTI_1@,$COND_USE_RTTI_1,;t t s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t 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_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 s,@COND_WITH_PLUGIN_SDL_1@,$COND_WITH_PLUGIN_SDL_1,;t t s,@COND_WXUNIV_0@,$COND_WXUNIV_0,;t t