X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68d801c8b06bb8d0c8ab6d5c96724630c3250b6b..dac2ee8dee32744293b32b4bd082466f35d8c587:/configure diff --git a/configure b/configure index d1fede1dfa..026622784e 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in 60979 2009-06-10 14:56:18Z VZ . +# From configure.in Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. +# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.2. # # Report bugs to . # @@ -575,8 +575,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='2.9.0' -PACKAGE_STRING='wxWidgets 2.9.0' +PACKAGE_VERSION='2.9.2' +PACKAGE_STRING='wxWidgets 2.9.2' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' ac_unique_file="wx-config.in" @@ -676,6 +676,8 @@ CXX CXXFLAGS ac_ct_CXX AR +OSX_SW_VERS +CXXCPP subdirs PKG_CONFIG GTK_CFLAGS @@ -709,6 +711,8 @@ GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS +HILDON2_CFLAGS +HILDON2_LIBS PYTHON COND_PYTHON CAIRO_CFLAGS @@ -747,7 +751,6 @@ EXTRALIBS_GNOMEPRINT EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON UNICODE -BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE @@ -800,7 +803,7 @@ USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION -USE_SOSYMLINKS +USE_SOTWOSYMLINKS SONAME_FLAG DEPS_TRACKING BK_DEPS @@ -831,6 +834,7 @@ COND_BUILD_release COND_BUILD_release_DEBUG_INFO_default COND_BUILD_release_UNICODE_0 COND_BUILD_release_UNICODE_1 +COND_DEBUG_FLAG_0 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 @@ -846,6 +850,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1 +COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_0_USE_STC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 @@ -856,6 +861,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1 +COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_1_USE_STC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 @@ -866,6 +872,7 @@ COND_MONOLITHIC_0_USE_HTML_1 COND_MONOLITHIC_0_USE_MEDIA_1 COND_MONOLITHIC_0_USE_PROPGRID_1 COND_MONOLITHIC_0_USE_QA_1 +COND_MONOLITHIC_0_USE_RIBBON_1 COND_MONOLITHIC_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_USE_STC_1 COND_MONOLITHIC_0_USE_XRC_1 @@ -878,10 +885,13 @@ COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0 +COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0 +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1 +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_OPENGL_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 @@ -899,6 +909,7 @@ COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 +COND_PLATFORM_WIN32_1_SHARED_0 COND_SHARED_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 @@ -942,6 +953,8 @@ COND_TOOLKIT_OSX_CARBON_USE_GUI_1 COND_TOOLKIT_OSX_COCOA COND_TOOLKIT_OSX_COCOA_USE_GUI_1 COND_TOOLKIT_OSX_IPHONE +COND_TOOLKIT_OSX_IPHONE_USE_GUI_1 +COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 @@ -952,6 +965,7 @@ COND_TOOLKIT_WINCE_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 +COND_USE_CAIRO_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 @@ -970,10 +984,11 @@ COND_USE_PCH_1 COND_USE_PLUGINS_0 COND_USE_RTTI_0 COND_USE_RTTI_1 -COND_USE_SOSYMLINKS_1 +COND_USE_SOTWOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 +COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1 COND_USE_SOVERSOLARIS_1 COND_USE_STC_1 COND_USE_THREADS_0 @@ -1012,12 +1027,12 @@ WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE -WX_DEBUGTYPE WXCONFIG_CPPFLAGS WXCONFIG_CFLAGS WXCONFIG_CXXFLAGS WXCONFIG_LIBS WXCONFIG_RPATH +WXCONFIG_LDFLAGS WXCONFIG_LDFLAGS_GUI WXCONFIG_RESFLAGS GUIDIST @@ -1053,6 +1068,7 @@ CPP CXX CXXFLAGS CCC +CXXCPP PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS @@ -1071,6 +1087,8 @@ GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS +HILDON2_CFLAGS +HILDON2_LIBS CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS @@ -1578,7 +1596,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.9.0 to adapt to many kinds of systems. +\`configure' configures wxWidgets 2.9.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1647,7 +1665,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.9.0:";; + short | recursive ) echo "Configuration of wxWidgets 2.9.2:";; esac cat <<\_ACEOF @@ -1664,30 +1682,33 @@ Optional Features: --enable-nanox use NanoX --disable-gtk2 use GTK+ 1.2 instead of 2.0 --enable-gpe use GNOME PDA Environment features if possible + --enable-debug build library for debugging + --disable-debug_flag disable all debugging support + --enable-debug_info generate debug information + --enable-debug_gdb create code with extra GDB debugging information + --enable-debug_cntxt obsolete, don't use: use wxDebugContext + --enable-mem_tracing obsolete, don't use: create code with memory tracing --disable-shared create static library instead of shared - --enable-debug same as debug_flag and debug_info - --enable-stl use STL for containers + --enable-stl use standard C++ classes for everything + --enable-std_containers use standard C++ container classes --enable-std_iostreams use standard C++ stream classes --enable-std_string use standard C++ string classes + --enable-std_string_conv_in_wxstring provide implicit conversion to std::string in wxString --disable-unicode compile without Unicode support --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only) --enable-utf8 use UTF-8 representation for strings (Unix only) --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only) --enable-extended_rtti use extended RTTI (XTI) --enable-omf use OMF object format - --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!) - --enable-debug_info create code with debugging information --disable-optimise compile without optimisations - --enable-debug_gdb create code with extra GDB debugging information - --enable-debug_cntxt use wxDebugContext - --enable-mem_tracing create code with memory tracing --enable-profile create code with profiling information --enable-no_rtti create code without RTTI information --enable-no_exceptions create code without C++ exceptions handling --enable-permissive compile code disregarding strict ANSI --enable-no_deps create code without dependency information --disable-vararg_macros don't use vararg macros, even if they are supported - --enable-universal_binary create Mac PowerPC and Intel Universal binary + --enable-universal_binary create universal binary with Mac PPC and i386 (and x86_64 if using Cocoa) architectures + --enable-macosx_arch=ARCH build for just the specified architecture --enable-compat26 enable wxWidgets 2.6 compatibility --disable-compat28 disable wxWidgets 2.8 compatibility --disable-rpath disable use of rpath for uninstalled builds @@ -1709,6 +1730,7 @@ Optional Features: --enable-baseevtloop use event loop in console programs too --enable-epollloop use wxEpollDispatcher class (Linux only) --enable-selectloop use wxSelectDispatcher class + --enable-any use wxAny class --enable-apple_ieee use the Apple IEEE codec --enable-arcstream use wxArchive streams --enable-base64 use base64 encoding/decoding functions @@ -1723,12 +1745,14 @@ Optional Features: --enable-exceptions build exception-safe library --enable-ffile use wxFFile class --enable-file use wxFile class + --enable-filehistory use wxFileHistory class --enable-filesystem use virtual file systems classes --enable-fontenum use wxFontEnumerator class --enable-fontmap use font encodings conversion classes --enable-fs_archive use virtual archive filesystems --enable-fs_inet use virtual HTTP/FTP filesystems --enable-fs_zip now replaced by fs_archive + --enable-fswatcher use wxFileSystemWatcher class --enable-geometry use geometry class --enable-log use logging system --enable-longlong use wxLongLong class @@ -1762,6 +1786,7 @@ Optional Features: --enable-xrc use XRC resources sub-library --enable-aui use AUI docking library --enable-propgrid use wxPropertyGrid library + --enable-ribbon use wxRibbon library --enable-stc use wxStyledTextCtrl library --enable-constraints use layout-constraints system --enable-loggui use standard GUI logger @@ -1773,16 +1798,19 @@ Optional Features: --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix --enable-webkit use wxWebKitCtrl (Mac) --enable-richtext use wxRichTextCtrl - --enable-graphics_ctx use graphics context 2D drawing API --enable-postscript use wxPostscriptDC device context (default for gtk+) --enable-printarch use printing architecture --enable-svg use wxSVGFileDC device context + --enable-graphics_ctx use graphics context 2D drawing API --enable-clipboard use wxClipboard class --enable-dnd use Drag'n'Drop classes --enable-metafile use win32 metafiles --disable-controls disable compilation of all standard controls + --enable-markup support wxControl::SetLabelMarkup --enable-accel use accelerators --enable-animatectrl use wxAnimationCtrl class + --enable-artstd use standard XPM icons in wxArtProvider + --enable-arttango use Tango icons in wxArtProvider --enable-bmpbutton use wxBitmapButton class --enable-bmpcombobox use wxBitmapComboBox class --enable-button use wxButton class @@ -1796,6 +1824,7 @@ Optional Features: --enable-colourpicker use wxColourPickerCtrl class --enable-combobox use wxComboBox class --enable-comboctrl use wxComboCtrl class + --enable-commandlinkbutton use wxCommmandLinkButton class --enable-dataviewctrl use wxDataViewCtrl class --enable-datepick use wxDatePickerCtrl class --enable-detect_sm use code to detect X11 session manager @@ -1810,6 +1839,7 @@ Optional Features: --enable-headerctrl use wxHeaderCtrl class --enable-hyperlink use wxHyperlinkCtrl class --enable-imaglist use wxImageList class + --enable-infobar use wxInfoBar class --enable-listbook use wxListbook class --enable-listbox use wxListBox class --enable-listctrl use wxListCtrl class @@ -1819,6 +1849,7 @@ Optional Features: --enable-popupwin use wxPopUpWindow class --enable-radiobox use wxRadioBox class --enable-radiobtn use wxRadioButton class + --enable-richmsgdlg use wxRichMessageDialog class --enable-rearrangectrl use wxRearrangeList/Ctrl/Dialog --enable-sash use wxSashWindow class --enable-scrollbar use wxScrollBar class and scrollable windows @@ -1867,6 +1898,8 @@ Optional Features: --enable-metafiles use wxMetaFile (Win32 only) --enable-dragimage use wxDragImage --enable-accessibility enable accessibility support + --enable-uiactionsim use wxUIActionSimulator (experimental) + --enable-dctransform use wxDC::SetTransformMatrix and related --enable-palette use wxPalette class --enable-image use wxImage class --enable-gif use gif images (GIF file format) @@ -1903,8 +1936,13 @@ Optional Packages: --with-motif use Motif/Lesstif --with-osx_carbon use Mac OS X (Carbon) --with-osx_cocoa use Mac OS X (Cocoa) - --with-mac use Mac OS X (Default) - --with-cocoa use Cocoa + --with-osx_iphone use iPhone OS X port + --with-osx use Mac OS X (default port, currently Carbon) + --with-carbon same as --with-osx_carbon + --with-cocoa same as --with-osx_cocoa + --with-iphone same as --with-osx_iphone + --with-mac same as --with-osx + --with-old_cocoa use old, deprecated, Cocoa port --with-wine use Wine --with-msw use MS-Windows --with-pm use OS/2 Presentation Manager @@ -1921,7 +1959,7 @@ Optional Packages: --without-gtkprint don't use GTK printing support --without-gnomeprint don't use GNOME printing libraries --with-gnomevfs use GNOME VFS for associating MIME types - --with-hildon use Hildon framework for Nokia 770 + --with-hildon use Hildon framework for Nokia 770/800/810 --with-opengl use OpenGL (or Mesa) --with-dmalloc use dmalloc library (http://dmalloc.com/) --with-sdl use SDL for audio on Unix @@ -1950,6 +1988,7 @@ Some influential environment variables: CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags + CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility DIRECTFB_CFLAGS C compiler flags for DIRECTFB, overriding pkg-config @@ -1982,6 +2021,10 @@ Some influential environment variables: HILDON_CFLAGS C compiler flags for HILDON, overriding pkg-config HILDON_LIBS linker flags for HILDON, overriding pkg-config + HILDON2_CFLAGS + C compiler flags for HILDON2, overriding pkg-config + HILDON2_LIBS + linker flags for HILDON2, overriding pkg-config CAIRO_CFLAGS C compiler flags for CAIRO, overriding pkg-config CAIRO_LIBS linker flags for CAIRO, overriding pkg-config @@ -2052,7 +2095,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.9.0 +wxWidgets configure 2.9.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2066,7 +2109,7 @@ cat >config.log <<_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.9.0, which was +It was created by wxWidgets $as_me 2.9.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2548,7 +2591,7 @@ fi wx_major_version_number=2 wx_minor_version_number=9 -wx_release_number=0 +wx_release_number=2 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -2585,12 +2628,13 @@ USE_ALPHA= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB" +ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB" -DEFAULT_wxUSE_COCOA=0 +DEFAULT_wxUSE_OLD_COCOA=0 DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_OSX_CARBON=0 DEFAULT_wxUSE_OSX_COCOA=0 +DEFAULT_wxUSE_OSX_IPHONE=0 DEFAULT_wxUSE_MGL=0 DEFAULT_wxUSE_MICROWIN=0 DEFAULT_wxUSE_MOTIF=0 @@ -2599,10 +2643,11 @@ DEFAULT_wxUSE_PM=0 DEFAULT_wxUSE_X11=0 DEFAULT_wxUSE_DFB=0 -DEFAULT_DEFAULT_wxUSE_COCOA=0 +DEFAULT_DEFAULT_wxUSE_OLD_COCOA=0 DEFAULT_DEFAULT_wxUSE_GTK=0 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0 +DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0 DEFAULT_DEFAULT_wxUSE_MGL=0 DEFAULT_DEFAULT_wxUSE_MICROWIN=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 @@ -2671,6 +2716,14 @@ _ACEOF DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; + *-*-qnx*) + USE_QNX=1 + cat >>confdefs.h <<\_ACEOF +#define __QNX__ 1 +_ACEOF + + DEFAULT_DEFAULT_wxUSE_X11=1 + ;; *-*-solaris2* ) USE_SUN=1 USE_SOLARIS=1 @@ -2867,6 +2920,20 @@ _ACEOF DEFAULT_STD_FLAG=no ;; + arm-apple-darwin*) + USE_BSD=1 + USE_DARWIN=1 + cat >>confdefs.h <<\_ACEOF +#define __BSD__ 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define __DARWIN__ 1 +_ACEOF + + DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=1 + ;; + *-*-darwin* ) USE_BSD=1 USE_DARWIN=1 @@ -2907,20 +2974,22 @@ esac DEFAULT_wxUSE_ALL_FEATURES=yes +DEFAULT_wxUSE_STD_CONTAINERS=no DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG DEFAULT_wxUSE_DMALLOC=no DEFAULT_wxUSE_LIBGNOMEVFS=no DEFAULT_wxUSE_LIBHILDON=no +DEFAULT_wxUSE_LIBHILDON2=no DEFAULT_wxUSE_LIBMSPACK=no DEFAULT_wxUSE_LIBSDL=no DEFAULT_wxUSE_ACCESSIBILITY=no -DEFAULT_wxUSE_GRAPHICS_CONTEXT=no DEFAULT_wxUSE_IPV6=no DEFAULT_wxUSE_GSTREAMER8=no +DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto DEFAULT_wxUSE_UNICODE_UTF8=auto DEFAULT_wxUSE_OPENGL=auto DEFAULT_wxUSE_MEDIACTRL=auto @@ -2929,6 +2998,7 @@ DEFAULT_wxUSE_COMPILER_TLS=auto DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no DEFAULT_wxUSE_UNIVERSAL_BINARY=no +DEFAULT_wxUSE_MAC_ARCH=no DEFAULT_wxUSE_OFFICIAL_BUILD=no @@ -2971,10 +3041,10 @@ fi eval "$wx_cv_use_gui" if test x"$enablestring" = xdisable; then - if test $wxUSE_GUI = yes; then - result=no - else + if test $wxUSE_GUI = no; then result=yes + else + result=no fi else result=$wxUSE_GUI @@ -3015,10 +3085,10 @@ fi eval "$wx_cv_use_monolithic" if test x"$enablestring" = xdisable; then - if test $wxUSE_MONOLITHIC = yes; then - result=no - else + if test $wxUSE_MONOLITHIC = no; then result=yes + else + result=no fi else result=$wxUSE_MONOLITHIC @@ -3059,10 +3129,10 @@ fi eval "$wx_cv_use_plugins" if test x"$enablestring" = xdisable; then - if test $wxUSE_PLUGINS = yes; then - result=no - else + if test $wxUSE_PLUGINS = no; then result=yes + else + result=no fi else result=$wxUSE_PLUGINS @@ -3153,10 +3223,10 @@ fi eval "$wx_cv_use_official_build" if test x"$enablestring" = xdisable; then - if test $wxUSE_OFFICIAL_BUILD = yes; then - result=no - else + if test $wxUSE_OFFICIAL_BUILD = no; then result=yes + else + result=no fi else result=$wxUSE_OFFICIAL_BUILD @@ -3206,10 +3276,10 @@ fi eval "$wx_cv_use_all_features" if test x"$enablestring" = xdisable; then - if test $wxUSE_ALL_FEATURES = yes; then - result=no - else + if test $wxUSE_ALL_FEATURES = no; then result=yes + else + result=no fi else result=$wxUSE_ALL_FEATURES @@ -3220,7 +3290,8 @@ echo "${ECHO_T}$result" >&6; } if test "$wxUSE_ALL_FEATURES" = "no"; then - DEFAULT_wxUSE_MEDIACTRL=no + DEFAULT_wxUSE_ARTPROVIDER_TANGO=no + DEFAULT_wxUSE_MEDIACTRL=no fi @@ -3258,10 +3329,10 @@ fi eval "$wx_cv_use_universal" if test x"$enablestring" = xdisable; then - if test $wxUSE_UNIVERSAL = yes; then - result=no - else + if test $wxUSE_UNIVERSAL = no; then result=yes + else + result=no fi else result=$wxUSE_UNIVERSAL @@ -3304,15 +3375,45 @@ if test "${with_osx_cocoa+set}" = set; then fi +# Check whether --with-osx_iphone was given. +if test "${with_osx_iphone+set}" = set; then + withval=$with_osx_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1 +fi + + +# Check whether --with-osx was given. +if test "${with_osx+set}" = set; then + withval=$with_osx; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 +fi + + +# Check whether --with-carbon was given. +if test "${with_carbon+set}" = set; then + withval=$with_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 +fi + + +# Check whether --with-cocoa was given. +if test "${with_cocoa+set}" = set; then + withval=$with_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1 +fi + + +# Check whether --with-iphone was given. +if test "${with_iphone+set}" = set; then + withval=$with_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1 +fi + + # Check whether --with-mac was given. if test "${with_mac+set}" = set; then withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 fi -# Check whether --with-cocoa was given. -if test "${with_cocoa+set}" = set; then - withval=$with_cocoa; wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1 +# Check whether --with-old_cocoa was given. +if test "${with_old_cocoa+set}" = set; then + withval=$with_old_cocoa; wxUSE_OLD_COCOA="$withval" CACHE_OLD_COCOA=1 TOOLKIT_GIVEN=1 fi @@ -3389,10 +3490,10 @@ fi eval "$wx_cv_use_nanox" if test x"$enablestring" = xdisable; then - if test $wxUSE_NANOX = yes; then - result=no - else + if test $wxUSE_NANOX = no; then result=yes + else + result=no fi else result=$wxUSE_NANOX @@ -3439,10 +3540,10 @@ fi eval "$wx_cv_use_gpe" if test x"$enablestring" = xdisable; then - if test $wxUSE_GPE = yes; then - result=no - else + if test $wxUSE_GPE = no; then result=yes + else + result=no fi else result=$wxUSE_GPE @@ -3498,8 +3599,8 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} done fi - NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \ - + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \ + NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \ + + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \ + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` case "${host}" in @@ -3524,8 +3625,10 @@ echo "$as_me: error: Please specify at most one toolkit" >&2;} # to be removed when --disable-gtk2 isn't needed if test "x$wxUSE_GTK2" = "xyes"; then wxGTK_VERSION=2 + wxUSE_GTK1=0 elif test "x$wxUSE_GTK2" = "xno"; then wxGTK_VERSION=1 + wxUSE_GTK1=1 fi for toolkit in $ALL_TOOLKITS; do @@ -3548,7 +3651,9 @@ echo "${ECHO_T}base only" >&6; } fi wxUSE_MAC=0 -if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then +if test "$wxUSE_OSX_CARBON" = 1 \ + -o "$wxUSE_OSX_COCOA" = 1 \ + -o "$wxUSE_OSX_IPHONE" = 1; then wxUSE_MAC=1 fi @@ -4318,6 +4423,49 @@ fi echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; } +{ echo "$as_me:$LINENO: checking for --enable-debug" >&5 +echo $ECHO_N "checking for --enable-debug... $ECHO_C" >&6; } +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then + enableval=$enable_debug; + if test "$enableval" = yes; then + wxUSE_DEBUG=yes + elif test "$enableval" = no; then + wxUSE_DEBUG=no + elif test "$enableval" = max; then + wxUSE_DEBUG=yes + WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=2" + else + { { echo "$as_me:$LINENO: error: Invalid --enable-debug value, must be yes, no or max" >&5 +echo "$as_me: error: Invalid --enable-debug value, must be yes, no or max" >&2;} + { (exit 1); exit 1; }; } + fi + +else + wxUSE_DEBUG=default + +fi + + +case "$wxUSE_DEBUG" in + yes) + DEFAULT_wxUSE_DEBUG_FLAG=yes + DEFAULT_wxUSE_DEBUG_INFO=yes + + DEFAULT_wxUSE_OPTIMISE=no + ;; + + no) + DEFAULT_wxUSE_DEBUG_FLAG=no + DEFAULT_wxUSE_DEBUG_INFO=no + ;; + + default) + DEFAULT_wxUSE_DEBUG_FLAG=yes + DEFAULT_wxUSE_DEBUG_INFO=no + ;; +esac + enablestring=disable defaultval= @@ -4329,34 +4477,124 @@ echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; } - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then - enableval=$enable_shared; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; } + # Check whether --enable-debug_flag was given. +if test "${enable_debug_flag+set}" = set; then + enableval=$enable_debug_flag; if test "$enableval" = yes; then - wx_cv_use_shared='wxUSE_SHARED=yes' + wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes' else - wx_cv_use_shared='wxUSE_SHARED=no' + wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' fi else - wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" + wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" fi - eval "$wx_cv_use_shared" + eval "$wx_cv_use_debug_flag" if test x"$enablestring" = xdisable; then - if test $wxUSE_SHARED = yes; then + if test $wxUSE_DEBUG_FLAG = no; then + result=yes + else result=no + fi + else + result=$wxUSE_DEBUG_FLAG + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; } + # Check whether --enable-debug_info was given. +if test "${enable_debug_info+set}" = set; then + enableval=$enable_debug_info; + if test "$enableval" = yes; then + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes' + else + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' + fi + +else + + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" + +fi + + + eval "$wx_cv_use_debug_info" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_INFO = no; then + result=yes else + result=no + fi + else + result=$wxUSE_DEBUG_INFO + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; } + # Check whether --enable-debug_gdb was given. +if test "${enable_debug_gdb+set}" = set; then + enableval=$enable_debug_gdb; + if test "$enableval" = yes; then + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes' + else + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' + fi + +else + + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" + +fi + + + eval "$wx_cv_use_debug_gdb" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_GDB = no; then result=yes + else + result=no fi else - result=$wxUSE_SHARED + result=$wxUSE_DEBUG_GDB fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -4373,34 +4611,124 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; } - # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then - enableval=$enable_debug; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; } + # Check whether --enable-debug_cntxt was given. +if test "${enable_debug_cntxt+set}" = set; then + enableval=$enable_debug_cntxt; if test "$enableval" = yes; then - wx_cv_use_debug='wxUSE_DEBUG=yes' + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' else - wx_cv_use_debug='wxUSE_DEBUG=no' + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' fi else - wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}" + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" fi - eval "$wx_cv_use_debug" + eval "$wx_cv_use_debug_cntxt" if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUG = yes; then + if test $wxUSE_DEBUG_CONTEXT = no; then + result=yes + else result=no + fi + else + result=$wxUSE_DEBUG_CONTEXT + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; } + # Check whether --enable-mem_tracing was given. +if test "${enable_mem_tracing+set}" = set; then + enableval=$enable_mem_tracing; + if test "$enableval" = yes; then + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes' + else + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' + fi + +else + + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" + +fi + + + eval "$wx_cv_use_mem_tracing" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_MEM_TRACING = no; then + result=yes else + result=no + fi + else + result=$wxUSE_MEM_TRACING + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + + + enablestring=disable + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; } + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then + enableval=$enable_shared; + if test "$enableval" = yes; then + wx_cv_use_shared='wxUSE_SHARED=yes' + else + wx_cv_use_shared='wxUSE_SHARED=no' + fi + +else + + wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" + +fi + + + eval "$wx_cv_use_shared" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_SHARED = no; then result=yes + else + result=no fi else - result=$wxUSE_DEBUG + result=$wxUSE_SHARED fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -4438,10 +4766,10 @@ fi eval "$wx_cv_use_stl" if test x"$enablestring" = xdisable; then - if test $wxUSE_STL = yes; then - result=no - else + if test $wxUSE_STL = no; then result=yes + else + result=no fi else result=$wxUSE_STL @@ -4450,6 +4778,55 @@ fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_STL" = "yes"; then + DEFAULT_wxUSE_STD_CONTAINERS=yes + DEFAULT_wxUSE_STD_IOSTREAM=yes + DEFAULT_wxUSE_STD_STRING=yes +fi + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_containers" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-std_containers... $ECHO_C" >&6; } + # Check whether --enable-std_containers was given. +if test "${enable_std_containers+set}" = set; then + enableval=$enable_std_containers; + if test "$enableval" = yes; then + wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=yes' + else + wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=no' + fi + +else + + wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=${'DEFAULT_wxUSE_STD_CONTAINERS":-$defaultval}" + +fi + + + eval "$wx_cv_use_std_containers" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_STD_CONTAINERS = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_STD_CONTAINERS + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= defaultval= @@ -4482,10 +4859,10 @@ fi eval "$wx_cv_use_std_iostreams" if test x"$enablestring" = xdisable; then - if test $wxUSE_STD_IOSTREAM = yes; then - result=no - else + if test $wxUSE_STD_IOSTREAM = no; then result=yes + else + result=no fi else result=$wxUSE_STD_IOSTREAM @@ -4526,10 +4903,10 @@ fi eval "$wx_cv_use_std_string" if test x"$enablestring" = xdisable; then - if test $wxUSE_STD_STRING = yes; then - result=no - else + if test $wxUSE_STD_STRING = no; then result=yes + else + result=no fi else result=$wxUSE_STD_STRING @@ -4539,6 +4916,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string_conv_in_wxstring" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-std_string_conv_in_wxstring... $ECHO_C" >&6; } + # Check whether --enable-std_string_conv_in_wxstring was given. +if test "${enable_std_string_conv_in_wxstring+set}" = set; then + enableval=$enable_std_string_conv_in_wxstring; + if test "$enableval" = yes; then + wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=yes' + else + wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=no' + fi + +else + + wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=${'DEFAULT_wxUSE_STD_STRING_CONV_IN_WXSTRING":-$defaultval}" + +fi + + + eval "$wx_cv_use_std_string_conv_in_wxstring" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_STD_STRING_CONV_IN_WXSTRING = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_STD_STRING_CONV_IN_WXSTRING + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring=disable defaultval= if test -z "$defaultval"; then @@ -4570,10 +4991,10 @@ fi eval "$wx_cv_use_unicode" if test x"$enablestring" = xdisable; then - if test $wxUSE_UNICODE = yes; then - result=no - else + if test $wxUSE_UNICODE = no; then result=yes + else + result=no fi else result=$wxUSE_UNICODE @@ -4614,10 +5035,10 @@ fi eval "$wx_cv_use_mslu" if test x"$enablestring" = xdisable; then - if test $wxUSE_UNICODE_MSLU = yes; then - result=no - else + if test $wxUSE_UNICODE_MSLU = no; then result=yes + else + result=no fi else result=$wxUSE_UNICODE_MSLU @@ -4679,10 +5100,10 @@ fi eval "$wx_cv_use_utf8only" if test x"$enablestring" = xdisable; then - if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then - result=no - else + if test $wxUSE_UNICODE_UTF8_LOCALE = no; then result=yes + else + result=no fi else result=$wxUSE_UNICODE_UTF8_LOCALE @@ -4723,10 +5144,10 @@ fi eval "$wx_cv_use_extended_rtti" if test x"$enablestring" = xdisable; then - if test $wxUSE_EXTENDED_RTTI = yes; then - result=no - else + if test $wxUSE_EXTENDED_RTTI = no; then result=yes + else + result=no fi else result=$wxUSE_EXTENDED_RTTI @@ -4769,126 +5190,18 @@ fi eval "$wx_cv_use_omf" if test x"$enablestring" = xdisable; then - if test $wxUSE_OMF = yes; then - result=no - else + if test $wxUSE_OMF = no; then result=yes - fi - else - result=$wxUSE_OMF - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - -fi - -if test "$wxUSE_DEBUG" = "yes"; then - DEFAULT_wxUSE_DEBUG_FLAG=yes - DEFAULT_wxUSE_DEBUG_INFO=yes - BUILD=debug -elif test "$wxUSE_DEBUG" = "no"; then - DEFAULT_wxUSE_DEBUG_FLAG=no - DEFAULT_wxUSE_DEBUG_INFO=no - BUILD=release -fi - - - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; } - # Check whether --enable-debug_flag was given. -if test "${enable_debug_flag+set}" = set; then - enableval=$enable_debug_flag; - if test "$enableval" = yes; then - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes' - else - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' - fi - -else - - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" - -fi - - - eval "$wx_cv_use_debug_flag" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUG_FLAG = yes; then - result=no else - result=yes - fi - else - result=$wxUSE_DEBUG_FLAG - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; } - # Check whether --enable-debug_info was given. -if test "${enable_debug_info+set}" = set; then - enableval=$enable_debug_info; - if test "$enableval" = yes; then - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes' - else - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' - fi - -else - - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" - -fi - - - eval "$wx_cv_use_debug_info" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUG_INFO = yes; then result=no - else - result=yes fi else - result=$wxUSE_DEBUG_INFO + result=$wxUSE_OMF fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } - -if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then - wxUSE_DEBUG=yes - BUILD=debug -fi - -if test "$wxUSE_DEBUG" = "yes"; then - DEFAULT_wxUSE_OPTIMISE=no fi @@ -4923,151 +5236,19 @@ fi eval "$wx_cv_use_optimise" if test x"$enablestring" = xdisable; then - if test $wxUSE_OPTIMISE = yes; then - result=no - else + if test $wxUSE_OPTIMISE = no; then result=yes - fi - else - result=$wxUSE_OPTIMISE - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; } - # Check whether --enable-debug_gdb was given. -if test "${enable_debug_gdb+set}" = set; then - enableval=$enable_debug_gdb; - if test "$enableval" = yes; then - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes' - else - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' - fi - -else - - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" - -fi - - - eval "$wx_cv_use_debug_gdb" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUG_GDB = yes; then - result=no else - result=yes - fi - else - result=$wxUSE_DEBUG_GDB - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; } - # Check whether --enable-debug_cntxt was given. -if test "${enable_debug_cntxt+set}" = set; then - enableval=$enable_debug_cntxt; - if test "$enableval" = yes; then - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' - else - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' - fi - -else - - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" - -fi - - - eval "$wx_cv_use_debug_cntxt" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUG_CONTEXT = yes; then result=no - else - result=yes fi else - result=$wxUSE_DEBUG_CONTEXT + result=$wxUSE_OPTIMISE fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; } - # Check whether --enable-mem_tracing was given. -if test "${enable_mem_tracing+set}" = set; then - enableval=$enable_mem_tracing; - if test "$enableval" = yes; then - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes' - else - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' - fi - -else - - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" - -fi - - - eval "$wx_cv_use_mem_tracing" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_MEM_TRACING = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_MEM_TRACING - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - enablestring= defaultval= @@ -5100,10 +5281,10 @@ fi eval "$wx_cv_use_profile" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROFILE = yes; then - result=no - else + if test $wxUSE_PROFILE = no; then result=yes + else + result=no fi else result=$wxUSE_PROFILE @@ -5144,10 +5325,10 @@ fi eval "$wx_cv_use_no_rtti" if test x"$enablestring" = xdisable; then - if test $wxUSE_NO_RTTI = yes; then - result=no - else + if test $wxUSE_NO_RTTI = no; then result=yes + else + result=no fi else result=$wxUSE_NO_RTTI @@ -5188,10 +5369,10 @@ fi eval "$wx_cv_use_no_exceptions" if test x"$enablestring" = xdisable; then - if test $wxUSE_NO_EXCEPTIONS = yes; then - result=no - else + if test $wxUSE_NO_EXCEPTIONS = no; then result=yes + else + result=no fi else result=$wxUSE_NO_EXCEPTIONS @@ -5232,10 +5413,10 @@ fi eval "$wx_cv_use_permissive" if test x"$enablestring" = xdisable; then - if test $wxUSE_PERMISSIVE = yes; then - result=no - else + if test $wxUSE_PERMISSIVE = no; then result=yes + else + result=no fi else result=$wxUSE_PERMISSIVE @@ -5276,10 +5457,10 @@ fi eval "$wx_cv_use_no_deps" if test x"$enablestring" = xdisable; then - if test $wxUSE_NO_DEPS = yes; then - result=no - else + if test $wxUSE_NO_DEPS = no; then result=yes + else + result=no fi else result=$wxUSE_NO_DEPS @@ -5320,10 +5501,10 @@ fi eval "$wx_cv_use_vararg_macros" if test x"$enablestring" = xdisable; then - if test $wxUSE_VARARG_MACROS = yes; then - result=no - else + if test $wxUSE_VARARG_MACROS = no; then result=yes + else + result=no fi else result=$wxUSE_VARARG_MACROS @@ -5333,6 +5514,7 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6; } @@ -5354,6 +5536,27 @@ fi echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; } + enablestring= + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-macosx_arch" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-macosx_arch... $ECHO_C" >&6; } + # Check whether --enable-macosx_arch was given. +if test "${enable_macosx_arch+set}" = set; then + enableval=$enable_macosx_arch; + wx_cv_use_macosx_arch="wxUSE_MAC_ARCH='$enableval'" + +else + + wx_cv_use_macosx_arch='wxUSE_MAC_ARCH='$DEFAULT_wxUSE_MAC_ARCH + +fi + + + eval "$wx_cv_use_macosx_arch" + + { echo "$as_me:$LINENO: result: $wxUSE_MAC_ARCH" >&5 +echo "${ECHO_T}$wxUSE_MAC_ARCH" >&6; } + + enablestring= defaultval= @@ -5386,10 +5589,10 @@ fi eval "$wx_cv_use_compat26" if test x"$enablestring" = xdisable; then - if test $WXWIN_COMPATIBILITY_2_6 = yes; then - result=no - else + if test $WXWIN_COMPATIBILITY_2_6 = no; then result=yes + else + result=no fi else result=$WXWIN_COMPATIBILITY_2_6 @@ -5430,10 +5633,10 @@ fi eval "$wx_cv_use_compat28" if test x"$enablestring" = xdisable; then - if test $WXWIN_COMPATIBILITY_2_8 = yes; then - result=no - else + if test $WXWIN_COMPATIBILITY_2_8 = no; then result=yes + else + result=no fi else result=$WXWIN_COMPATIBILITY_2_8 @@ -5475,10 +5678,10 @@ fi eval "$wx_cv_use_rpath" if test x"$enablestring" = xdisable; then - if test $wxUSE_RPATH = yes; then - result=no - else + if test $wxUSE_RPATH = no; then result=yes + else + result=no fi else result=$wxUSE_RPATH @@ -5520,10 +5723,10 @@ fi eval "$wx_cv_use_objc_uniquifying" if test x"$enablestring" = xdisable; then - if test $wxUSE_OBJC_UNIQUIFYING = yes; then - result=no - else + if test $wxUSE_OBJC_UNIQUIFYING = no; then result=yes + else + result=no fi else result=$wxUSE_OBJC_UNIQUIFYING @@ -5565,10 +5768,10 @@ fi eval "$wx_cv_use_visibility" if test x"$enablestring" = xdisable; then - if test $wxUSE_VISIBILITY = yes; then - result=no - else + if test $wxUSE_VISIBILITY = no; then result=yes + else + result=no fi else result=$wxUSE_VISIBILITY @@ -5609,10 +5812,10 @@ fi eval "$wx_cv_use_tls" if test x"$enablestring" = xdisable; then - if test $wxUSE_COMPILER_TLS = yes; then - result=no - else + if test $wxUSE_COMPILER_TLS = no; then result=yes + else + result=no fi else result=$wxUSE_COMPILER_TLS @@ -5655,10 +5858,10 @@ fi eval "$wx_cv_use_intl" if test x"$enablestring" = xdisable; then - if test $wxUSE_INTL = yes; then - result=no - else + if test $wxUSE_INTL = no; then result=yes + else + result=no fi else result=$wxUSE_INTL @@ -5699,10 +5902,10 @@ fi eval "$wx_cv_use_xlocale" if test x"$enablestring" = xdisable; then - if test $wxUSE_XLOCALE = yes; then - result=no - else + if test $wxUSE_XLOCALE = no; then result=yes + else + result=no fi else result=$wxUSE_XLOCALE @@ -5743,10 +5946,10 @@ fi eval "$wx_cv_use_config" if test x"$enablestring" = xdisable; then - if test $wxUSE_CONFIG = yes; then - result=no - else + if test $wxUSE_CONFIG = no; then result=yes + else + result=no fi else result=$wxUSE_CONFIG @@ -5788,10 +5991,10 @@ fi eval "$wx_cv_use_protocols" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROTOCOL = yes; then - result=no - else + if test $wxUSE_PROTOCOL = no; then result=yes + else + result=no fi else result=$wxUSE_PROTOCOL @@ -5832,10 +6035,10 @@ fi eval "$wx_cv_use_ftp" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROTOCOL_FTP = yes; then - result=no - else + if test $wxUSE_PROTOCOL_FTP = no; then result=yes + else + result=no fi else result=$wxUSE_PROTOCOL_FTP @@ -5876,10 +6079,10 @@ fi eval "$wx_cv_use_http" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROTOCOL_HTTP = yes; then - result=no - else + if test $wxUSE_PROTOCOL_HTTP = no; then result=yes + else + result=no fi else result=$wxUSE_PROTOCOL_HTTP @@ -5920,10 +6123,10 @@ fi eval "$wx_cv_use_fileproto" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROTOCOL_FILE = yes; then - result=no - else + if test $wxUSE_PROTOCOL_FILE = no; then result=yes + else + result=no fi else result=$wxUSE_PROTOCOL_FILE @@ -5964,10 +6167,10 @@ fi eval "$wx_cv_use_sockets" if test x"$enablestring" = xdisable; then - if test $wxUSE_SOCKETS = yes; then - result=no - else + if test $wxUSE_SOCKETS = no; then result=yes + else + result=no fi else result=$wxUSE_SOCKETS @@ -6008,10 +6211,10 @@ fi eval "$wx_cv_use_ipv6" if test x"$enablestring" = xdisable; then - if test $wxUSE_IPV6 = yes; then - result=no - else + if test $wxUSE_IPV6 = no; then result=yes + else + result=no fi else result=$wxUSE_IPV6 @@ -6052,10 +6255,10 @@ fi eval "$wx_cv_use_ole" if test x"$enablestring" = xdisable; then - if test $wxUSE_OLE = yes; then - result=no - else + if test $wxUSE_OLE = no; then result=yes + else + result=no fi else result=$wxUSE_OLE @@ -6096,10 +6299,10 @@ fi eval "$wx_cv_use_dataobj" if test x"$enablestring" = xdisable; then - if test $wxUSE_DATAOBJ = yes; then - result=no - else + if test $wxUSE_DATAOBJ = no; then result=yes + else + result=no fi else result=$wxUSE_DATAOBJ @@ -6141,10 +6344,10 @@ fi eval "$wx_cv_use_ipc" if test x"$enablestring" = xdisable; then - if test $wxUSE_IPC = yes; then - result=no - else + if test $wxUSE_IPC = no; then result=yes + else + result=no fi else result=$wxUSE_IPC @@ -6186,10 +6389,10 @@ fi eval "$wx_cv_use_baseevtloop" if test x"$enablestring" = xdisable; then - if test $wxUSE_CONSOLE_EVENTLOOP = yes; then - result=no - else + if test $wxUSE_CONSOLE_EVENTLOOP = no; then result=yes + else + result=no fi else result=$wxUSE_CONSOLE_EVENTLOOP @@ -6230,10 +6433,10 @@ fi eval "$wx_cv_use_epollloop" if test x"$enablestring" = xdisable; then - if test $wxUSE_EPOLL_DISPATCHER = yes; then - result=no - else + if test $wxUSE_EPOLL_DISPATCHER = no; then result=yes + else + result=no fi else result=$wxUSE_EPOLL_DISPATCHER @@ -6274,10 +6477,10 @@ fi eval "$wx_cv_use_selectloop" if test x"$enablestring" = xdisable; then - if test $wxUSE_SELECT_DISPATCHER = yes; then - result=no - else + if test $wxUSE_SELECT_DISPATCHER = no; then result=yes + else + result=no fi else result=$wxUSE_SELECT_DISPATCHER @@ -6288,6 +6491,50 @@ echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-any" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-any... $ECHO_C" >&6; } + # Check whether --enable-any was given. +if test "${enable_any+set}" = set; then + enableval=$enable_any; + if test "$enableval" = yes; then + wx_cv_use_any='wxUSE_ANY=yes' + else + wx_cv_use_any='wxUSE_ANY=no' + fi + +else + + wx_cv_use_any='wxUSE_ANY=${'DEFAULT_wxUSE_ANY":-$defaultval}" + +fi + + + eval "$wx_cv_use_any" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_ANY = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_ANY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -6319,10 +6566,10 @@ fi eval "$wx_cv_use_apple_ieee" if test x"$enablestring" = xdisable; then - if test $wxUSE_APPLE_IEEE = yes; then - result=no - else + if test $wxUSE_APPLE_IEEE = no; then result=yes + else + result=no fi else result=$wxUSE_APPLE_IEEE @@ -6363,10 +6610,10 @@ fi eval "$wx_cv_use_arcstream" if test x"$enablestring" = xdisable; then - if test $wxUSE_ARCHIVE_STREAMS = yes; then - result=no - else + if test $wxUSE_ARCHIVE_STREAMS = no; then result=yes + else + result=no fi else result=$wxUSE_ARCHIVE_STREAMS @@ -6407,10 +6654,10 @@ fi eval "$wx_cv_use_base64" if test x"$enablestring" = xdisable; then - if test $wxUSE_BASE64 = yes; then - result=no - else + if test $wxUSE_BASE64 = no; then result=yes + else + result=no fi else result=$wxUSE_BASE64 @@ -6451,10 +6698,10 @@ fi eval "$wx_cv_use_backtrace" if test x"$enablestring" = xdisable; then - if test $wxUSE_STACKWALKER = yes; then - result=no - else + if test $wxUSE_STACKWALKER = no; then result=yes + else + result=no fi else result=$wxUSE_STACKWALKER @@ -6495,10 +6742,10 @@ fi eval "$wx_cv_use_catch_segvs" if test x"$enablestring" = xdisable; then - if test $wxUSE_ON_FATAL_EXCEPTION = yes; then - result=no - else + if test $wxUSE_ON_FATAL_EXCEPTION = no; then result=yes + else + result=no fi else result=$wxUSE_ON_FATAL_EXCEPTION @@ -6539,10 +6786,10 @@ fi eval "$wx_cv_use_cmdline" if test x"$enablestring" = xdisable; then - if test $wxUSE_CMDLINE_PARSER = yes; then - result=no - else + if test $wxUSE_CMDLINE_PARSER = no; then result=yes + else + result=no fi else result=$wxUSE_CMDLINE_PARSER @@ -6583,10 +6830,10 @@ fi eval "$wx_cv_use_datetime" if test x"$enablestring" = xdisable; then - if test $wxUSE_DATETIME = yes; then - result=no - else + if test $wxUSE_DATETIME = no; then result=yes + else + result=no fi else result=$wxUSE_DATETIME @@ -6627,10 +6874,10 @@ fi eval "$wx_cv_use_debugreport" if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUGREPORT = yes; then - result=no - else + if test $wxUSE_DEBUGREPORT = no; then result=yes + else + result=no fi else result=$wxUSE_DEBUGREPORT @@ -6671,10 +6918,10 @@ fi eval "$wx_cv_use_dialupman" if test x"$enablestring" = xdisable; then - if test $wxUSE_DIALUP_MANAGER = yes; then - result=no - else + if test $wxUSE_DIALUP_MANAGER = no; then result=yes + else + result=no fi else result=$wxUSE_DIALUP_MANAGER @@ -6715,10 +6962,10 @@ fi eval "$wx_cv_use_dynlib" if test x"$enablestring" = xdisable; then - if test $wxUSE_DYNLIB_CLASS = yes; then - result=no - else + if test $wxUSE_DYNLIB_CLASS = no; then result=yes + else + result=no fi else result=$wxUSE_DYNLIB_CLASS @@ -6759,10 +7006,10 @@ fi eval "$wx_cv_use_dynamicloader" if test x"$enablestring" = xdisable; then - if test $wxUSE_DYNAMIC_LOADER = yes; then - result=no - else + if test $wxUSE_DYNAMIC_LOADER = no; then result=yes + else + result=no fi else result=$wxUSE_DYNAMIC_LOADER @@ -6803,10 +7050,10 @@ fi eval "$wx_cv_use_exceptions" if test x"$enablestring" = xdisable; then - if test $wxUSE_EXCEPTIONS = yes; then - result=no - else + if test $wxUSE_EXCEPTIONS = no; then result=yes + else + result=no fi else result=$wxUSE_EXCEPTIONS @@ -6847,10 +7094,10 @@ fi eval "$wx_cv_use_ffile" if test x"$enablestring" = xdisable; then - if test $wxUSE_FFILE = yes; then - result=no - else + if test $wxUSE_FFILE = no; then result=yes + else + result=no fi else result=$wxUSE_FFILE @@ -6891,10 +7138,10 @@ fi eval "$wx_cv_use_file" if test x"$enablestring" = xdisable; then - if test $wxUSE_FILE = yes; then - result=no - else + if test $wxUSE_FILE = no; then result=yes + else + result=no fi else result=$wxUSE_FILE @@ -6904,6 +7151,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filehistory" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-filehistory... $ECHO_C" >&6; } + # Check whether --enable-filehistory was given. +if test "${enable_filehistory+set}" = set; then + enableval=$enable_filehistory; + if test "$enableval" = yes; then + wx_cv_use_filehistory='wxUSE_FILE_HISTORY=yes' + else + wx_cv_use_filehistory='wxUSE_FILE_HISTORY=no' + fi + +else + + wx_cv_use_filehistory='wxUSE_FILE_HISTORY=${'DEFAULT_wxUSE_FILE_HISTORY":-$defaultval}" + +fi + + + eval "$wx_cv_use_filehistory" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILE_HISTORY = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_FILE_HISTORY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -6935,10 +7226,10 @@ fi eval "$wx_cv_use_filesystem" if test x"$enablestring" = xdisable; then - if test $wxUSE_FILESYSTEM = yes; then - result=no - else + if test $wxUSE_FILESYSTEM = no; then result=yes + else + result=no fi else result=$wxUSE_FILESYSTEM @@ -6979,10 +7270,10 @@ fi eval "$wx_cv_use_fontenum" if test x"$enablestring" = xdisable; then - if test $wxUSE_FONTENUM = yes; then - result=no - else + if test $wxUSE_FONTENUM = no; then result=yes + else + result=no fi else result=$wxUSE_FONTENUM @@ -7023,10 +7314,10 @@ fi eval "$wx_cv_use_fontmap" if test x"$enablestring" = xdisable; then - if test $wxUSE_FONTMAP = yes; then - result=no - else + if test $wxUSE_FONTMAP = no; then result=yes + else + result=no fi else result=$wxUSE_FONTMAP @@ -7067,10 +7358,10 @@ fi eval "$wx_cv_use_fs_archive" if test x"$enablestring" = xdisable; then - if test $wxUSE_FS_ARCHIVE = yes; then - result=no - else + if test $wxUSE_FS_ARCHIVE = no; then result=yes + else + result=no fi else result=$wxUSE_FS_ARCHIVE @@ -7111,10 +7402,10 @@ fi eval "$wx_cv_use_fs_inet" if test x"$enablestring" = xdisable; then - if test $wxUSE_FS_INET = yes; then - result=no - else + if test $wxUSE_FS_INET = no; then result=yes + else + result=no fi else result=$wxUSE_FS_INET @@ -7155,10 +7446,10 @@ fi eval "$wx_cv_use_fs_zip" if test x"$enablestring" = xdisable; then - if test $wxUSE_FS_ZIP = yes; then - result=no - else + if test $wxUSE_FS_ZIP = no; then result=yes + else + result=no fi else result=$wxUSE_FS_ZIP @@ -7168,6 +7459,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fswatcher" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fswatcher... $ECHO_C" >&6; } + # Check whether --enable-fswatcher was given. +if test "${enable_fswatcher+set}" = set; then + enableval=$enable_fswatcher; + if test "$enableval" = yes; then + wx_cv_use_fswatcher='wxUSE_FSWATCHER=yes' + else + wx_cv_use_fswatcher='wxUSE_FSWATCHER=no' + fi + +else + + wx_cv_use_fswatcher='wxUSE_FSWATCHER=${'DEFAULT_wxUSE_FSWATCHER":-$defaultval}" + +fi + + + eval "$wx_cv_use_fswatcher" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_FSWATCHER = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_FSWATCHER + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -7199,10 +7534,10 @@ fi eval "$wx_cv_use_geometry" if test x"$enablestring" = xdisable; then - if test $wxUSE_GEOMETRY = yes; then - result=no - else + if test $wxUSE_GEOMETRY = no; then result=yes + else + result=no fi else result=$wxUSE_GEOMETRY @@ -7243,10 +7578,10 @@ fi eval "$wx_cv_use_log" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOG = yes; then - result=no - else + if test $wxUSE_LOG = no; then result=yes + else + result=no fi else result=$wxUSE_LOG @@ -7287,10 +7622,10 @@ fi eval "$wx_cv_use_longlong" if test x"$enablestring" = xdisable; then - if test $wxUSE_LONGLONG = yes; then - result=no - else + if test $wxUSE_LONGLONG = no; then result=yes + else + result=no fi else result=$wxUSE_LONGLONG @@ -7331,10 +7666,10 @@ fi eval "$wx_cv_use_mimetype" if test x"$enablestring" = xdisable; then - if test $wxUSE_MIMETYPE = yes; then - result=no - else + if test $wxUSE_MIMETYPE = no; then result=yes + else + result=no fi else result=$wxUSE_MIMETYPE @@ -7375,10 +7710,10 @@ fi eval "$wx_cv_use_printfposparam" if test x"$enablestring" = xdisable; then - if test $wxUSE_PRINTF_POS_PARAMS = yes; then - result=no - else + if test $wxUSE_PRINTF_POS_PARAMS = no; then result=yes + else + result=no fi else result=$wxUSE_PRINTF_POS_PARAMS @@ -7419,10 +7754,10 @@ fi eval "$wx_cv_use_snglinst" if test x"$enablestring" = xdisable; then - if test $wxUSE_SNGLINST_CHECKER = yes; then - result=no - else + if test $wxUSE_SNGLINST_CHECKER = no; then result=yes + else + result=no fi else result=$wxUSE_SNGLINST_CHECKER @@ -7463,10 +7798,10 @@ fi eval "$wx_cv_use_sound" if test x"$enablestring" = xdisable; then - if test $wxUSE_SOUND = yes; then - result=no - else + if test $wxUSE_SOUND = no; then result=yes + else + result=no fi else result=$wxUSE_SOUND @@ -7507,10 +7842,10 @@ fi eval "$wx_cv_use_stdpaths" if test x"$enablestring" = xdisable; then - if test $wxUSE_STDPATHS = yes; then - result=no - else + if test $wxUSE_STDPATHS = no; then result=yes + else + result=no fi else result=$wxUSE_STDPATHS @@ -7551,10 +7886,10 @@ fi eval "$wx_cv_use_stopwatch" if test x"$enablestring" = xdisable; then - if test $wxUSE_STOPWATCH = yes; then - result=no - else + if test $wxUSE_STOPWATCH = no; then result=yes + else + result=no fi else result=$wxUSE_STOPWATCH @@ -7595,10 +7930,10 @@ fi eval "$wx_cv_use_streams" if test x"$enablestring" = xdisable; then - if test $wxUSE_STREAMS = yes; then - result=no - else + if test $wxUSE_STREAMS = no; then result=yes + else + result=no fi else result=$wxUSE_STREAMS @@ -7618,31 +7953,31 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6; } - # Check whether --enable-system_options was given. -if test "${enable_system_options+set}" = set; then - enableval=$enable_system_options; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sysoptions" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-sysoptions... $ECHO_C" >&6; } + # Check whether --enable-sysoptions was given. +if test "${enable_sysoptions+set}" = set; then + enableval=$enable_sysoptions; if test "$enableval" = yes; then - wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes' + wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=yes' else - wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no' + wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=no' fi else - wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" + wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" fi - eval "$wx_cv_use_system_options" + eval "$wx_cv_use_sysoptions" if test x"$enablestring" = xdisable; then - if test $wxUSE_SYSTEM_OPTIONS = yes; then - result=no - else + if test $wxUSE_SYSTEM_OPTIONS = no; then result=yes + else + result=no fi else result=$wxUSE_SYSTEM_OPTIONS @@ -7683,10 +8018,10 @@ fi eval "$wx_cv_use_tarstream" if test x"$enablestring" = xdisable; then - if test $wxUSE_TARSTREAM = yes; then - result=no - else + if test $wxUSE_TARSTREAM = no; then result=yes + else + result=no fi else result=$wxUSE_TARSTREAM @@ -7727,10 +8062,10 @@ fi eval "$wx_cv_use_textbuf" if test x"$enablestring" = xdisable; then - if test $wxUSE_TEXTBUFFER = yes; then - result=no - else + if test $wxUSE_TEXTBUFFER = no; then result=yes + else + result=no fi else result=$wxUSE_TEXTBUFFER @@ -7771,10 +8106,10 @@ fi eval "$wx_cv_use_textfile" if test x"$enablestring" = xdisable; then - if test $wxUSE_TEXTFILE = yes; then - result=no - else + if test $wxUSE_TEXTFILE = no; then result=yes + else + result=no fi else result=$wxUSE_TEXTFILE @@ -7815,10 +8150,10 @@ fi eval "$wx_cv_use_timer" if test x"$enablestring" = xdisable; then - if test $wxUSE_TIMER = yes; then - result=no - else + if test $wxUSE_TIMER = no; then result=yes + else + result=no fi else result=$wxUSE_TIMER @@ -7859,10 +8194,10 @@ fi eval "$wx_cv_use_variant" if test x"$enablestring" = xdisable; then - if test $wxUSE_VARIANT = yes; then - result=no - else + if test $wxUSE_VARIANT = no; then result=yes + else + result=no fi else result=$wxUSE_VARIANT @@ -7903,10 +8238,10 @@ fi eval "$wx_cv_use_zipstream" if test x"$enablestring" = xdisable; then - if test $wxUSE_ZIPSTREAM = yes; then - result=no - else + if test $wxUSE_ZIPSTREAM = no; then result=yes + else + result=no fi else result=$wxUSE_ZIPSTREAM @@ -7948,10 +8283,10 @@ fi eval "$wx_cv_use_url" if test x"$enablestring" = xdisable; then - if test $wxUSE_URL = yes; then - result=no - else + if test $wxUSE_URL = no; then result=yes + else + result=no fi else result=$wxUSE_URL @@ -7992,10 +8327,10 @@ fi eval "$wx_cv_use_protocol" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROTOCOL = yes; then - result=no - else + if test $wxUSE_PROTOCOL = no; then result=yes + else + result=no fi else result=$wxUSE_PROTOCOL @@ -8036,10 +8371,10 @@ fi eval "$wx_cv_use_protocol_http" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROTOCOL_HTTP = yes; then - result=no - else + if test $wxUSE_PROTOCOL_HTTP = no; then result=yes + else + result=no fi else result=$wxUSE_PROTOCOL_HTTP @@ -8080,10 +8415,10 @@ fi eval "$wx_cv_use_protocol_ftp" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROTOCOL_FTP = yes; then - result=no - else + if test $wxUSE_PROTOCOL_FTP = no; then result=yes + else + result=no fi else result=$wxUSE_PROTOCOL_FTP @@ -8124,10 +8459,10 @@ fi eval "$wx_cv_use_protocol_file" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROTOCOL_FILE = yes; then - result=no - else + if test $wxUSE_PROTOCOL_FILE = no; then result=yes + else + result=no fi else result=$wxUSE_PROTOCOL_FILE @@ -8169,10 +8504,10 @@ fi eval "$wx_cv_use_threads" if test x"$enablestring" = xdisable; then - if test $wxUSE_THREADS = yes; then - result=no - else + if test $wxUSE_THREADS = no; then result=yes + else + result=no fi else result=$wxUSE_THREADS @@ -8214,10 +8549,10 @@ fi eval "$wx_cv_use_iniconf" if test x"$enablestring" = xdisable; then - if test $wxUSE_INICONF = yes; then - result=no - else + if test $wxUSE_INICONF = no; then result=yes + else + result=no fi else result=$wxUSE_INICONF @@ -8258,10 +8593,10 @@ fi eval "$wx_cv_use_regkey" if test x"$enablestring" = xdisable; then - if test $wxUSE_REGKEY = yes; then - result=no - else + if test $wxUSE_REGKEY = no; then result=yes + else + result=no fi else result=$wxUSE_REGKEY @@ -8306,10 +8641,10 @@ fi eval "$wx_cv_use_docview" if test x"$enablestring" = xdisable; then - if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then - result=no - else + if test $wxUSE_DOC_VIEW_ARCHITECTURE = no; then result=yes + else + result=no fi else result=$wxUSE_DOC_VIEW_ARCHITECTURE @@ -8350,10 +8685,10 @@ fi eval "$wx_cv_use_help" if test x"$enablestring" = xdisable; then - if test $wxUSE_HELP = yes; then - result=no - else + if test $wxUSE_HELP = no; then result=yes + else + result=no fi else result=$wxUSE_HELP @@ -8394,10 +8729,10 @@ fi eval "$wx_cv_use_mshtmlhelp" if test x"$enablestring" = xdisable; then - if test $wxUSE_MS_HTML_HELP = yes; then - result=no - else + if test $wxUSE_MS_HTML_HELP = no; then result=yes + else + result=no fi else result=$wxUSE_MS_HTML_HELP @@ -8438,10 +8773,10 @@ fi eval "$wx_cv_use_html" if test x"$enablestring" = xdisable; then - if test $wxUSE_HTML = yes; then - result=no - else + if test $wxUSE_HTML = no; then result=yes + else + result=no fi else result=$wxUSE_HTML @@ -8482,10 +8817,10 @@ fi eval "$wx_cv_use_htmlhelp" if test x"$enablestring" = xdisable; then - if test $wxUSE_WXHTML_HELP = yes; then - result=no - else + if test $wxUSE_WXHTML_HELP = no; then result=yes + else + result=no fi else result=$wxUSE_WXHTML_HELP @@ -8526,10 +8861,10 @@ fi eval "$wx_cv_use_xrc" if test x"$enablestring" = xdisable; then - if test $wxUSE_XRC = yes; then - result=no - else + if test $wxUSE_XRC = no; then result=yes + else + result=no fi else result=$wxUSE_XRC @@ -8570,10 +8905,10 @@ fi eval "$wx_cv_use_aui" if test x"$enablestring" = xdisable; then - if test $wxUSE_AUI = yes; then - result=no - else + if test $wxUSE_AUI = no; then result=yes + else + result=no fi else result=$wxUSE_AUI @@ -8614,10 +8949,10 @@ fi eval "$wx_cv_use_propgrid" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROPGRID = yes; then - result=no - else + if test $wxUSE_PROPGRID = no; then result=yes + else + result=no fi else result=$wxUSE_PROPGRID @@ -8627,6 +8962,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ribbon" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ribbon... $ECHO_C" >&6; } + # Check whether --enable-ribbon was given. +if test "${enable_ribbon+set}" = set; then + enableval=$enable_ribbon; + if test "$enableval" = yes; then + wx_cv_use_ribbon='wxUSE_RIBBON=yes' + else + wx_cv_use_ribbon='wxUSE_RIBBON=no' + fi + +else + + wx_cv_use_ribbon='wxUSE_RIBBON=${'DEFAULT_wxUSE_RIBBON":-$defaultval}" + +fi + + + eval "$wx_cv_use_ribbon" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_RIBBON = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_RIBBON + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -8658,10 +9037,10 @@ fi eval "$wx_cv_use_stc" if test x"$enablestring" = xdisable; then - if test $wxUSE_STC = yes; then - result=no - else + if test $wxUSE_STC = no; then result=yes + else + result=no fi else result=$wxUSE_STC @@ -8702,10 +9081,10 @@ fi eval "$wx_cv_use_constraints" if test x"$enablestring" = xdisable; then - if test $wxUSE_CONSTRAINTS = yes; then - result=no - else + if test $wxUSE_CONSTRAINTS = no; then result=yes + else + result=no fi else result=$wxUSE_CONSTRAINTS @@ -8746,10 +9125,10 @@ fi eval "$wx_cv_use_loggui" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGGUI = yes; then - result=no - else + if test $wxUSE_LOGGUI = no; then result=yes + else + result=no fi else result=$wxUSE_LOGGUI @@ -8790,10 +9169,10 @@ fi eval "$wx_cv_use_logwin" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGWINDOW = yes; then - result=no - else + if test $wxUSE_LOGWINDOW = no; then result=yes + else + result=no fi else result=$wxUSE_LOGWINDOW @@ -8834,10 +9213,10 @@ fi eval "$wx_cv_use_logdialog" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGDIALOG = yes; then - result=no - else + if test $wxUSE_LOGDIALOG = no; then result=yes + else + result=no fi else result=$wxUSE_LOGDIALOG @@ -8878,10 +9257,10 @@ fi eval "$wx_cv_use_mdi" if test x"$enablestring" = xdisable; then - if test $wxUSE_MDI = yes; then - result=no - else + if test $wxUSE_MDI = no; then result=yes + else + result=no fi else result=$wxUSE_MDI @@ -8922,10 +9301,10 @@ fi eval "$wx_cv_use_mdidoc" if test x"$enablestring" = xdisable; then - if test $wxUSE_MDI_ARCHITECTURE = yes; then - result=no - else + if test $wxUSE_MDI_ARCHITECTURE = no; then result=yes + else + result=no fi else result=$wxUSE_MDI_ARCHITECTURE @@ -8966,10 +9345,10 @@ fi eval "$wx_cv_use_mediactrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_MEDIACTRL = yes; then - result=no - else + if test $wxUSE_MEDIACTRL = no; then result=yes + else + result=no fi else result=$wxUSE_MEDIACTRL @@ -9010,10 +9389,10 @@ fi eval "$wx_cv_use_gstreamer8" if test x"$enablestring" = xdisable; then - if test $wxUSE_GSTREAMER8 = yes; then - result=no - else + if test $wxUSE_GSTREAMER8 = no; then result=yes + else + result=no fi else result=$wxUSE_GSTREAMER8 @@ -9054,10 +9433,10 @@ fi eval "$wx_cv_use_webkit" if test x"$enablestring" = xdisable; then - if test $wxUSE_WEBKIT = yes; then - result=no - else + if test $wxUSE_WEBKIT = no; then result=yes + else + result=no fi else result=$wxUSE_WEBKIT @@ -9098,57 +9477,13 @@ fi eval "$wx_cv_use_richtext" if test x"$enablestring" = xdisable; then - if test $wxUSE_RICHTEXT = yes; then - result=no - else + if test $wxUSE_RICHTEXT = no; then result=yes - fi - else - result=$wxUSE_RICHTEXT - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; } - # Check whether --enable-graphics_ctx was given. -if test "${enable_graphics_ctx+set}" = set; then - enableval=$enable_graphics_ctx; - if test "$enableval" = yes; then - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' - else - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' - fi - -else - - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" - -fi - - - eval "$wx_cv_use_graphics_ctx" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_GRAPHICS_CONTEXT = yes; then - result=no else - result=yes + result=no fi else - result=$wxUSE_GRAPHICS_CONTEXT + result=$wxUSE_RICHTEXT fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9186,10 +9521,10 @@ fi eval "$wx_cv_use_postscript" if test x"$enablestring" = xdisable; then - if test $wxUSE_POSTSCRIPT = yes; then - result=no - else + if test $wxUSE_POSTSCRIPT = no; then result=yes + else + result=no fi else result=$wxUSE_POSTSCRIPT @@ -9230,10 +9565,10 @@ fi eval "$wx_cv_use_printarch" if test x"$enablestring" = xdisable; then - if test $wxUSE_PRINTING_ARCHITECTURE = yes; then - result=no - else + if test $wxUSE_PRINTING_ARCHITECTURE = no; then result=yes + else + result=no fi else result=$wxUSE_PRINTING_ARCHITECTURE @@ -9274,10 +9609,10 @@ fi eval "$wx_cv_use_svg" if test x"$enablestring" = xdisable; then - if test $wxUSE_SVG = yes; then - result=no - else + if test $wxUSE_SVG = no; then result=yes + else + result=no fi else result=$wxUSE_SVG @@ -9287,6 +9622,53 @@ fi echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_MAC" != 1; then + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; } + # Check whether --enable-graphics_ctx was given. +if test "${enable_graphics_ctx+set}" = set; then + enableval=$enable_graphics_ctx; + if test "$enableval" = yes; then + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' + else + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' + fi + +else + + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" + +fi + + + eval "$wx_cv_use_graphics_ctx" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_GRAPHICS_CONTEXT = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_GRAPHICS_CONTEXT + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + +fi + enablestring= @@ -9320,10 +9702,10 @@ fi eval "$wx_cv_use_clipboard" if test x"$enablestring" = xdisable; then - if test $wxUSE_CLIPBOARD = yes; then - result=no - else + if test $wxUSE_CLIPBOARD = no; then result=yes + else + result=no fi else result=$wxUSE_CLIPBOARD @@ -9364,10 +9746,10 @@ fi eval "$wx_cv_use_dnd" if test x"$enablestring" = xdisable; then - if test $wxUSE_DRAG_AND_DROP = yes; then - result=no - else + if test $wxUSE_DRAG_AND_DROP = no; then result=yes + else + result=no fi else result=$wxUSE_DRAG_AND_DROP @@ -9408,10 +9790,10 @@ fi eval "$wx_cv_use_metafile" if test x"$enablestring" = xdisable; then - if test $wxUSE_METAFILE = yes; then - result=no - else + if test $wxUSE_METAFILE = no; then result=yes + else + result=no fi else result=$wxUSE_METAFILE @@ -9455,10 +9837,10 @@ fi eval "$wx_cv_use_controls" if test x"$enablestring" = xdisable; then - if test $wxUSE_CONTROLS = yes; then - result=no - else + if test $wxUSE_CONTROLS = no; then result=yes + else + result=no fi else result=$wxUSE_CONTROLS @@ -9483,6 +9865,7 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_COLOURPICKERCTRL=no DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_COMMANDLINKBUTTON=no DEFAULT_wxUSE_DATAVIEWCTRL=no DEFAULT_wxUSE_DATEPICKCTRL=no DEFAULT_wxUSE_DETECT_SM=no @@ -9499,10 +9882,12 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_LISTBOOK=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no + DEFAULT_wxUSE_MARKUP=no DEFAULT_wxUSE_NOTEBOOK=no DEFAULT_wxUSE_POPUPWIN=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no + DEFAULT_wxUSE_RICHMSGDLG=no DEFAULT_wxUSE_REARRANGECTRL=no DEFAULT_wxUSE_SASH=no DEFAULT_wxUSE_SCROLLBAR=no @@ -9526,6 +9911,51 @@ if test "$wxUSE_CONTROLS" = "no"; then fi + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-markup" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-markup... $ECHO_C" >&6; } + # Check whether --enable-markup was given. +if test "${enable_markup+set}" = set; then + enableval=$enable_markup; + if test "$enableval" = yes; then + wx_cv_use_markup='wxUSE_MARKUP=yes' + else + wx_cv_use_markup='wxUSE_MARKUP=no' + fi + +else + + wx_cv_use_markup='wxUSE_MARKUP=${'DEFAULT_wxUSE_MARKUP":-$defaultval}" + +fi + + + eval "$wx_cv_use_markup" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_MARKUP = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_MARKUP + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -9557,10 +9987,10 @@ fi eval "$wx_cv_use_accel" if test x"$enablestring" = xdisable; then - if test $wxUSE_ACCEL = yes; then - result=no - else + if test $wxUSE_ACCEL = no; then result=yes + else + result=no fi else result=$wxUSE_ACCEL @@ -9601,13 +10031,101 @@ fi eval "$wx_cv_use_animatectrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_ANIMATIONCTRL = yes; then + if test $wxUSE_ANIMATIONCTRL = no; then + result=yes + else result=no + fi + else + result=$wxUSE_ANIMATIONCTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-artstd" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-artstd... $ECHO_C" >&6; } + # Check whether --enable-artstd was given. +if test "${enable_artstd+set}" = set; then + enableval=$enable_artstd; + if test "$enableval" = yes; then + wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=yes' + else + wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=no' + fi + +else + + wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=${'DEFAULT_wxUSE_ARTPROVIDER_STD":-$defaultval}" + +fi + + + eval "$wx_cv_use_artstd" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_ARTPROVIDER_STD = no; then + result=yes else + result=no + fi + else + result=$wxUSE_ARTPROVIDER_STD + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arttango" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-arttango... $ECHO_C" >&6; } + # Check whether --enable-arttango was given. +if test "${enable_arttango+set}" = set; then + enableval=$enable_arttango; + if test "$enableval" = yes; then + wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=yes' + else + wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=no' + fi + +else + + wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=${'DEFAULT_wxUSE_ARTPROVIDER_TANGO":-$defaultval}" + +fi + + + eval "$wx_cv_use_arttango" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_ARTPROVIDER_TANGO = no; then result=yes + else + result=no fi else - result=$wxUSE_ANIMATIONCTRL + result=$wxUSE_ARTPROVIDER_TANGO fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9645,10 +10163,10 @@ fi eval "$wx_cv_use_bmpbutton" if test x"$enablestring" = xdisable; then - if test $wxUSE_BMPBUTTON = yes; then - result=no - else + if test $wxUSE_BMPBUTTON = no; then result=yes + else + result=no fi else result=$wxUSE_BMPBUTTON @@ -9689,10 +10207,10 @@ fi eval "$wx_cv_use_bmpcombobox" if test x"$enablestring" = xdisable; then - if test $wxUSE_BITMAPCOMBOBOX = yes; then - result=no - else + if test $wxUSE_BITMAPCOMBOBOX = no; then result=yes + else + result=no fi else result=$wxUSE_BITMAPCOMBOBOX @@ -9733,10 +10251,10 @@ fi eval "$wx_cv_use_button" if test x"$enablestring" = xdisable; then - if test $wxUSE_BUTTON = yes; then - result=no - else + if test $wxUSE_BUTTON = no; then result=yes + else + result=no fi else result=$wxUSE_BUTTON @@ -9777,10 +10295,10 @@ fi eval "$wx_cv_use_calendar" if test x"$enablestring" = xdisable; then - if test $wxUSE_CALCTRL = yes; then - result=no - else + if test $wxUSE_CALCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_CALCTRL @@ -9821,10 +10339,10 @@ fi eval "$wx_cv_use_caret" if test x"$enablestring" = xdisable; then - if test $wxUSE_CARET = yes; then - result=no - else + if test $wxUSE_CARET = no; then result=yes + else + result=no fi else result=$wxUSE_CARET @@ -9865,10 +10383,10 @@ fi eval "$wx_cv_use_checkbox" if test x"$enablestring" = xdisable; then - if test $wxUSE_CHECKBOX = yes; then - result=no - else + if test $wxUSE_CHECKBOX = no; then result=yes + else + result=no fi else result=$wxUSE_CHECKBOX @@ -9909,10 +10427,10 @@ fi eval "$wx_cv_use_checklst" if test x"$enablestring" = xdisable; then - if test $wxUSE_CHECKLST = yes; then - result=no - else + if test $wxUSE_CHECKLST = no; then result=yes + else + result=no fi else result=$wxUSE_CHECKLST @@ -9953,10 +10471,10 @@ fi eval "$wx_cv_use_choice" if test x"$enablestring" = xdisable; then - if test $wxUSE_CHOICE = yes; then - result=no - else + if test $wxUSE_CHOICE = no; then result=yes + else + result=no fi else result=$wxUSE_CHOICE @@ -9997,10 +10515,10 @@ fi eval "$wx_cv_use_choicebook" if test x"$enablestring" = xdisable; then - if test $wxUSE_CHOICEBOOK = yes; then - result=no - else + if test $wxUSE_CHOICEBOOK = no; then result=yes + else + result=no fi else result=$wxUSE_CHOICEBOOK @@ -10041,10 +10559,10 @@ fi eval "$wx_cv_use_collpane" if test x"$enablestring" = xdisable; then - if test $wxUSE_COLLPANE = yes; then - result=no - else + if test $wxUSE_COLLPANE = no; then result=yes + else + result=no fi else result=$wxUSE_COLLPANE @@ -10085,10 +10603,10 @@ fi eval "$wx_cv_use_colourpicker" if test x"$enablestring" = xdisable; then - if test $wxUSE_COLOURPICKERCTRL = yes; then - result=no - else + if test $wxUSE_COLOURPICKERCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_COLOURPICKERCTRL @@ -10129,10 +10647,10 @@ fi eval "$wx_cv_use_combobox" if test x"$enablestring" = xdisable; then - if test $wxUSE_COMBOBOX = yes; then - result=no - else + if test $wxUSE_COMBOBOX = no; then result=yes + else + result=no fi else result=$wxUSE_COMBOBOX @@ -10173,10 +10691,10 @@ fi eval "$wx_cv_use_comboctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_COMBOCTRL = yes; then - result=no - else + if test $wxUSE_COMBOCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_COMBOCTRL @@ -10186,6 +10704,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commandlinkbutton" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-commandlinkbutton... $ECHO_C" >&6; } + # Check whether --enable-commandlinkbutton was given. +if test "${enable_commandlinkbutton+set}" = set; then + enableval=$enable_commandlinkbutton; + if test "$enableval" = yes; then + wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=yes' + else + wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=no' + fi + +else + + wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=${'DEFAULT_wxUSE_COMMANDLINKBUTTON":-$defaultval}" + +fi + + + eval "$wx_cv_use_commandlinkbutton" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_COMMANDLINKBUTTON = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_COMMANDLINKBUTTON + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -10217,10 +10779,10 @@ fi eval "$wx_cv_use_dataviewctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_DATAVIEWCTRL = yes; then - result=no - else + if test $wxUSE_DATAVIEWCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_DATAVIEWCTRL @@ -10261,10 +10823,10 @@ fi eval "$wx_cv_use_datepick" if test x"$enablestring" = xdisable; then - if test $wxUSE_DATEPICKCTRL = yes; then - result=no - else + if test $wxUSE_DATEPICKCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_DATEPICKCTRL @@ -10305,10 +10867,10 @@ fi eval "$wx_cv_use_detect_sm" if test x"$enablestring" = xdisable; then - if test $wxUSE_DETECT_SM = yes; then - result=no - else + if test $wxUSE_DETECT_SM = no; then result=yes + else + result=no fi else result=$wxUSE_DETECT_SM @@ -10349,10 +10911,10 @@ fi eval "$wx_cv_use_dirpicker" if test x"$enablestring" = xdisable; then - if test $wxUSE_DIRPICKERCTRL = yes; then - result=no - else + if test $wxUSE_DIRPICKERCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_DIRPICKERCTRL @@ -10393,10 +10955,10 @@ fi eval "$wx_cv_use_display" if test x"$enablestring" = xdisable; then - if test $wxUSE_DISPLAY = yes; then - result=no - else + if test $wxUSE_DISPLAY = no; then result=yes + else + result=no fi else result=$wxUSE_DISPLAY @@ -10437,10 +10999,10 @@ fi eval "$wx_cv_use_editablebox" if test x"$enablestring" = xdisable; then - if test $wxUSE_EDITABLELISTBOX = yes; then - result=no - else + if test $wxUSE_EDITABLELISTBOX = no; then result=yes + else + result=no fi else result=$wxUSE_EDITABLELISTBOX @@ -10481,10 +11043,10 @@ fi eval "$wx_cv_use_filectrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_FILECTRL = yes; then - result=no - else + if test $wxUSE_FILECTRL = no; then result=yes + else + result=no fi else result=$wxUSE_FILECTRL @@ -10525,10 +11087,10 @@ fi eval "$wx_cv_use_filepicker" if test x"$enablestring" = xdisable; then - if test $wxUSE_FILEPICKERCTRL = yes; then - result=no - else + if test $wxUSE_FILEPICKERCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_FILEPICKERCTRL @@ -10569,10 +11131,10 @@ fi eval "$wx_cv_use_fontpicker" if test x"$enablestring" = xdisable; then - if test $wxUSE_FONTPICKERCTRL = yes; then - result=no - else + if test $wxUSE_FONTPICKERCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_FONTPICKERCTRL @@ -10613,10 +11175,10 @@ fi eval "$wx_cv_use_gauge" if test x"$enablestring" = xdisable; then - if test $wxUSE_GAUGE = yes; then - result=no - else + if test $wxUSE_GAUGE = no; then result=yes + else + result=no fi else result=$wxUSE_GAUGE @@ -10657,10 +11219,10 @@ fi eval "$wx_cv_use_grid" if test x"$enablestring" = xdisable; then - if test $wxUSE_GRID = yes; then - result=no - else + if test $wxUSE_GRID = no; then result=yes + else + result=no fi else result=$wxUSE_GRID @@ -10701,10 +11263,10 @@ fi eval "$wx_cv_use_headerctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_HEADERCTRL = yes; then - result=no - else + if test $wxUSE_HEADERCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_HEADERCTRL @@ -10745,10 +11307,10 @@ fi eval "$wx_cv_use_hyperlink" if test x"$enablestring" = xdisable; then - if test $wxUSE_HYPERLINKCTRL = yes; then - result=no - else + if test $wxUSE_HYPERLINKCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_HYPERLINKCTRL @@ -10789,10 +11351,10 @@ fi eval "$wx_cv_use_imaglist" if test x"$enablestring" = xdisable; then - if test $wxUSE_IMAGLIST = yes; then - result=no - else + if test $wxUSE_IMAGLIST = no; then result=yes + else + result=no fi else result=$wxUSE_IMAGLIST @@ -10802,6 +11364,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-infobar" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-infobar... $ECHO_C" >&6; } + # Check whether --enable-infobar was given. +if test "${enable_infobar+set}" = set; then + enableval=$enable_infobar; + if test "$enableval" = yes; then + wx_cv_use_infobar='wxUSE_INFOBAR=yes' + else + wx_cv_use_infobar='wxUSE_INFOBAR=no' + fi + +else + + wx_cv_use_infobar='wxUSE_INFOBAR=${'DEFAULT_wxUSE_INFOBAR":-$defaultval}" + +fi + + + eval "$wx_cv_use_infobar" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_INFOBAR = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_INFOBAR + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -10833,10 +11439,10 @@ fi eval "$wx_cv_use_listbook" if test x"$enablestring" = xdisable; then - if test $wxUSE_LISTBOOK = yes; then - result=no - else + if test $wxUSE_LISTBOOK = no; then result=yes + else + result=no fi else result=$wxUSE_LISTBOOK @@ -10877,10 +11483,10 @@ fi eval "$wx_cv_use_listbox" if test x"$enablestring" = xdisable; then - if test $wxUSE_LISTBOX = yes; then - result=no - else + if test $wxUSE_LISTBOX = no; then result=yes + else + result=no fi else result=$wxUSE_LISTBOX @@ -10921,10 +11527,10 @@ fi eval "$wx_cv_use_listctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_LISTCTRL = yes; then - result=no - else + if test $wxUSE_LISTCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_LISTCTRL @@ -10965,10 +11571,10 @@ fi eval "$wx_cv_use_notebook" if test x"$enablestring" = xdisable; then - if test $wxUSE_NOTEBOOK = yes; then - result=no - else + if test $wxUSE_NOTEBOOK = no; then result=yes + else + result=no fi else result=$wxUSE_NOTEBOOK @@ -11009,10 +11615,10 @@ fi eval "$wx_cv_use_notifmsg" if test x"$enablestring" = xdisable; then - if test $wxUSE_NOTIFICATION_MESSAGE = yes; then - result=no - else + if test $wxUSE_NOTIFICATION_MESSAGE = no; then result=yes + else + result=no fi else result=$wxUSE_NOTIFICATION_MESSAGE @@ -11053,10 +11659,10 @@ fi eval "$wx_cv_use_odcombobox" if test x"$enablestring" = xdisable; then - if test $wxUSE_ODCOMBOBOX = yes; then - result=no - else + if test $wxUSE_ODCOMBOBOX = no; then result=yes + else + result=no fi else result=$wxUSE_ODCOMBOBOX @@ -11097,10 +11703,10 @@ fi eval "$wx_cv_use_popupwin" if test x"$enablestring" = xdisable; then - if test $wxUSE_POPUPWIN = yes; then - result=no - else + if test $wxUSE_POPUPWIN = no; then result=yes + else + result=no fi else result=$wxUSE_POPUPWIN @@ -11141,10 +11747,10 @@ fi eval "$wx_cv_use_radiobox" if test x"$enablestring" = xdisable; then - if test $wxUSE_RADIOBOX = yes; then - result=no - else + if test $wxUSE_RADIOBOX = no; then result=yes + else + result=no fi else result=$wxUSE_RADIOBOX @@ -11185,10 +11791,10 @@ fi eval "$wx_cv_use_radiobtn" if test x"$enablestring" = xdisable; then - if test $wxUSE_RADIOBTN = yes; then - result=no - else + if test $wxUSE_RADIOBTN = no; then result=yes + else + result=no fi else result=$wxUSE_RADIOBTN @@ -11198,6 +11804,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richmsgdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-richmsgdlg... $ECHO_C" >&6; } + # Check whether --enable-richmsgdlg was given. +if test "${enable_richmsgdlg+set}" = set; then + enableval=$enable_richmsgdlg; + if test "$enableval" = yes; then + wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=yes' + else + wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=no' + fi + +else + + wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=${'DEFAULT_wxUSE_RICHMSGDLG":-$defaultval}" + +fi + + + eval "$wx_cv_use_richmsgdlg" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_RICHMSGDLG = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_RICHMSGDLG + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11229,10 +11879,10 @@ fi eval "$wx_cv_use_rearrangectrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_REARRANGECTRL = yes; then - result=no - else + if test $wxUSE_REARRANGECTRL = no; then result=yes + else + result=no fi else result=$wxUSE_REARRANGECTRL @@ -11273,10 +11923,10 @@ fi eval "$wx_cv_use_sash" if test x"$enablestring" = xdisable; then - if test $wxUSE_SASH = yes; then - result=no - else + if test $wxUSE_SASH = no; then result=yes + else + result=no fi else result=$wxUSE_SASH @@ -11317,10 +11967,10 @@ fi eval "$wx_cv_use_scrollbar" if test x"$enablestring" = xdisable; then - if test $wxUSE_SCROLLBAR = yes; then - result=no - else + if test $wxUSE_SCROLLBAR = no; then result=yes + else + result=no fi else result=$wxUSE_SCROLLBAR @@ -11361,10 +12011,10 @@ fi eval "$wx_cv_use_searchctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_SEARCHCTRL = yes; then - result=no - else + if test $wxUSE_SEARCHCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_SEARCHCTRL @@ -11405,10 +12055,10 @@ fi eval "$wx_cv_use_slider" if test x"$enablestring" = xdisable; then - if test $wxUSE_SLIDER = yes; then - result=no - else + if test $wxUSE_SLIDER = no; then result=yes + else + result=no fi else result=$wxUSE_SLIDER @@ -11449,10 +12099,10 @@ fi eval "$wx_cv_use_spinbtn" if test x"$enablestring" = xdisable; then - if test $wxUSE_SPINBTN = yes; then - result=no - else + if test $wxUSE_SPINBTN = no; then result=yes + else + result=no fi else result=$wxUSE_SPINBTN @@ -11493,10 +12143,10 @@ fi eval "$wx_cv_use_spinctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_SPINCTRL = yes; then - result=no - else + if test $wxUSE_SPINCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_SPINCTRL @@ -11537,10 +12187,10 @@ fi eval "$wx_cv_use_splitter" if test x"$enablestring" = xdisable; then - if test $wxUSE_SPLITTER = yes; then - result=no - else + if test $wxUSE_SPLITTER = no; then result=yes + else + result=no fi else result=$wxUSE_SPLITTER @@ -11581,10 +12231,10 @@ fi eval "$wx_cv_use_statbmp" if test x"$enablestring" = xdisable; then - if test $wxUSE_STATBMP = yes; then - result=no - else + if test $wxUSE_STATBMP = no; then result=yes + else + result=no fi else result=$wxUSE_STATBMP @@ -11625,10 +12275,10 @@ fi eval "$wx_cv_use_statbox" if test x"$enablestring" = xdisable; then - if test $wxUSE_STATBOX = yes; then - result=no - else + if test $wxUSE_STATBOX = no; then result=yes + else + result=no fi else result=$wxUSE_STATBOX @@ -11669,10 +12319,10 @@ fi eval "$wx_cv_use_statline" if test x"$enablestring" = xdisable; then - if test $wxUSE_STATLINE = yes; then - result=no - else + if test $wxUSE_STATLINE = no; then result=yes + else + result=no fi else result=$wxUSE_STATLINE @@ -11713,10 +12363,10 @@ fi eval "$wx_cv_use_stattext" if test x"$enablestring" = xdisable; then - if test $wxUSE_STATTEXT = yes; then - result=no - else + if test $wxUSE_STATTEXT = no; then result=yes + else + result=no fi else result=$wxUSE_STATTEXT @@ -11757,10 +12407,10 @@ fi eval "$wx_cv_use_statusbar" if test x"$enablestring" = xdisable; then - if test $wxUSE_STATUSBAR = yes; then - result=no - else + if test $wxUSE_STATUSBAR = no; then result=yes + else + result=no fi else result=$wxUSE_STATUSBAR @@ -11801,10 +12451,10 @@ fi eval "$wx_cv_use_taskbaricon" if test x"$enablestring" = xdisable; then - if test $wxUSE_TASKBARICON = yes; then - result=no - else + if test $wxUSE_TASKBARICON = no; then result=yes + else + result=no fi else result=$wxUSE_TASKBARICON @@ -11845,10 +12495,10 @@ fi eval "$wx_cv_use_tbarnative" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOOLBAR_NATIVE = yes; then - result=no - else + if test $wxUSE_TOOLBAR_NATIVE = no; then result=yes + else + result=no fi else result=$wxUSE_TOOLBAR_NATIVE @@ -11889,10 +12539,10 @@ fi eval "$wx_cv_use_textctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_TEXTCTRL = yes; then - result=no - else + if test $wxUSE_TEXTCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_TEXTCTRL @@ -11933,10 +12583,10 @@ fi eval "$wx_cv_use_tipwindow" if test x"$enablestring" = xdisable; then - if test $wxUSE_TIPWINDOW = yes; then - result=no - else + if test $wxUSE_TIPWINDOW = no; then result=yes + else + result=no fi else result=$wxUSE_TIPWINDOW @@ -11977,10 +12627,10 @@ fi eval "$wx_cv_use_togglebtn" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOGGLEBTN = yes; then - result=no - else + if test $wxUSE_TOGGLEBTN = no; then result=yes + else + result=no fi else result=$wxUSE_TOGGLEBTN @@ -12021,10 +12671,10 @@ fi eval "$wx_cv_use_toolbar" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOOLBAR = yes; then - result=no - else + if test $wxUSE_TOOLBAR = no; then result=yes + else + result=no fi else result=$wxUSE_TOOLBAR @@ -12065,10 +12715,10 @@ fi eval "$wx_cv_use_toolbook" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOOLBOOK = yes; then - result=no - else + if test $wxUSE_TOOLBOOK = no; then result=yes + else + result=no fi else result=$wxUSE_TOOLBOOK @@ -12109,10 +12759,10 @@ fi eval "$wx_cv_use_treebook" if test x"$enablestring" = xdisable; then - if test $wxUSE_TREEBOOK = yes; then - result=no - else + if test $wxUSE_TREEBOOK = no; then result=yes + else + result=no fi else result=$wxUSE_TREEBOOK @@ -12153,10 +12803,10 @@ fi eval "$wx_cv_use_treectrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_TREECTRL = yes; then - result=no - else + if test $wxUSE_TREECTRL = no; then result=yes + else + result=no fi else result=$wxUSE_TREECTRL @@ -12199,10 +12849,10 @@ fi eval "$wx_cv_use_commondlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_COMMONDLGS = yes; then - result=no - else + if test $wxUSE_COMMONDLGS = no; then result=yes + else + result=no fi else result=$wxUSE_COMMONDLGS @@ -12243,10 +12893,10 @@ fi eval "$wx_cv_use_aboutdlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_ABOUTDLG = yes; then - result=no - else + if test $wxUSE_ABOUTDLG = no; then result=yes + else + result=no fi else result=$wxUSE_ABOUTDLG @@ -12287,10 +12937,10 @@ fi eval "$wx_cv_use_choicedlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_CHOICEDLG = yes; then - result=no - else + if test $wxUSE_CHOICEDLG = no; then result=yes + else + result=no fi else result=$wxUSE_CHOICEDLG @@ -12331,10 +12981,10 @@ fi eval "$wx_cv_use_coldlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_COLOURDLG = yes; then - result=no - else + if test $wxUSE_COLOURDLG = no; then result=yes + else + result=no fi else result=$wxUSE_COLOURDLG @@ -12375,10 +13025,10 @@ fi eval "$wx_cv_use_filedlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_FILEDLG = yes; then - result=no - else + if test $wxUSE_FILEDLG = no; then result=yes + else + result=no fi else result=$wxUSE_FILEDLG @@ -12419,10 +13069,10 @@ fi eval "$wx_cv_use_finddlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_FINDREPLDLG = yes; then - result=no - else + if test $wxUSE_FINDREPLDLG = no; then result=yes + else + result=no fi else result=$wxUSE_FINDREPLDLG @@ -12463,10 +13113,10 @@ fi eval "$wx_cv_use_fontdlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_FONTDLG = yes; then - result=no - else + if test $wxUSE_FONTDLG = no; then result=yes + else + result=no fi else result=$wxUSE_FONTDLG @@ -12507,10 +13157,10 @@ fi eval "$wx_cv_use_dirdlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_DIRDLG = yes; then - result=no - else + if test $wxUSE_DIRDLG = no; then result=yes + else + result=no fi else result=$wxUSE_DIRDLG @@ -12551,10 +13201,10 @@ fi eval "$wx_cv_use_msgdlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_MSGDLG = yes; then - result=no - else + if test $wxUSE_MSGDLG = no; then result=yes + else + result=no fi else result=$wxUSE_MSGDLG @@ -12595,10 +13245,10 @@ fi eval "$wx_cv_use_numberdlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_NUMBERDLG = yes; then - result=no - else + if test $wxUSE_NUMBERDLG = no; then result=yes + else + result=no fi else result=$wxUSE_NUMBERDLG @@ -12639,10 +13289,10 @@ fi eval "$wx_cv_use_splash" if test x"$enablestring" = xdisable; then - if test $wxUSE_SPLASH = yes; then - result=no - else + if test $wxUSE_SPLASH = no; then result=yes + else + result=no fi else result=$wxUSE_SPLASH @@ -12683,10 +13333,10 @@ fi eval "$wx_cv_use_textdlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_TEXTDLG = yes; then - result=no - else + if test $wxUSE_TEXTDLG = no; then result=yes + else + result=no fi else result=$wxUSE_TEXTDLG @@ -12727,10 +13377,10 @@ fi eval "$wx_cv_use_tipdlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_STARTUP_TIPS = yes; then - result=no - else + if test $wxUSE_STARTUP_TIPS = no; then result=yes + else + result=no fi else result=$wxUSE_STARTUP_TIPS @@ -12771,10 +13421,10 @@ fi eval "$wx_cv_use_progressdlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_PROGRESSDLG = yes; then - result=no - else + if test $wxUSE_PROGRESSDLG = no; then result=yes + else + result=no fi else result=$wxUSE_PROGRESSDLG @@ -12815,10 +13465,10 @@ fi eval "$wx_cv_use_wizarddlg" if test x"$enablestring" = xdisable; then - if test $wxUSE_WIZARDDLG = yes; then - result=no - else + if test $wxUSE_WIZARDDLG = no; then result=yes + else + result=no fi else result=$wxUSE_WIZARDDLG @@ -12861,10 +13511,10 @@ fi eval "$wx_cv_use_menus" if test x"$enablestring" = xdisable; then - if test $wxUSE_MENUS = yes; then - result=no - else + if test $wxUSE_MENUS = no; then result=yes + else + result=no fi else result=$wxUSE_MENUS @@ -12905,10 +13555,10 @@ fi eval "$wx_cv_use_miniframe" if test x"$enablestring" = xdisable; then - if test $wxUSE_MINIFRAME = yes; then - result=no - else + if test $wxUSE_MINIFRAME = no; then result=yes + else + result=no fi else result=$wxUSE_MINIFRAME @@ -12949,10 +13599,10 @@ fi eval "$wx_cv_use_tooltips" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOOLTIPS = yes; then - result=no - else + if test $wxUSE_TOOLTIPS = no; then result=yes + else + result=no fi else result=$wxUSE_TOOLTIPS @@ -12993,10 +13643,10 @@ fi eval "$wx_cv_use_splines" if test x"$enablestring" = xdisable; then - if test $wxUSE_SPLINES = yes; then - result=no - else + if test $wxUSE_SPLINES = no; then result=yes + else + result=no fi else result=$wxUSE_SPLINES @@ -13037,10 +13687,10 @@ fi eval "$wx_cv_use_mousewheel" if test x"$enablestring" = xdisable; then - if test $wxUSE_MOUSEWHEEL = yes; then - result=no - else + if test $wxUSE_MOUSEWHEEL = no; then result=yes + else + result=no fi else result=$wxUSE_MOUSEWHEEL @@ -13081,10 +13731,10 @@ fi eval "$wx_cv_use_validators" if test x"$enablestring" = xdisable; then - if test $wxUSE_VALIDATORS = yes; then - result=no - else + if test $wxUSE_VALIDATORS = no; then result=yes + else + result=no fi else result=$wxUSE_VALIDATORS @@ -13125,10 +13775,10 @@ fi eval "$wx_cv_use_busyinfo" if test x"$enablestring" = xdisable; then - if test $wxUSE_BUSYINFO = yes; then - result=no - else + if test $wxUSE_BUSYINFO = no; then result=yes + else + result=no fi else result=$wxUSE_BUSYINFO @@ -13169,10 +13819,10 @@ fi eval "$wx_cv_use_joystick" if test x"$enablestring" = xdisable; then - if test $wxUSE_JOYSTICK = yes; then - result=no - else + if test $wxUSE_JOYSTICK = no; then result=yes + else + result=no fi else result=$wxUSE_JOYSTICK @@ -13213,10 +13863,10 @@ fi eval "$wx_cv_use_metafile" if test x"$enablestring" = xdisable; then - if test $wxUSE_METAFILE = yes; then - result=no - else + if test $wxUSE_METAFILE = no; then result=yes + else + result=no fi else result=$wxUSE_METAFILE @@ -13257,10 +13907,10 @@ fi eval "$wx_cv_use_dragimage" if test x"$enablestring" = xdisable; then - if test $wxUSE_DRAGIMAGE = yes; then - result=no - else + if test $wxUSE_DRAGIMAGE = no; then result=yes + else + result=no fi else result=$wxUSE_DRAGIMAGE @@ -13301,13 +13951,101 @@ fi eval "$wx_cv_use_accessibility" if test x"$enablestring" = xdisable; then - if test $wxUSE_ACCESSIBILITY = yes; then + if test $wxUSE_ACCESSIBILITY = no; then + result=yes + else result=no + fi + else + result=$wxUSE_ACCESSIBILITY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-uiactionsim" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-uiactionsim... $ECHO_C" >&6; } + # Check whether --enable-uiactionsim was given. +if test "${enable_uiactionsim+set}" = set; then + enableval=$enable_uiactionsim; + if test "$enableval" = yes; then + wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=yes' + else + wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=no' + fi + +else + + wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=${'DEFAULT_wxUSE_UIACTIONSIMULATOR":-$defaultval}" + +fi + + + eval "$wx_cv_use_uiactionsim" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_UIACTIONSIMULATOR = no; then + result=yes else + result=no + fi + else + result=$wxUSE_UIACTIONSIMULATOR + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dctransform" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dctransform... $ECHO_C" >&6; } + # Check whether --enable-dctransform was given. +if test "${enable_dctransform+set}" = set; then + enableval=$enable_dctransform; + if test "$enableval" = yes; then + wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=yes' + else + wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=no' + fi + +else + + wx_cv_use_dctransform='wxUSE_DC_TRANSFORM_MATRIX=${'DEFAULT_wxUSE_DC_TRANSFORM_MATRIX":-$defaultval}" + +fi + + + eval "$wx_cv_use_dctransform" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DC_TRANSFORM_MATRIX = no; then result=yes + else + result=no fi else - result=$wxUSE_ACCESSIBILITY + result=$wxUSE_DC_TRANSFORM_MATRIX fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -13347,10 +14085,10 @@ fi eval "$wx_cv_use_palette" if test x"$enablestring" = xdisable; then - if test $wxUSE_PALETTE = yes; then - result=no - else + if test $wxUSE_PALETTE = no; then result=yes + else + result=no fi else result=$wxUSE_PALETTE @@ -13391,10 +14129,10 @@ fi eval "$wx_cv_use_image" if test x"$enablestring" = xdisable; then - if test $wxUSE_IMAGE = yes; then - result=no - else + if test $wxUSE_IMAGE = no; then result=yes + else + result=no fi else result=$wxUSE_IMAGE @@ -13435,10 +14173,10 @@ fi eval "$wx_cv_use_gif" if test x"$enablestring" = xdisable; then - if test $wxUSE_GIF = yes; then - result=no - else + if test $wxUSE_GIF = no; then result=yes + else + result=no fi else result=$wxUSE_GIF @@ -13479,10 +14217,10 @@ fi eval "$wx_cv_use_pcx" if test x"$enablestring" = xdisable; then - if test $wxUSE_PCX = yes; then - result=no - else + if test $wxUSE_PCX = no; then result=yes + else + result=no fi else result=$wxUSE_PCX @@ -13523,10 +14261,10 @@ fi eval "$wx_cv_use_tga" if test x"$enablestring" = xdisable; then - if test $wxUSE_TGA = yes; then - result=no - else + if test $wxUSE_TGA = no; then result=yes + else + result=no fi else result=$wxUSE_TGA @@ -13567,10 +14305,10 @@ fi eval "$wx_cv_use_iff" if test x"$enablestring" = xdisable; then - if test $wxUSE_IFF = yes; then - result=no - else + if test $wxUSE_IFF = no; then result=yes + else + result=no fi else result=$wxUSE_IFF @@ -13611,10 +14349,10 @@ fi eval "$wx_cv_use_pnm" if test x"$enablestring" = xdisable; then - if test $wxUSE_PNM = yes; then - result=no - else + if test $wxUSE_PNM = no; then result=yes + else + result=no fi else result=$wxUSE_PNM @@ -13655,10 +14393,10 @@ fi eval "$wx_cv_use_xpm" if test x"$enablestring" = xdisable; then - if test $wxUSE_XPM = yes; then - result=no - else + if test $wxUSE_XPM = no; then result=yes + else + result=no fi else result=$wxUSE_XPM @@ -13699,10 +14437,10 @@ fi eval "$wx_cv_use_ico_cur" if test x"$enablestring" = xdisable; then - if test $wxUSE_ICO_CUR = yes; then - result=no - else + if test $wxUSE_ICO_CUR = no; then result=yes + else + result=no fi else result=$wxUSE_ICO_CUR @@ -13745,10 +14483,10 @@ fi eval "$wx_cv_use_dccache" if test x"$enablestring" = xdisable; then - if test $wxUSE_DC_CACHEING = yes; then - result=no - else + if test $wxUSE_DC_CACHEING = no; then result=yes + else + result=no fi else result=$wxUSE_DC_CACHEING @@ -13789,10 +14527,10 @@ fi eval "$wx_cv_use_ps_in_msw" if test x"$enablestring" = xdisable; then - if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then - result=no - else + if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = no; then result=yes + else + result=no fi else result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW @@ -13833,10 +14571,10 @@ fi eval "$wx_cv_use_ownerdrawn" if test x"$enablestring" = xdisable; then - if test $wxUSE_OWNER_DRAWN = yes; then - result=no - else + if test $wxUSE_OWNER_DRAWN = no; then result=yes + else + result=no fi else result=$wxUSE_OWNER_DRAWN @@ -13877,10 +14615,10 @@ fi eval "$wx_cv_use_uxtheme" if test x"$enablestring" = xdisable; then - if test $wxUSE_UXTHEME = yes; then - result=no - else + if test $wxUSE_UXTHEME = no; then result=yes + else + result=no fi else result=$wxUSE_UXTHEME @@ -13921,10 +14659,10 @@ fi eval "$wx_cv_use_wxdib" if test x"$enablestring" = xdisable; then - if test $wxUSE_DIB = yes; then - result=no - else + if test $wxUSE_DIB = no; then result=yes + else + result=no fi else result=$wxUSE_DIB @@ -13970,10 +14708,10 @@ fi eval "$wx_cv_use_autoidman" if test x"$enablestring" = xdisable; then - if test $wxUSE_AUTOID_MANAGEMENT = yes; then - result=no - else + if test $wxUSE_AUTOID_MANAGEMENT = no; then result=yes + else + result=no fi else result=$wxUSE_AUTOID_MANAGEMENT @@ -14061,10 +14799,7 @@ fi rm -f confcache 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' @@ -14986,6 +15721,10 @@ 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' @@ -16529,10 +17268,7 @@ fi CXXFLAGS=${CXXFLAGS:=} - - - - ac_ext=cpp +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -16899,6 +17635,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -18107,13 +18847,20 @@ echo "$as_me: error: ar is needed to build wxWidgets" >&2;} fi fi + +if test "$wxUSE_MAC" = 1; then + retest_macosx_linking=no -#if test "$wxUSE_MAC" = 1; then +OSX_ARCH_OPTS="" +if test "x$wxUSE_MAC_ARCH" != xno; then + OSX_ARCH_OPTS="-arch $wxUSE_MAC_ARCH" +fi + if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then # Implicitly turn on the new --with-macosx-sdk using the default - # SDK which provides the behavior this option has always had. + # SDK which provides the behaviour this option has always had. if test "x$wxUSE_MACOSX_SDK" = "x"; then { echo "$as_me:$LINENO: WARNING: Enabling default SDK due to --enable-universal_binary." >&5 echo "$as_me: WARNING: Enabling default SDK due to --enable-universal_binary." >&2;} @@ -18141,19 +18888,27 @@ See \`config.log' for more details." >&2;} echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;} fi fi - OSX_UNIV_OPTS="-arch ppc -arch i386" - CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS" - CFLAGS="$OSX_UNIV_OPTS $CFLAGS" - OBJCXXFLAGS="$OSX_UNIV_OPTS $OBJCXXFLAGS" - OBJCFLAGS="$OSX_UNIV_OPTS $OBJCFLAGS" - LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS" + OSX_ARCH_OPTS="-arch ppc -arch i386" + if test "$wxUSE_OSX_COCOA" = 1; then + OSX_ARCH_OPTS="$OSX_ARCH_OPTS -arch x86_64" + fi + { echo "$as_me:$LINENO: checking for universal binary architectures" >&5 +echo $ECHO_N "checking for universal binary architectures... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: $OSX_ARCH_OPTS" >&5 +echo "${ECHO_T}$OSX_ARCH_OPTS" >&6; } + retest_macosx_linking=yes { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5 echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} bk_use_pch=no fi -#fi + +CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS" +CFLAGS="$OSX_ARCH_OPTS $CFLAGS" +OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS" +OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS" +LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS" if test "x$wxUSE_MACOSX_SDK" = "xno"; then wxUSE_MACOSX_SDK= @@ -18176,10 +18931,7 @@ See \`config.log' for more details." >&2;} { echo "$as_me:$LINENO: result: exists" >&5 echo "${ECHO_T}exists" >&6; } fi - MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" - eval "CC=\"$CC $MACOSX_SDK_OPTS\"" - eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" - eval "LD=\"$LD $MACOSX_SDK_OPTS\"" + MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" retest_macosx_linking=yes fi @@ -18212,14 +18964,114 @@ echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.pl wxUSE_MACOSX_VERSION_MIN= fi elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then - if test "$wxUSE_MAC" = 1; then - # otherwise configure stops on leopard for universal_binary - wxUSE_MACOSX_VERSION_MIN=10.4 + for ac_prog in sw_vers +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_OSX_SW_VERS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$OSX_SW_VERS"; then + ac_cv_prog_OSX_SW_VERS="$OSX_SW_VERS" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OSX_SW_VERS="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +OSX_SW_VERS=$ac_cv_prog_OSX_SW_VERS +if test -n "$OSX_SW_VERS"; then + { echo "$as_me:$LINENO: result: $OSX_SW_VERS" >&5 +echo "${ECHO_T}$OSX_SW_VERS" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$OSX_SW_VERS" && break +done + + if test "$OSX_SW_VERS" != ""; then + OSX_VERSION=`sw_vers -productVersion | grep 10.[0-9]` + else + { echo "$as_me:$LINENO: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&5 +echo "$as_me: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&2;} + OSX_VERSION="10.4" fi + + case "$OSX_VERSION" in + 10.4* ) + wxUSE_MACOSX_VERSION_MIN=10.4 + ;; + + * ) + if test "$wxUSE_OSX_CARBON" = 1; then + # otherwise configure stops on leopard for universal_binary + wxUSE_MACOSX_VERSION_MIN=10.4 + else + # for Cocoa, use 10.5 to be able to compile it in 64 bits too + wxUSE_MACOSX_VERSION_MIN=10.5 + fi + ;; + esac +fi + +NEEDS_GCC40="no" +if test "x$wxUSE_MACOSX_VERSION_MIN" == "x10.4"; then + NEEDS_GCC40="yes" +fi + +if test "$wxUSE_OSX_CARBON" = 1; then + NEEDS_GCC40="yes" +fi + +if test "x$NEEDS_GCC40" == "xyes"; then + # gcc 4.2 cannot compile 10.4 compatible code, so if the user is using it + # and wants 10.4 compatible code, then 'downgrade' to 4.0 + # This is also the simplest way to get 32-bit binaries on Snow Leopard. + if test "x$CC" = "xgcc"; then + CCVERSION=`$CC --version | grep 4.[2-9].` + if test "x$CCVERSION" != "x"; then + echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead." + CC="gcc-4.0" + fi + fi + + if test "x$CXX" = "xg++"; then + CCVERSION=`$CXX --version | grep 4.[2-9].` + if test "x$CCVERSION" != "x"; then + CXX="g++-4.0" + fi + fi +fi + +if test "x$MACOSX_SDK_OPTS" != "x"; then + eval "CC=\"$CC $MACOSX_SDK_OPTS\"" + eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" + eval "LD=\"$LD $MACOSX_SDK_OPTS\"" fi if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then - MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" + if test "$wxUSE_OSX_IPHONE" = 1; then + MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN" + else + MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" + fi eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\"" eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\"" eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\"" @@ -18354,7 +19206,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi - +fi case "${host}" in *-*-darwin* ) @@ -23350,11 +24202,15 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test "$ac_cv_sizeof_wchar_t" != 0; then - wxUSE_WCHAR_T=yes -else - wxUSE_WCHAR_T=no +if test "$ac_cv_sizeof_wchar_t" = 0; then + { { echo "$as_me:$LINENO: error: wxWidgets requires wchar_t support." >&5 +echo "$as_me: error: wxWidgets requires wchar_t support." >&2;} + { (exit 1); exit 1; }; } fi +cat >>confdefs.h <<\_ACEOF +#define wxUSE_WCHAR_T 1 +_ACEOF + { echo "$as_me:$LINENO: checking for va_copy" >&5 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6; } @@ -24130,8 +24986,8 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } if test $ac_cv_c_bigendian = unknown; then - { echo "$as_me:$LINENO: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5 -echo "$as_me: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;} + { echo "$as_me:$LINENO: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5 +echo "$as_me: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;} fi if test $ac_cv_c_bigendian = yes; then cat >>confdefs.h <<\_ACEOF @@ -24365,42 +25221,9 @@ if test "x$SUNCC" = xyes; then fi if test "x$SGICC" = "xyes"; then - CFLAGS="-woff 3970 $CFLAGS" -fi -if test "x$SGICXX" = "xyes"; then - CXXFLAGS="-woff 3970 $CXXFLAGS" -fi - -if test "x$HPCC" = "xyes"; then - CFLAGS="+W 2011,2450 $CFLAGS" -fi -if test "x$HPCXX" = "xyes"; then - CXXFLAGS="+W 2340,4232 $CXXFLAGS" -fi - -if test "x$COMPAQCXX" = "xyes"; then - CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit" -fi - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then - if test "$wxUSE_UNICODE" = "yes"; then - std_string="std::wstring" - char_type="wchar_t" - else - std_string="std::string" - char_type="char" - fi - - { echo "$as_me:$LINENO: checking for $std_string in " >&5 -echo $ECHO_N "checking for $std_string in ... $ECHO_C" >&6; } -if test "${wx_cv_class_stdstring+set}" = set; then + { echo "$as_me:$LINENO: checking if cc version is 7.4.4 or greater" >&5 +echo $ECHO_N "checking if cc version is 7.4.4 or greater... $ECHO_C" >&6; } +if test "${wx_cv_prog_sgicc744+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24410,11 +25233,15 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + int main () { -$std_string foo; + + #if _SGI_COMPILER_VERSION >= 744 + chock me: mipsPro is 7.4.4 or later + #endif + ; return 0; } @@ -24433,15 +25260,15 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_class_stdstring=yes + wx_cv_prog_sgicc744=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_class_stdstring=no + wx_cv_prog_sgicc744=yes fi @@ -24449,47 +25276,41 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wx_cv_class_stdstring" >&5 -echo "${ECHO_T}$wx_cv_class_stdstring" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_prog_sgicc744" >&5 +echo "${ECHO_T}$wx_cv_prog_sgicc744" >&6; } - if test "$wx_cv_class_stdstring" = yes; then - if test "$wxUSE_UNICODE" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STD_WSTRING 1 -_ACEOF - - fi - else - { echo "$as_me:$LINENO: checking if std::basic_string<$char_type> works" >&5 -echo $ECHO_N "checking if std::basic_string<$char_type> works... $ECHO_C" >&6; } -if test "${wx_cv_class_stdbasicstring+set}" = set; then + if test "x$wx_cv_prog_sgicc744" = "xyes"; then + CFLAGS="-woff 3970 $CFLAGS" + fi +fi +if test "x$SGICXX" = "xyes"; then + { echo "$as_me:$LINENO: checking if CC version is 7.4.4 or greater" >&5 +echo $ECHO_N "checking if CC version is 7.4.4 or greater... $ECHO_C" >&6; } +if test "${wx_cv_prog_sgicxx744+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #ifdef HAVE_WCHAR_H - # ifdef __CYGWIN__ - # include - # endif - # include - #endif - #ifdef HAVE_STDLIB_H - # include - #endif - #include - #include - int main () { -std::basic_string<$char_type> foo; - const $char_type* dummy = foo.c_str(); + + #if _SGI_COMPILER_VERSION >= 744 + chock me: mipsPro is 7.4.4 or later + #endif + ; return 0; } @@ -24511,126 +25332,77 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_class_stdbasicstring=yes + wx_cv_prog_sgicxx744=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_class_stdbasicstring=no + wx_cv_prog_sgicxx744=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi -{ echo "$as_me:$LINENO: result: $wx_cv_class_stdbasicstring" >&5 -echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_prog_sgicxx744" >&5 +echo "${ECHO_T}$wx_cv_prog_sgicxx744" >&6; } - if test "$wx_cv_class_stdbasicstring" != yes; then - if test "$wxUSE_STL" = "yes"; then - { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5 -echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;} - { (exit 1); exit 1; }; } - elif test "$wxUSE_STD_STRING" = "yes"; then - { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5 -echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5 -echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;} - wxUSE_STD_STRING=no - fi - fi + if test "x$wx_cv_prog_sgicxx744" = "xyes"; then + CXXFLAGS="-woff 3970 $CXXFLAGS" fi fi -if test "$wxUSE_STD_IOSTREAM" = "yes"; then - { echo "$as_me:$LINENO: checking for std::istream" >&5 -echo $ECHO_N "checking for std::istream... $ECHO_C" >&6; } -if test "${ac_cv_type_std__istream+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 - -typedef std::istream ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_std__istream=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_std__istream=no +if test "x$HPCC" = "xyes"; then + CFLAGS="+W 2011,2450 $CFLAGS" +fi +if test "x$HPCXX" = "xyes"; then + CXXFLAGS="+W 2340,4232 $CXXFLAGS" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test "x$COMPAQCXX" = "xyes"; then + CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit" fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_std__istream" >&5 -echo "${ECHO_T}$ac_cv_type_std__istream" >&6; } -if test $ac_cv_type_std__istream = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_STD__ISTREAM 1 -_ACEOF +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -else - wxUSE_STD_IOSTREAM=no -fi -{ echo "$as_me:$LINENO: checking for std::ostream" >&5 -echo $ECHO_N "checking for std::ostream... $ECHO_C" >&6; } -if test "${ac_cv_type_std__ostream+set}" = set; then +if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then + if test "$wxUSE_UNICODE" = "yes"; then + std_string="std::wstring" + char_type="wchar_t" + else + std_string="std::string" + char_type="char" + fi + + { echo "$as_me:$LINENO: checking for $std_string in " >&5 +echo $ECHO_N "checking for $std_string in ... $ECHO_C" >&6; } +if test "${wx_cv_class_stdstring+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - -typedef std::ostream ac__type_new_; +#include int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; +$std_string foo; ; return 0; } @@ -24652,67 +25424,283 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_std__ostream=yes + wx_cv_class_stdstring=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_std__ostream=no -fi + wx_cv_class_stdstring=no -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_std__ostream" >&5 -echo "${ECHO_T}$ac_cv_type_std__ostream" >&6; } -if test $ac_cv_type_std__ostream = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_STD__OSTREAM 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - wxUSE_STD_IOSTREAM=no fi +{ echo "$as_me:$LINENO: result: $wx_cv_class_stdstring" >&5 +echo "${ECHO_T}$wx_cv_class_stdstring" >&6; } + if test "$wx_cv_class_stdstring" = yes; then + if test "$wxUSE_UNICODE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_WSTRING 1 +_ACEOF - if test "$wxUSE_STD_IOSTREAM" != "yes"; then - if test "$wxUSE_STD_IOSTREAM" = "yes"; then - { { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5 -echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5 -echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;} fi - fi -fi - -if test "$wxUSE_STL" = "yes"; then - { echo "$as_me:$LINENO: checking for basic STL functionality" >&5 -echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6; } -if test "${wx_cv_lib_stl+set}" = set; then + else + { echo "$as_me:$LINENO: checking if std::basic_string<$char_type> works" >&5 +echo $ECHO_N "checking if std::basic_string<$char_type> works... $ECHO_C" >&6; } +if test "${wx_cv_class_stdbasicstring+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - #include - #include - #include - #include + + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #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::basic_string<$char_type> foo; + const $char_type* dummy = foo.c_str(); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_class_stdbasicstring=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_class_stdbasicstring=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_class_stdbasicstring" >&5 +echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6; } + + if test "$wx_cv_class_stdbasicstring" != yes; then + if test "$wxUSE_STL" = "yes"; then + { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5 +echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;} + { (exit 1); exit 1; }; } + elif test "$wxUSE_STD_STRING" = "yes"; then + { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5 +echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5 +echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;} + wxUSE_STD_STRING=no + fi + fi + fi +fi + +if test "$wxUSE_STD_IOSTREAM" = "yes"; then + { echo "$as_me:$LINENO: checking for std::istream" >&5 +echo $ECHO_N "checking for std::istream... $ECHO_C" >&6; } +if test "${ac_cv_type_std__istream+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 + +typedef std::istream ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_std__istream=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_std__istream=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_std__istream" >&5 +echo "${ECHO_T}$ac_cv_type_std__istream" >&6; } +if test $ac_cv_type_std__istream = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STD__ISTREAM 1 +_ACEOF + + +else + wxUSE_STD_IOSTREAM=no +fi +{ echo "$as_me:$LINENO: checking for std::ostream" >&5 +echo $ECHO_N "checking for std::ostream... $ECHO_C" >&6; } +if test "${ac_cv_type_std__ostream+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 + +typedef std::ostream ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_std__ostream=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_std__ostream=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_std__ostream" >&5 +echo "${ECHO_T}$ac_cv_type_std__ostream" >&6; } +if test $ac_cv_type_std__ostream = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STD__OSTREAM 1 +_ACEOF + + +else + wxUSE_STD_IOSTREAM=no +fi + + + if test "$wxUSE_STD_IOSTREAM" != "yes"; then + if test "$wxUSE_STD_IOSTREAM" = "yes"; then + { { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5 +echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5 +echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;} + fi + fi +fi + +if test "$wxUSE_STL" = "yes"; then + { echo "$as_me:$LINENO: checking for basic STL functionality" >&5 +echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6; } +if test "${wx_cv_lib_stl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + #include + #include + #include +int +main () +{ +std::vector moo; + std::list foo; + std::vector::iterator it = + std::find_if(moo.begin(), moo.end(), + std::bind2nd(std::less(), 3)); ; return 0; } @@ -25281,6 +26269,380 @@ fi fi fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } +if test -z "$CXXCPP"; then + if test "${ac_cv_prog_CXXCPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CXXCPP needs to be expanded + for CXXCPP in "$CXX -E" "/lib/cpp" + do + ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CXXCPP=$CXXCPP + +fi + CXXCPP=$ac_cv_prog_CXXCPP +else + ac_cv_prog_CXXCPP=$CXXCPP +fi +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } +ac_preproc_ok=false +for ac_cxx_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +fi + +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + + + +for ac_header in type_traits tr1/type_traits +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ----------------------------------------- ## +## Report this to wx-dev@lists.wxwidgets.org ## +## ----------------------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test -n "$GCC"; then @@ -25366,7 +26728,9 @@ SEARCH_INCLUDE="\ /usr/local/include \ /usr/local/X11/include \ /usr/local/include/X11 \ + /usr/local/X11R7/include \ /usr/local/X11R6/include \ + /usr/local/include/X11R7 \ /usr/local/include/X11R6 \ \ /usr/Motif-2.1/include \ @@ -25378,9 +26742,11 @@ SEARCH_INCLUDE="\ \ /usr/include/Xm \ \ + /usr/X11R7/include \ /usr/X11R6/include \ /usr/X11R6.4/include \ \ + /usr/include/X11R7 \ /usr/include/X11R6 \ \ /usr/X11/include \ @@ -25507,7 +26873,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then if test -z "$x_includes" -o "$x_includes" = NONE; then ac_find_includes= -for ac_dir in $SEARCH_INCLUDE /usr/include; +for ac_dir in $SEARCH_INCLUDE /usr/include do if test -f "$ac_dir/X11/Intrinsic.h"; then ac_find_includes=$ac_dir @@ -25520,7 +26886,7 @@ for ac_dir in $SEARCH_INCLUDE /usr/include; if test -z "$x_libraries" -o "$x_libraries" = NONE; then ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libXt.$ac_extension"; then @@ -26798,9 +28164,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6; } if test "$ac_cv_header_png_h" = "yes"; then - { echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5 -echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; } -if test "${ac_cv_lib_png_png_check_sig+set}" = set; then + { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5 +echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; } +if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26818,11 +28184,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char png_check_sig (); +char png_sig_cmp (); int main () { -return png_check_sig (); +return png_sig_cmp (); ; return 0; } @@ -26845,21 +28211,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_png_png_check_sig=yes + ac_cv_lib_png_png_sig_cmp=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_png_png_check_sig=no + ac_cv_lib_png_png_sig_cmp=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5 -echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; } -if test $ac_cv_lib_png_png_check_sig = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5 +echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6; } +if test $ac_cv_lib_png_png_sig_cmp = yes; then PNG_LINK=" -lpng -lz" fi @@ -27709,19 +29075,6 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead" fi -if test "$wxUSE_WCHAR_T" != "yes"; then - if test "$wxUSE_EXPAT" != "no"; then - { echo "$as_me:$LINENO: WARNING: wxWidgets requires wchar_t to use expat, disabling" >&5 -echo "$as_me: WARNING: wxWidgets requires wchar_t to use expat, disabling" >&2;} - wxUSE_EXPAT=no - fi - if test "$wxUSE_XML" != "no"; then - { echo "$as_me:$LINENO: WARNING: wxWidgets requires wchar_t to use xml, disabling" >&5 -echo "$as_me: WARNING: wxWidgets requires wchar_t to use xml, disabling" >&2;} - wxUSE_XML=no - fi -fi - if test "$wxUSE_EXPAT" != "no"; then wxUSE_XML=yes cat >>confdefs.h <<\_ACEOF @@ -28192,12 +29545,10 @@ fi - case "${host}" in - x86_64-*-mingw32* ) - LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32" - ;; - * ) - LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32" + case "${host}" in + x86_64-*-mingw32* ) + WINDRES_CPU_DEFINE="--define WX_CPU_AMD64" ;; esac if test "$wxUSE_ACCESSIBILITY" = "yes" ; then @@ -28209,10 +29560,10 @@ fi LIBS="$LIBS -lkernel32 -luser32" esac - RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" RESPROGRAMOBJ="\$(PROGRAM)_resources.o" - WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" WIN32INSTALL=win32install @@ -28282,7 +29633,7 @@ if test "$wxUSE_GUI" = "yes"; then WXGTK2= WXGPE= - if test "$wxUSE_COCOA" = 1 ; then + if test "$wxUSE_OLD_COCOA" = 1 ; then if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then { echo "$as_me:$LINENO: WARNING: Printing not supported under wxCocoa yet, disabled" >&5 echo "$as_me: WARNING: Printing not supported under wxCocoa yet, disabled" >&2;} @@ -28651,12 +30002,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ rm -f conf.gtktest - case "${host}" in - *-*-solaris2* ) - if test "$wxUSE_SHARED" != "yes"; then - GTK_LIBS="$GTK_LIBS -lX11" - fi - esac + GTK_LIBS="$GTK_LIBS -lX11" fi if test -z "$wx_cv_lib_gtk"; then @@ -29317,7 +30663,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ wx_cv_lib_gtk=none else wx_cv_cflags_gtk=$GTK_CFLAGS - wx_cv_libs_gtk=`echo $GTK_LIBS | sed -e 's/ -l[^ ]*cairo[^ ]*//g'` + wx_cv_libs_gtk=$GTK_LIBS fi @@ -29364,8 +30710,8 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config CFLAGS="$wx_cv_cflags_gtk $CFLAGS" LIBS="$LIBS $wx_cv_libs_gtk" - { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5 -echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.18" >&5 +echo $ECHO_N "checking if GTK+ is version >= 2.18... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29379,8 +30725,8 @@ int main () { - #if !GTK_CHECK_VERSION(2,10,0) - Not GTK+ 2.10 + #if !GTK_CHECK_VERSION(2,18,0) + Not GTK+ 2.18 #endif ; @@ -29405,6 +30751,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest.$ac_objext; then + cat >>confdefs.h <<\_ACEOF +#define __WXGTK218__ 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF #define __WXGTK210__ 1 _ACEOF @@ -29415,7 +30765,7 @@ _ACEOF { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - ac_wxgtk210=1 + ac_wxgtk218=1 else echo "$as_me: failed program was:" >&5 @@ -29424,15 +30774,15 @@ sed 's/^/| /' conftest.$ac_ext >&5 { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - ac_wxgtk210=0 + ac_wxgtk218=0 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "$ac_wxgtk210" = 0; then - { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5 -echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6; } + if test "$ac_wxgtk218" = 0; then + { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5 +echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29446,8 +30796,8 @@ int main () { - #if !GTK_CHECK_VERSION(2,6,0) - Not GTK+ 2.6 + #if !GTK_CHECK_VERSION(2,10,0) + Not GTK+ 2.10 #endif ; @@ -29472,13 +30822,17 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest.$ac_objext; then + cat >>confdefs.h <<\_ACEOF +#define __WXGTK210__ 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF #define __WXGTK26__ 1 _ACEOF { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - ac_wxgtk26=1 + ac_wxgtk210=1 else echo "$as_me: failed program was:" >&5 @@ -29487,11 +30841,75 @@ sed 's/^/| /' conftest.$ac_ext >&5 { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - ac_wxgtk26=0 + ac_wxgtk210=0 + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test "$ac_wxgtk210" = 0; then + { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5 +echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + #if !GTK_CHECK_VERSION(2,6,0) + Not GTK+ 2.6 + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + + cat >>confdefs.h <<\_ACEOF +#define __WXGTK26__ 1 +_ACEOF + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + ac_wxgtk26=1 + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + ac_wxgtk26=0 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi fi CFLAGS="$save_CFLAGS" @@ -29673,6 +31091,8 @@ done TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY" + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS" + AFMINSTALL=afminstall TOOLKIT=GTK GUIDIST=GTK_DIST @@ -29682,7 +31102,7 @@ done echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libgpewidget.$ac_extension"; then @@ -31877,7 +33297,7 @@ done echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; } ac_find_includes= -for ac_dir in $SEARCH_INCLUDE /usr/include; +for ac_dir in $SEARCH_INCLUDE /usr/include do if test -f "$ac_dir/Xm/Xm.h"; then ac_find_includes=$ac_dir @@ -31972,7 +33392,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libXm.$ac_extension"; then @@ -32376,7 +33796,7 @@ _ACEOF echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libXpm.$ac_extension"; then @@ -32637,22 +34057,30 @@ echo "${ECHO_T}none" >&6; } fi if test "x$wxUSE_UNIX" = "xyes"; then - CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon $CPPFLAGS" + CPPFLAGS="$CPPFLAGS_PASCAL -I/Developer/Headers/FlatCarbon $CPPFLAGS" else - CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS" + CPPFLAGS="$CPPFLAGS_PASCAL -DTARGET_CARBON $CPPFLAGS" fi TOOLKIT=OSX_CARBON GUIDIST=OSX_CARBON_DIST WXBASEPORT="_carbon" + + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__" fi if test "$wxUSE_OSX_COCOA" = 1; then TOOLKIT=OSX_COCOA GUIDIST=OSX_COCOA_DIST + + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__" + fi + + if test "$wxUSE_OSX_IPHONE" = 1; then + TOOLKIT=OSX_IPHONE fi - if test "$wxUSE_COCOA" = 1; then + if test "$wxUSE_OLD_COCOA" = 1; then TOOLKIT=COCOA GUIDIST=COCOA_DIST fi @@ -32893,13 +34321,14 @@ fi +USE_XINERAMA=0 if test "$wxUSE_DISPLAY" = "yes"; then - if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then + if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK1" = 1; then { echo "$as_me:$LINENO: checking for Xinerama" >&5 echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libXinerama.$ac_extension"; then @@ -32926,34 +34355,21 @@ echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; } if test "$ac_path_to_link" != " -L/usr/lib" ; then LDFLAGS="$LDFLAGS $ac_path_to_link" fi + USE_XINERAMA=1 GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama" { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - - { echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5 -echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; } - - ac_find_libraries= - for ac_dir in $SEARCH_LIB; - do - for ac_extension in a so sl dylib dll.a; do - if test -f "$ac_dir/libXxf86vm.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done - done - - if test "$ac_find_libraries" != "" ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -for ac_header in X11/extensions/xf86vmode.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: WARNING: Xinerama not found; disabling wxDisplay" >&5 +echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} + wxUSE_DISPLAY="no" + fi + elif test "$wxUSE_MSW" = 1; then + { echo "$as_me:$LINENO: checking for ddraw.h" >&5 +echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ddraw_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -32962,13 +34378,9 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include - #if HAVE_X11_XLIB_H - #include - #endif - - -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -32987,46 +34399,49 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" + ac_cv_header_ddraw_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + ac_cv_header_ddraw_h=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5 +echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; } - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" + fi fi -done +if test "$wxUSE_DISPLAY" = "yes"; then + if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then + { echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5 +echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi + ac_find_libraries= + for ac_dir in $SEARCH_LIB + do + for ac_extension in a so sl dylib dll.a; do + if test -f "$ac_dir/libXxf86vm.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: WARNING: Xinerama not found; disabling wxDisplay" >&5 -echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} - wxUSE_DISPLAY="no" - fi - elif test "$wxUSE_MSW" = 1; then - { echo "$as_me:$LINENO: checking for ddraw.h" >&5 -echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ddraw_h+set}" = set; then + if test "$ac_find_libraries" != "" ; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +for ac_header in X11/extensions/xf86vmode.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -33035,9 +34450,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include + #if HAVE_X11_XLIB_H + #include + #endif + + +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -33056,30 +34475,44 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_ddraw_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_ddraw_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5 -echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" +fi + +done + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi fi fi if test "$wxUSE_DETECT_SM" = "yes"; then - if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then + if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then { echo "$as_me:$LINENO: checking for -lSM - X11 session management" >&5 echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libSM.$ac_extension"; then @@ -33127,7 +34560,7 @@ USE_OPENGL=0 if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then - if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then + if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then OPENGL_LIBS="-framework OpenGL -framework AGL" elif test "$wxUSE_MSW" = 1; then OPENGL_LIBS="-lopengl32 -lglu32" @@ -33137,7 +34570,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; } ac_find_includes= -for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include; +for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include do if test -f "$ac_dir/GL/gl.h"; then ac_find_includes=$ac_dir @@ -33265,7 +34698,7 @@ if test $ac_cv_header_GL_glu_h = yes; then echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib; + for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libGL.$ac_extension"; then @@ -33300,7 +34733,7 @@ echo "${ECHO_T}found in $ac_find_libraries" >&6; } echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libGLU.$ac_extension"; then @@ -33347,7 +34780,7 @@ echo "${ECHO_T}no" >&6; } echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6; } ac_find_libraries= - for ac_dir in $SEARCH_LIB; + for ac_dir in $SEARCH_LIB do for ac_extension in a so sl dylib dll.a; do if test -f "$ac_dir/libMesaGL.$ac_extension"; then @@ -33400,8 +34833,6 @@ echo "$as_me: WARNING: OpenGL libraries not available, disabling support for Ope wxUSE_OPENGL=no USE_OPENGL=0 fi - else - wxUSE_OPENGL=yes fi else { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 @@ -33409,6 +34840,10 @@ echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be wxUSE_OPENGL="no" fi + if test "$wxUSE_OPENGL" = "auto"; then + wxUSE_OPENGL=yes + fi + if test "$wxUSE_OPENGL" = "yes"; then USE_OPENGL=1 cat >>confdefs.h <<\_ACEOF @@ -33931,16 +35366,16 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" cat <change-install-names #!/bin/sh -libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` +libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` for i in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i} + ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i} for dep in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i} + ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i} done done EOF chmod +x change-install-names - DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib" + DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}" fi HEADER_PAD_OPTION="-headerpad_max_install_names" @@ -33984,15 +35419,6 @@ if test "$wxUSE_UNICODE" = "yes"; then UNICODE=1 fi -lib_debug_suffix= -WX_DEBUGTYPE="release" -DEBUG_FLAG=0 -if test "$wxUSE_DEBUG_FLAG" = "yes"; then - lib_debug_suffix=d - WX_DEBUGTYPE="debug" - DEBUG_FLAG=1 -fi - WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR} WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'` @@ -34001,27 +35427,27 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then DEBUG_INFO=1 fi -WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'` +WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'` -TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" +TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" -TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" +TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" -if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then - WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" +if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then + WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}" else - WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" + WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" fi if test "${TOOLKIT_DIR}" = "os2"; then - WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" + WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" else - WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" + WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}" fi -if test "$wxUSE_COCOA" = 1; then +if test "$wxUSE_OLD_COCOA" = 1; then ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -34748,14 +36174,8 @@ _ACEOF fi -if test "$wxUSE_WCHAR_T" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_WCHAR_T 1 -_ACEOF - - - WCSLEN_FOUND=0 - WCHAR_LINK= +WCSLEN_FOUND=0 +WCHAR_LINK= for ac_func in wcslen do @@ -34851,9 +36271,9 @@ fi done - if test "$WCSLEN_FOUND" = 0; then - if test "$TOOLKIT" = "MSW"; then - { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5 +if test "$WCSLEN_FOUND" = 0; then + if test "$TOOLKIT" = "MSW"; then + { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5 echo $ECHO_N "checking for wcslen in -lmsvcrt... $ECHO_C" >&6; } if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -34918,8 +36338,8 @@ if test $ac_cv_lib_msvcrt_wcslen = yes; then WCHAR_OK=1 fi - else - { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5 + else + { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5 echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6; } if test "${ac_cv_lib_w_wcslen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -34982,27 +36402,28 @@ fi echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6; } if test $ac_cv_lib_w_wcslen = yes; then - WCHAR_LINK=" -lw" - WCSLEN_FOUND=1 + WCHAR_LINK=" -lw" + WCSLEN_FOUND=1 fi - fi fi +fi - if test "$WCSLEN_FOUND" = 1; then - cat >>confdefs.h <<\_ACEOF +if test "$WCSLEN_FOUND" = 1; then + cat >>confdefs.h <<\_ACEOF #define HAVE_WCSLEN 1 _ACEOF - fi +fi -for ac_func in wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp + +for ac_func in wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -35096,11 +36517,11 @@ fi done - if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then - CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" - fi +if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then + CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" +fi - { echo "$as_me:$LINENO: checking for mbstate_t" >&5 +{ echo "$as_me:$LINENO: checking for mbstate_t" >&5 echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; } if test "${ac_cv_type_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -35256,10 +36677,6 @@ done fi -else - { echo "$as_me:$LINENO: WARNING: Wide character support is unavailable" >&5 -echo "$as_me: WARNING: Wide character support is unavailable" >&2;} -fi @@ -38941,6 +40358,10 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} fi ;; + *-*-qnx*) + THREAD_OPTS="" + ;; + *-*-*UnixWare*) if test "x$GCC" != "xyes"; then THREAD_OPTS="-Ethread" @@ -38948,7 +40369,15 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} ;; esac - THREAD_OPTS="$THREAD_OPTS pthread none" + case "${host}" in + *-*-qnx*) + THREAD_OPTS="none pthread" + ;; + + *) + THREAD_OPTS="$THREAD_OPTS pthread none" + ;; + esac THREADS_OK=no for flag in $THREAD_OPTS; do @@ -39038,7 +40467,8 @@ echo "${ECHO_T}$THREADS_OK" >&6; } { echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5 echo "$as_me: WARNING: No thread support on this system... disabled" >&2;} else - LDFLAGS="$THREADS_CFLAGS $LDFLAGS" + LDFLAGS="$THREADS_CFLAGS $LDFLAGS" + WXCONFIG_LDFLAGS="$THREADS_CFLAGS $WXCONFIG_LDFLAGS" LIBS="$THREADS_LINK $LIBS" { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5 @@ -39047,6 +40477,7 @@ echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_ case "${host}" in *-aix*) LDFLAGS="-L/usr/lib/threads $LDFLAGS" + WXCONFIG_LDFLAGS="-L/usr/lib/threads $WXCONFIG_LDFLAGS" flag="-D_THREAD_SAFE" ;; *-freebsd*) @@ -41480,13 +42911,9 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then fi fi -if test "$wxUSE_DEBUG_FLAG" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define WXDEBUG 1 -_ACEOF +if test "$wxUSE_DEBUG_FLAG" = "no" ; then + WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0" - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__" -else if test "$wxUSE_GTK" = 1 ; then if test "x$wxGTK_VERSION" = "x1" ; then CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS" @@ -41521,7 +42948,7 @@ fi if test "$GCC" = "yes" ; then if test "$wxUSE_NO_RTTI" = "yes" ; then - WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-rtti" + WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -DwxNO_RTTI -fno-rtti" fi if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-exceptions" @@ -42191,6 +43618,164 @@ _ACEOF fi +if test "$wxUSE_FSWATCHER" = "yes"; then + if test "$wxUSE_MSW" != "1"; then + if test "$wxUSE_UNIX" = "yes"; then + +for ac_header in sys/inotify.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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + 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 core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_sys_inotify_h" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxHAS_INOTIFY 1 +_ACEOF + + else + +for ac_header in sys/event.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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + 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 core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_sys_event_h" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxHAS_KQUEUE 1 +_ACEOF + + else + wxUSE_FSWATCHER=no + fi + fi + else + wxUSE_FSWATCHER=no + fi + else + if test "$wxUSE_THREADS" != "yes"; then + { echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&5 +echo "$as_me: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&2;} + wxUSE_FSWATCHER=no + fi + fi + + if test "$wxUSE_FSWATCHER" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FSWATCHER 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher" + else + { echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher won't be available on this platform" >&5 +echo "$as_me: WARNING: wxFileSystemWatcher won't be available on this platform" >&2;} + fi +fi + + if test "$wxUSE_STL" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_STL 1 @@ -42205,6 +43790,13 @@ _ACEOF fi +if test "$wxUSE_ANY" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ANY 1 +_ACEOF + +fi + if test "$wxUSE_APPLE_IEEE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_APPLE_IEEE 1 @@ -43145,6 +44737,7 @@ fi { echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5 echo "$as_me: WARNING: libhildon_lgpl not found" >&2;} wxUSE_LIBHILDON="no" + ac_hildon_lgpl=0 elif test $pkg_failed = untried; then @@ -43152,6 +44745,7 @@ elif test $pkg_failed = untried; then { echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5 echo "$as_me: WARNING: libhildon_lgpl not found" >&2;} wxUSE_LIBHILDON="no" + ac_hildon_lgpl=0 else @@ -43167,9 +44761,100 @@ echo "${ECHO_T}yes" >&6; } #define wxUSE_LIBHILDON 1 _ACEOF + ac_hildon_lgpl=1 +fi + + if test "$ac_hildon_lgpl" = 0 ; then + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for HILDON2" >&5 +echo $ECHO_N "checking for HILDON2... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$HILDON2_CFLAGS"; then + pkg_cv_HILDON2_CFLAGS="$HILDON2_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\"") >&5 + ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_HILDON2_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 >= 1.99" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$HILDON2_LIBS"; then + pkg_cv_HILDON2_LIBS="$HILDON2_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\"") >&5 + ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_HILDON2_LIBS=`$PKG_CONFIG --libs "hildon-1 >= 1.99" 2>/dev/null` +else + pkg_failed=yes fi fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + HILDON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 >= 1.99"` + else + HILDON2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 >= 1.99"` + fi + # Put the nasty error message in config.log where it belongs + echo "$HILDON2_PKG_ERRORS" >&5 + + + { echo "$as_me:$LINENO: WARNING: libhildon_1 not found" >&5 +echo "$as_me: WARNING: libhildon_1 not found" >&2;} + wxUSE_LIBHILDON2="no" + + +elif test $pkg_failed = untried; then + + { echo "$as_me:$LINENO: WARNING: libhildon_1 not found" >&5 +echo "$as_me: WARNING: libhildon_1 not found" >&2;} + wxUSE_LIBHILDON2="no" + + +else + HILDON2_CFLAGS=$pkg_cv_HILDON2_CFLAGS + HILDON2_LIBS=$pkg_cv_HILDON2_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + EXTRALIBS_HILDON="$HILDON2_LIBS" + CFLAGS="$CFLAGS $HILDON2_CFLAGS" + CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS" + cat >>confdefs.h <<\_ACEOF +#define wxUSE_LIBHILDON2 1 +_ACEOF + + +fi + fi + fi fi if test "$wxUSE_CMDLINE_PARSER" = "yes"; then @@ -43247,6 +44932,13 @@ _ACEOF fi fi +if test "$wxUSE_FILE_HISTORY" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FILE_HISTORY 1 +_ACEOF + +fi + if test "$wxUSE_FILESYSTEM" = "yes"; then if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then { echo "$as_me:$LINENO: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5 @@ -43334,6 +45026,13 @@ _ACEOF fi +if test "$wxUSE_STD_CONTAINERS" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_STD_CONTAINERS 1 +_ACEOF + +fi + if test "$wxUSE_STD_IOSTREAM" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_STD_IOSTREAM 1 @@ -43348,6 +45047,13 @@ _ACEOF fi +if test "$wxUSE_STD_STRING_CONV_IN_WXSTRING" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1 +_ACEOF + +fi + if test "$wxUSE_STDPATHS" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_STDPATHS 1 @@ -45499,12 +47205,34 @@ _ACEOF fi +if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UIACTIONSIMULATOR 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction" +fi + +if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DC_TRANSFORM_MATRIX 1 +_ACEOF + +fi + USES_CONTROLS=0 if test "$wxUSE_CONTROLS" = "yes"; then USES_CONTROLS=1 fi +if test "$wxUSE_MARKUP" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_MARKUP 1 +_ACEOF + +fi + if test "$wxUSE_ACCEL" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_ACCEL 1 @@ -45581,6 +47309,14 @@ _ACEOF USES_CONTROLS=1 fi +if test "$wxUSE_COMMANDLINKBUTTON" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_COMMANDLINKBUTTON 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_CHOICE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_CHOICE 1 @@ -45739,6 +47475,13 @@ _ACEOF fi +if test "$wxUSE_INFOBAR" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_INFOBAR 1 +_ACEOF + +fi + if test "$wxUSE_LISTBOOK" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_LISTBOOK 1 @@ -45825,6 +47568,13 @@ _ACEOF fi +if test "$wxUSE_RICHMSGDLG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RICHMSGDLG 1 +_ACEOF + +fi + if test "$wxUSE_SASH" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SASH 1 @@ -45947,7 +47697,7 @@ _ACEOF fi if test "$wxUSE_TOGGLEBTN" = "yes"; then - if test "$wxUSE_COCOA" = 1 ; then + if test "$wxUSE_OLD_COCOA" = 1 ; 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 @@ -46030,7 +47780,7 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit fi if test "$wxUSE_POPUPWIN" = "yes"; then - if test "$wxUSE_COCOA" = 1 ; then + if test "$wxUSE_OLD_COCOA" = 1 ; then { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5 echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;} else @@ -46050,7 +47800,7 @@ _ACEOF fi if test "$wxUSE_DIALUP_MANAGER" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then + if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then { echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform... disabled" >&5 echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;} else @@ -46090,6 +47840,30 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" fi +if test "$wxUSE_ARTPROVIDER_STD" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ARTPROVIDER_STD 1 +_ACEOF + +fi + +if test "$wxUSE_ARTPROVIDER_TANGO" = "auto"; then + if test "$wxUSE_GTK" != 1; then + if test "$wxUSE_LIBPNG" != no -a \ + "$wxUSE_IMAGE" = yes -a \ + "$wxUSE_STREAMS" = yes; then + wxUSE_ARTPROVIDER_TANGO="yes" + fi + fi +fi + +if test "$wxUSE_ARTPROVIDER_TANGO" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ARTPROVIDER_TANGO 1 +_ACEOF + +fi + if test "$wxUSE_DRAGIMAGE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_DRAGIMAGE 1 @@ -46189,7 +47963,7 @@ fi CPPFLAGS="$old_CPPFLAGS" - elif test "$wxUSE_COCOA" = 1; then + elif test "$wxUSE_OLD_COCOA" = 1; then cat >>confdefs.h <<\_ACEOF #define wxUSE_WEBKIT 1 _ACEOF @@ -46238,6 +48012,16 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid" fi +USE_RIBBON=0 +if test "$wxUSE_RIBBON" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RIBBON 1 +_ACEOF + + USE_RIBBON=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon" +fi + USE_STC=0 if test "$wxUSE_STC" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -46604,21 +48388,84 @@ fi if test "$wxUSE_MAC" = 1; then - wxUSE_GRAPHICS_CONTEXT="yes" + wxUSE_GRAPHICS_CONTEXT="yes" fi if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_GRAPHICS_CONTEXT 1 + wx_has_graphics=0 + if test "$wxUSE_MSW" = 1; then + { echo "$as_me:$LINENO: checking if GDI+ is available" >&5 +echo $ECHO_N "checking if GDI+ is available... $ECHO_C" >&6; } +if test "${wx_cv_lib_gdiplus+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include +int +main () +{ - elif test "$wxUSE_GTK" != 1; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_GRAPHICS_CONTEXT 1 + using namespace Gdiplus; + + ; + return 0; +} _ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_lib_gdiplus=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - else + wx_cv_lib_gdiplus=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_lib_gdiplus" >&5 +echo "${ECHO_T}$wx_cv_lib_gdiplus" >&6; } + if test "$wx_cv_lib_gdiplus" = "yes"; then + wx_has_graphics=1 + fi + elif test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then pkg_failed=no { echo "$as_me:$LINENO: checking for CAIRO" >&5 @@ -46678,24 +48525,147 @@ fi # Put the nasty error message in config.log where it belongs echo "$CAIRO_PKG_ERRORS" >&5 - { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5 -echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&2;} + { echo "$as_me:$LINENO: WARNING: Cairo library not found" >&5 +echo "$as_me: WARNING: Cairo library not found" >&2;} elif test $pkg_failed = untried; then - { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5 -echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&2;} + { echo "$as_me:$LINENO: WARNING: Cairo library not found" >&5 +echo "$as_me: WARNING: Cairo library not found" >&2;} else CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS CAIRO_LIBS=$pkg_cv_CAIRO_LIBS { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - cat >>confdefs.h <<\_ACEOF -#define wxUSE_GRAPHICS_CONTEXT 1 + wx_has_graphics=1 +fi + if test "$wx_has_graphics" = 1; then + save_LIBS="$LIBS" + LIBS="$LIBS $CAIRO_LIBS" + +for ac_func in cairo_push_group +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + eval "$as_ac_var=no" fi - fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + LIBS="$save_LIBS" + if test "$ac_cv_func_cairo_push_group" = "no"; then + wx_has_graphics=0 + { echo "$as_me:$LINENO: WARNING: Cairo library is too old and misses cairo_push_group()" >&5 +echo "$as_me: WARNING: Cairo library is too old and misses cairo_push_group()" >&2;} + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_CAIRO 1 +_ACEOF + + + if test "$wxUSE_GTK" != 1; then + CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS" + fi + fi + fi + else + wx_has_graphics=1 + fi + + if test "$wx_has_graphics" = 1; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_GRAPHICS_CONTEXT 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: wxGraphicsContext won't be available" >&5 +echo "$as_me: WARNING: wxGraphicsContext won't be available" >&2;} + fi fi @@ -46974,6 +48944,9 @@ if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_PROPGRID" = "yes" ; then BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS" fi + if test "$wxUSE_RIBBON" = "yes" ; then + BUILT_WX_LIBS="ribbon $BUILT_WX_LIBS" + fi if test "$wxUSE_RICHTEXT" = "yes" ; then BUILT_WX_LIBS="richtext $BUILT_WX_LIBS" fi @@ -46992,27 +48965,29 @@ fi - +EXTRA_FRAMEWORKS= if test "$wxUSE_MAC" = 1 ; then - if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then - if test "$USE_DARWIN" = 1; then - LDFLAGS="$LDFLAGS -framework QuickTime" - fi - fi if test "$USE_DARWIN" = 1; then - LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL" + if test "$wxUSE_OSX_IPHONE" = 1; then + EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore" + else + EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" + fi fi fi -if test "$wxUSE_COCOA" = 1 ; then - LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa" +if test "$wxUSE_OLD_COCOA" = 1 ; then + EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa" if test "$wxUSE_MEDIACTRL" = "yes"; then - LDFLAGS="$LDFLAGS -framework QuickTime" + EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime" fi fi -if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then - LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices" +if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then + EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices" fi +LDFLAGS="$LDFLAGS $EXTRA_FRAMEWORKS" +WXCONFIG_LDFLAGS="$WXCONFIG_LDFLAGS $EXTRA_FRAMEWORKS" + LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS" if test "$wxUSE_GUI" = "yes"; then @@ -47028,7 +49003,7 @@ if test "$wxUSE_GUI" = "yes"; then if test "$TOOLKIT" = "MSW"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest" if test "$wxUSE_UNIVERSAL" != "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg dll" fi fi if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then @@ -47144,6 +49119,10 @@ case ".$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" in ;; esac + + if test "$wxUSE_MAC" = 1 ; then + CXXWARNINGS="$CXXWARNINGS -Wno-deprecated-declarations" + fi fi @@ -47177,7 +49156,7 @@ EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_MEDIA="$GST_LIBS" -EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" +EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" if test "$wxUSE_GUI" = "yes"; then EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT` fi @@ -47209,7 +49188,7 @@ if test "$wxUSE_ZLIB" = "builtin" ; then fi for i in $wxconfig_3rdparty ; do - WXCONFIG_LIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS" + WXCONFIG_LIBS="-lwx${i}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS" done @@ -47293,20 +49272,7 @@ fi - -TOOLKIT_LOWERCASE=xxx -if test "$TOOLKIT" = "MAC"; then - TOOLKIT_LOWERCASE=osx_carbon -fi -if test "$TOOLKIT" = "OSX_CARBON"; then - TOOLKIT_LOWERCASE=osx_carbon -fi -if test "$TOOLKIT" = "OSX_COCOA"; then - TOOLKIT_LOWERCASE=osx_cocoa -fi -if test "$TOOLKIT_LOWERCASE" = "xxx"; then - TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'` -fi +TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'` @@ -47334,6 +49300,9 @@ case "$TOOLKIT" in if test "$wxUSE_LIBHILDON" = "yes"; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon" fi + if test "$wxUSE_LIBHILDON2" = "yes"; then + TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon" + fi if test "$TOOLKIT_EXTRA" != ""; then TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`" @@ -48048,7 +50017,10 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; } PLATFORM_BEOS=1 ;; * ) - ;; + { { echo "$as_me:$LINENO: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&5 +echo "$as_me: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&2;} + { (exit 1); exit 1; }; } + ;; esac fi @@ -48319,7 +50291,7 @@ EOF chmod +x shared-ld-sh SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" - SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC" + SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC" { echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5 @@ -48997,7 +50969,7 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;} USE_SOVERLINUX=0 USE_SOVERSOLARIS=0 USE_SOVERCYGWIN=0 - USE_SOSYMLINKS=0 + USE_SOTWOSYMLINKS=0 USE_MACVERSION=0 SONAME_FLAG= @@ -49011,20 +50983,19 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;} fi USE_SOVERSION=1 USE_SOVERLINUX=1 - USE_SOSYMLINKS=1 + USE_SOTWOSYMLINKS=1 ;; *-*-solaris2* ) SONAME_FLAG="-h " USE_SOVERSION=1 USE_SOVERSOLARIS=1 - USE_SOSYMLINKS=1 ;; *-*-darwin* ) USE_MACVERSION=1 USE_SOVERSION=1 - USE_SOSYMLINKS=1 + USE_SOTWOSYMLINKS=1 ;; *-*-cygwin* ) @@ -49427,10 +51398,10 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.2.6" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.9" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9" @@ -49702,6 +51673,11 @@ EOF COND_BUILD_release_UNICODE_1="" fi + COND_DEBUG_FLAG_0="#" + if test "x$DEBUG_FLAG" = "x0" ; then + COND_DEBUG_FLAG_0="" + fi + COND_DEBUG_FLAG_1="#" if test "x$DEBUG_FLAG" = "x1" ; then COND_DEBUG_FLAG_1="" @@ -49777,6 +51753,11 @@ EOF COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="" fi + COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RIBBON" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="" + fi + COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="" @@ -49827,6 +51808,11 @@ EOF COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="" fi + COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RIBBON" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="" + fi + COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="" @@ -49877,6 +51863,11 @@ EOF COND_MONOLITHIC_0_USE_QA_1="" fi + COND_MONOLITHIC_0_USE_RIBBON_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_RIBBON" = "x1" ; then + COND_MONOLITHIC_0_USE_RIBBON_1="" + fi + COND_MONOLITHIC_0_USE_RICHTEXT_1="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then COND_MONOLITHIC_0_USE_RICHTEXT_1="" @@ -49937,6 +51928,11 @@ EOF COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="" fi + COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then + COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="" + fi + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="" @@ -49957,6 +51953,16 @@ EOF COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="" fi + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1="" + fi + + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="" + fi + COND_PLATFORM_MACOSX_1_USE_GUI_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then COND_PLATFORM_MACOSX_1_USE_GUI_1="" @@ -50042,6 +52048,11 @@ EOF COND_PLATFORM_WIN32_1="" fi + COND_PLATFORM_WIN32_1_SHARED_0="#" + if test "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then + COND_PLATFORM_WIN32_1_SHARED_0="" + fi + COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then COND_SHARED_0="" @@ -50257,6 +52268,16 @@ EOF COND_TOOLKIT_OSX_IPHONE="" fi + COND_TOOLKIT_OSX_IPHONE_USE_GUI_1="#" + if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_OSX_IPHONE_USE_GUI_1="" + fi + + COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="" + fi + COND_TOOLKIT_PM="#" if test "x$TOOLKIT" = "xPM" ; then COND_TOOLKIT_PM="" @@ -50307,6 +52328,11 @@ EOF COND_UNICODE_1="" fi + COND_USE_CAIRO_1="#" + if test "x$USE_CAIRO" = "x1" ; then + COND_USE_CAIRO_1="" + fi + COND_USE_EXCEPTIONS_0="#" if test "x$USE_EXCEPTIONS" = "x0" ; then COND_USE_EXCEPTIONS_0="" @@ -50397,9 +52423,9 @@ EOF COND_USE_RTTI_1="" fi - COND_USE_SOSYMLINKS_1="#" - if test "x$USE_SOSYMLINKS" = "x1" ; then - COND_USE_SOSYMLINKS_1="" + COND_USE_SOTWOSYMLINKS_1="#" + if test "x$USE_SOTWOSYMLINKS" = "x1" ; then + COND_USE_SOTWOSYMLINKS_1="" fi COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#" @@ -50417,6 +52443,11 @@ EOF COND_USE_SOVERSION_0="" fi + COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1="#" + if test "x$USE_SOVERSION" = "x1" -a "x$USE_SOVERSOLARIS" = "x1" ; then + COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1="" + fi + COND_USE_SOVERSOLARIS_1="#" if test "x$USE_SOVERSOLARIS" = "x1" ; then COND_USE_SOVERSOLARIS_1="" @@ -50558,7 +52589,7 @@ echo "$as_me: error: Required windres program not found" >&2;} RESCOMP="$WINDRES" fi -if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then +if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_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" @@ -51403,7 +53434,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxWidgets $as_me 2.9.0, which was +This file was extended by wxWidgets $as_me 2.9.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -51456,7 +53487,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.9.0 +wxWidgets config.status 2.9.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -51710,6 +53741,8 @@ CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim ac_ct_CXX!$ac_ct_CXX$ac_delim AR!$AR$ac_delim +OSX_SW_VERS!$OSX_SW_VERS$ac_delim +CXXCPP!$CXXCPP$ac_delim subdirs!$subdirs$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim GTK_CFLAGS!$GTK_CFLAGS$ac_delim @@ -51743,10 +53776,8 @@ GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim HILDON_LIBS!$HILDON_LIBS$ac_delim -PYTHON!$PYTHON$ac_delim -COND_PYTHON!$COND_PYTHON$ac_delim -CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim -CAIRO_LIBS!$CAIRO_LIBS$ac_delim +HILDON2_CFLAGS!$HILDON2_CFLAGS$ac_delim +HILDON2_LIBS!$HILDON2_LIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51788,6 +53819,10 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PYTHON!$PYTHON$ac_delim +COND_PYTHON!$COND_PYTHON$ac_delim +CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim +CAIRO_LIBS!$CAIRO_LIBS$ac_delim GST_CFLAGS!$GST_CFLAGS$ac_delim GST_LIBS!$GST_LIBS$ac_delim ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim @@ -51822,7 +53857,6 @@ EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim UNICODE!$UNICODE$ac_delim -BUILD!$BUILD$ac_delim DEBUG_INFO!$DEBUG_INFO$ac_delim DEBUG_FLAG!$DEBUG_FLAG$ac_delim TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim @@ -51875,16 +53909,13 @@ USE_SOVERLINUX!$USE_SOVERLINUX$ac_delim USE_SOVERSOLARIS!$USE_SOVERSOLARIS$ac_delim USE_SOVERCYGWIN!$USE_SOVERCYGWIN$ac_delim USE_MACVERSION!$USE_MACVERSION$ac_delim -USE_SOSYMLINKS!$USE_SOSYMLINKS$ac_delim +USE_SOTWOSYMLINKS!$USE_SOTWOSYMLINKS$ac_delim SONAME_FLAG!$SONAME_FLAG$ac_delim DEPS_TRACKING!$DEPS_TRACKING$ac_delim BK_DEPS!$BK_DEPS$ac_delim WINDRES!$WINDRES$ac_delim REZ!$REZ$ac_delim SETFILE!$SETFILE$ac_delim -OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim -GCC_PCH!$GCC_PCH$ac_delim -ICC_PCH!$ICC_PCH$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51926,6 +53957,9 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim +GCC_PCH!$GCC_PCH$ac_delim +ICC_PCH!$ICC_PCH$ac_delim ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim @@ -51947,6 +53981,7 @@ COND_BUILD_release!$COND_BUILD_release$ac_delim COND_BUILD_release_DEBUG_INFO_default!$COND_BUILD_release_DEBUG_INFO_default$ac_delim COND_BUILD_release_UNICODE_0!$COND_BUILD_release_UNICODE_0$ac_delim COND_BUILD_release_UNICODE_1!$COND_BUILD_release_UNICODE_1$ac_delim +COND_DEBUG_FLAG_0!$COND_DEBUG_FLAG_0$ac_delim COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim @@ -51962,6 +53997,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim +COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim @@ -51972,6 +54008,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim +COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1!$COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim @@ -51982,6 +54019,7 @@ COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim +COND_MONOLITHIC_0_USE_RIBBON_1!$COND_MONOLITHIC_0_USE_RIBBON_1$ac_delim COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim @@ -51994,10 +54032,13 @@ COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0$ac_delim +COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1$ac_delim +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0$ac_delim COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim COND_PLATFORM_MACOSX_1_USE_OPENGL_1!$COND_PLATFORM_MACOSX_1_USE_OPENGL_1$ac_delim COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim @@ -52013,16 +54054,6 @@ COND_PLATFORM_UNIX_1_TOOLKIT_MGL!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL$ac_delim COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1$ac_delim COND_PLATFORM_UNIX_1_USE_GUI_1!$COND_PLATFORM_UNIX_1_USE_GUI_1$ac_delim COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim -COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim -COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim -COND_SHARED_0!$COND_SHARED_0$ac_delim -COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim -COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim -COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim -COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim -COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim -COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim -COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52064,6 +54095,17 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim +COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim +COND_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_WIN32_1_SHARED_0$ac_delim +COND_SHARED_0!$COND_SHARED_0$ac_delim +COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim +COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim +COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim +COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim +COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim +COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim +COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim @@ -52099,6 +54141,8 @@ COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim +COND_TOOLKIT_OSX_IPHONE_USE_GUI_1!$COND_TOOLKIT_OSX_IPHONE_USE_GUI_1$ac_delim +COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0$ac_delim COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0$ac_delim @@ -52109,6 +54153,7 @@ COND_TOOLKIT_WINCE_WXUNIV_0!$COND_TOOLKIT_WINCE_WXUNIV_0$ac_delim COND_TOOLKIT_X11!$COND_TOOLKIT_X11$ac_delim COND_TOOLKIT_X11_USE_GUI_1!$COND_TOOLKIT_X11_USE_GUI_1$ac_delim COND_UNICODE_1!$COND_UNICODE_1$ac_delim +COND_USE_CAIRO_1!$COND_USE_CAIRO_1$ac_delim COND_USE_EXCEPTIONS_0!$COND_USE_EXCEPTIONS_0$ac_delim COND_USE_EXCEPTIONS_1!$COND_USE_EXCEPTIONS_1$ac_delim COND_USE_GUI_0!$COND_USE_GUI_0$ac_delim @@ -52127,10 +54172,11 @@ COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim COND_USE_RTTI_1!$COND_USE_RTTI_1$ac_delim -COND_USE_SOSYMLINKS_1!$COND_USE_SOSYMLINKS_1$ac_delim +COND_USE_SOTWOSYMLINKS_1!$COND_USE_SOTWOSYMLINKS_1$ac_delim COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim +COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1!$COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1$ac_delim COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim COND_USE_STC_1!$COND_USE_STC_1$ac_delim COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim @@ -52146,21 +54192,6 @@ COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim -COND_wxUSE_EXPAT_builtin!$COND_wxUSE_EXPAT_builtin$ac_delim -COND_wxUSE_LIBJPEG_builtin!$COND_wxUSE_LIBJPEG_builtin$ac_delim -COND_wxUSE_LIBPNG_builtin!$COND_wxUSE_LIBPNG_builtin$ac_delim -COND_wxUSE_LIBTIFF_builtin!$COND_wxUSE_LIBTIFF_builtin$ac_delim -COND_wxUSE_REGEX_builtin!$COND_wxUSE_REGEX_builtin$ac_delim -COND_wxUSE_ZLIB_builtin!$COND_wxUSE_ZLIB_builtin$ac_delim -DEREZ!$DEREZ$ac_delim -SHARED!$SHARED$ac_delim -WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim -WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim -USE_GUI!$USE_GUI$ac_delim -AFMINSTALL!$AFMINSTALL$ac_delim -WIN32INSTALL!$WIN32INSTALL$ac_delim -TOOLKIT!$TOOLKIT$ac_delim -TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52202,6 +54233,21 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_wxUSE_EXPAT_builtin!$COND_wxUSE_EXPAT_builtin$ac_delim +COND_wxUSE_LIBJPEG_builtin!$COND_wxUSE_LIBJPEG_builtin$ac_delim +COND_wxUSE_LIBPNG_builtin!$COND_wxUSE_LIBPNG_builtin$ac_delim +COND_wxUSE_LIBTIFF_builtin!$COND_wxUSE_LIBTIFF_builtin$ac_delim +COND_wxUSE_REGEX_builtin!$COND_wxUSE_REGEX_builtin$ac_delim +COND_wxUSE_ZLIB_builtin!$COND_wxUSE_ZLIB_builtin$ac_delim +DEREZ!$DEREZ$ac_delim +SHARED!$SHARED$ac_delim +WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim +WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim +USE_GUI!$USE_GUI$ac_delim +AFMINSTALL!$AFMINSTALL$ac_delim +WIN32INSTALL!$WIN32INSTALL$ac_delim +TOOLKIT!$TOOLKIT$ac_delim +TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim cross_compiling!$cross_compiling$ac_delim @@ -52210,12 +54256,12 @@ WX_RELEASE!$WX_RELEASE$ac_delim WX_VERSION!$WX_VERSION$ac_delim WX_SUBVERSION!$WX_SUBVERSION$ac_delim WX_CHARTYPE!$WX_CHARTYPE$ac_delim -WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim +WXCONFIG_LDFLAGS!$WXCONFIG_LDFLAGS$ac_delim WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim GUIDIST!$GUIDIST$ac_delim @@ -52240,7 +54286,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -52871,8 +54917,6 @@ echo "Configured wxWidgets ${WX_VERSION} for \`${host}'" echo "" echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_DESC}" echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}" - -echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}" echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}" echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C" if test "$wxUSE_UNICODE" = "yes"; then