X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05622061c9dc8f3382984b0ffe66189705494401..7eae80a04b477d1200af666397cd387cf143ac0b:/configure diff --git a/configure b/configure index 4e7928750b..edbaf0892a 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in 56792 2008-11-16 14:24:13Z VZ . +# From configure.in Id: configure.in 65489 2010-09-09 20:59:10Z VZ . # 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" @@ -661,10 +661,6 @@ host host_cpu host_vendor host_os -target -target_cpu -target_vendor -target_os wx_top_builddir CC CFLAGS @@ -680,6 +676,8 @@ CXX CXXFLAGS ac_ct_CXX AR +OSX_SW_VERS +CXXCPP subdirs PKG_CONFIG GTK_CFLAGS @@ -701,6 +699,7 @@ PANGOXFT_LIBS CFLAGS_VISIBILITY CXXFLAGS_VISIBILITY LIBICONV +GXX_VERSION SDL_CONFIG SDL_CFLAGS SDL_LIBS @@ -712,6 +711,10 @@ GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS +HILDON2_CFLAGS +HILDON2_LIBS +PYTHON +COND_PYTHON CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS @@ -748,13 +751,14 @@ EXTRALIBS_GNOMEPRINT EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON UNICODE -BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION +DYLIB_RPATH_INSTALL +DYLIB_RPATH_POSTLINK SAMPLES_RPATH_FLAG -SAMPLES_RPATH_POSTLINK +HEADER_PAD_OPTION HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS @@ -799,7 +803,7 @@ USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION -USE_SOSYMLINKS +USE_SOTWOSYMLINKS SONAME_FLAG DEPS_TRACKING BK_DEPS @@ -830,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 @@ -845,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 @@ -855,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 @@ -865,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 @@ -877,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 @@ -898,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 @@ -938,11 +950,11 @@ COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_OSX_CARBON COND_TOOLKIT_OSX_CARBON_USE_GUI_1 -COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_OSX_COCOA COND_TOOLKIT_OSX_COCOA_USE_GUI_1 -COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0 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 @@ -953,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 @@ -971,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 @@ -1013,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 @@ -1054,6 +1068,7 @@ CPP CXX CXXFLAGS CCC +CXXCPP PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS @@ -1072,6 +1087,8 @@ GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS +HILDON2_CFLAGS +HILDON2_LIBS CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS @@ -1579,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]... @@ -1643,13 +1660,12 @@ X features: System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] _ACEOF 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 @@ -1666,8 +1682,13 @@ 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-std_iostreams use standard C++ stream classes --enable-std_string use standard C++ string classes @@ -1677,24 +1698,21 @@ Optional Features: --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 --enable-objc_uniquifying enable Objective-C class name uniquifying --disable-visibility disable use of ELF symbols visibility even if supported + --disable-tls disable use of compiler TLS support --enable-intl use internationalization system --enable-xlocale use x-locale support (requires wxLocale) --enable-config use wxConfig (and derived) classes @@ -1710,6 +1728,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 @@ -1724,12 +1743,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 @@ -1763,6 +1784,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 @@ -1774,19 +1796,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-accel use accelerators --enable-animatectrl use wxAnimationCtrl class - --enable-button use wxButton class --enable-bmpbutton use wxBitmapButton class --enable-bmpcombobox use wxBitmapComboBox class + --enable-button use wxButton class --enable-calendar use wxCalendarCtrl class --enable-caret use wxCaret class --enable-checkbox use wxCheckBox class @@ -1797,27 +1819,33 @@ 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 --enable-dirpicker use wxDirPickerCtrl class --enable-display use wxDisplay class - --enable-detect_sm use code to detect X11 session manager --enable-editablebox use wxEditableListBox class - --enable-filepicker use wxFilePickerCtrl class --enable-filectrl use wxFileCtrl class + --enable-filepicker use wxFilePickerCtrl class --enable-fontpicker use wxFontPickerCtrl class --enable-gauge use wxGauge class --enable-grid use wxGrid class - --enable-dataviewctrl use wxDataViewCtrl class + --enable-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 --enable-notebook use wxNotebook class --enable-notifmsg use wxNotificationMessage class --enable-odcombobox use wxOwnerDrawnComboBox class + --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 --enable-searchctrl use wxSearchCtrl class @@ -1830,17 +1858,15 @@ Optional Features: --enable-statline use wxStaticLine class --enable-stattext use wxStaticText class --enable-statusbar use wxStatusBar class - --enable-tabdialog use wxTabControl class --enable-taskbaricon use wxTaskBarIcon class + --enable-tbarnative use native wxToolBar class --enable-textctrl use wxTextCtrl class + --enable-tipwindow use wxTipWindow class --enable-togglebtn use wxToggleButton class --enable-toolbar use wxToolBar class - --enable-tbarnative use native wxToolBar class - --enable-treebook use wxTreebook class --enable-toolbook use wxToolbook class + --enable-treebook use wxTreebook class --enable-treectrl use wxTreeCtrl class - --enable-tipwindow use wxTipWindow class - --enable-popupwin use wxPopUpWindow class --enable-commondlg use all common dialogs --enable-aboutdlg use wxAboutBox --enable-choicedlg use wxChoiceDialog @@ -1867,6 +1893,7 @@ Optional Features: --enable-metafiles use wxMetaFile (Win32 only) --enable-dragimage use wxDragImage --enable-accessibility enable accessibility support + --enable-uiactionsim use wxUIActionSimulator (experimental) --enable-palette use wxPalette class --enable-image use wxImage class --enable-gif use gif images (GIF file format) @@ -1903,8 +1930,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 +1953,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 +1982,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 +2015,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 +2089,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 +2103,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 $@ @@ -2536,55 +2573,19 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6; } -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host + +if test "$cross_compiling" != "no"; then + HOST_PREFIX="${host_alias}-" + HOST_SUFFIX="-$host_alias" else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } + HOST_PREFIX= + HOST_SUFFIX= fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - - 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 @@ -2621,12 +2622,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 @@ -2635,10 +2637,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 @@ -2649,7 +2652,8 @@ DEFAULT_DEFAULT_wxUSE_DFB=0 PROGRAM_EXT= SAMPLES_RPATH_FLAG= -SAMPLES_RPATH_POSTLINK= +DYLIB_RPATH_INSTALL= +DYLIB_RPATH_POSTLINK= DEFAULT_STD_FLAG=yes @@ -2706,6 +2710,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 @@ -2902,6 +2914,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 @@ -2918,13 +2944,6 @@ _ACEOF _ACEOF DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1 - DEFAULT_STD_FLAG=no - ;; - powerpc-apple-macos* ) - USE_UNIX=0 - ac_cv_c_bigendian=yes - DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1 - DEFAULT_STD_FLAG=no ;; *-*-beos* ) @@ -2955,21 +2974,23 @@ 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_OPENGL=no DEFAULT_wxUSE_ACCESSIBILITY=no -DEFAULT_wxUSE_GRAPHICS_CONTEXT=no DEFAULT_wxUSE_IPV6=no -DEFAULT_wxUSE_MEDIACTRL=no -DEFAULT_wxUSE_TAB_DIALOG=no DEFAULT_wxUSE_GSTREAMER8=no DEFAULT_wxUSE_UNICODE_UTF8=auto +DEFAULT_wxUSE_OPENGL=auto +DEFAULT_wxUSE_MEDIACTRL=auto +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 @@ -3012,10 +3033,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 @@ -3056,10 +3077,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 @@ -3100,10 +3121,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 @@ -3194,10 +3215,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 @@ -3247,10 +3268,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 @@ -3260,6 +3281,10 @@ fi echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_ALL_FEATURES" = "no"; then + DEFAULT_wxUSE_MEDIACTRL=no +fi + if test "$wxUSE_GUI" = "yes"; then @@ -3295,10 +3320,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 @@ -3341,15 +3366,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 @@ -3426,10 +3481,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 @@ -3476,10 +3531,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 @@ -3535,8 +3590,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 @@ -3561,8 +3616,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 @@ -3585,7 +3642,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 @@ -4355,6 +4414,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= @@ -4366,34 +4468,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 @@ -4410,34 +4602,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 @@ -4475,10 +4757,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 @@ -4519,10 +4801,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 @@ -4563,10 +4845,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 @@ -4607,10 +4889,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 @@ -4651,10 +4933,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 @@ -4716,10 +4998,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 @@ -4760,10 +5042,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 @@ -4806,126 +5088,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 @@ -4960,151 +5134,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= @@ -5137,10 +5179,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 @@ -5181,10 +5223,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 @@ -5225,10 +5267,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 @@ -5269,10 +5311,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 @@ -5313,10 +5355,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 @@ -5357,10 +5399,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 @@ -5370,6 +5412,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; } @@ -5391,6 +5434,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= @@ -5423,10 +5487,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 @@ -5467,10 +5531,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 @@ -5512,10 +5576,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 @@ -5557,10 +5621,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 @@ -5602,10 +5666,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 @@ -5615,6 +5679,50 @@ fi 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}-tls" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tls... $ECHO_C" >&6; } + # Check whether --enable-tls was given. +if test "${enable_tls+set}" = set; then + enableval=$enable_tls; + if test "$enableval" = yes; then + wx_cv_use_tls='wxUSE_COMPILER_TLS=yes' + else + wx_cv_use_tls='wxUSE_COMPILER_TLS=no' + fi + +else + + wx_cv_use_tls='wxUSE_COMPILER_TLS=${'DEFAULT_wxUSE_COMPILER_TLS":-$defaultval}" + +fi + + + eval "$wx_cv_use_tls" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_COMPILER_TLS = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_COMPILER_TLS + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= @@ -5648,10 +5756,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 @@ -5692,10 +5800,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 @@ -5736,10 +5844,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 @@ -5781,10 +5889,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 @@ -5825,10 +5933,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 @@ -5869,10 +5977,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 @@ -5913,10 +6021,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 @@ -5957,10 +6065,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 @@ -6001,10 +6109,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 @@ -6045,10 +6153,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 @@ -6089,10 +6197,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 @@ -6134,10 +6242,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 @@ -6179,10 +6287,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 @@ -6223,10 +6331,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 @@ -6267,10 +6375,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 @@ -6281,6 +6389,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 @@ -6312,10 +6464,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 @@ -6356,10 +6508,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 @@ -6400,10 +6552,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 @@ -6444,10 +6596,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 @@ -6488,10 +6640,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 @@ -6532,10 +6684,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 @@ -6576,10 +6728,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 @@ -6620,10 +6772,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 @@ -6664,10 +6816,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 @@ -6708,10 +6860,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 @@ -6752,10 +6904,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 @@ -6796,10 +6948,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 @@ -6840,10 +6992,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 @@ -6884,10 +7036,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 @@ -6897,6 +7049,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 @@ -6928,10 +7124,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 @@ -6972,10 +7168,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 @@ -7016,10 +7212,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 @@ -7060,10 +7256,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 @@ -7104,10 +7300,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 @@ -7148,10 +7344,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 @@ -7161,6 +7357,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 @@ -7192,10 +7432,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 @@ -7236,10 +7476,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 @@ -7280,10 +7520,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 @@ -7324,10 +7564,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 @@ -7368,10 +7608,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 @@ -7412,10 +7652,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 @@ -7456,10 +7696,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 @@ -7500,10 +7740,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 @@ -7544,10 +7784,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 @@ -7588,10 +7828,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 @@ -7611,31 +7851,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 @@ -7676,10 +7916,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 @@ -7720,10 +7960,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 @@ -7764,10 +8004,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 @@ -7808,10 +8048,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 @@ -7852,10 +8092,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 @@ -7896,10 +8136,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 @@ -7941,10 +8181,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 @@ -7985,10 +8225,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 @@ -8029,10 +8269,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 @@ -8073,10 +8313,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 @@ -8117,10 +8357,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 @@ -8162,10 +8402,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 @@ -8207,10 +8447,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 @@ -8251,10 +8491,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 @@ -8299,10 +8539,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 @@ -8343,10 +8583,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 @@ -8387,10 +8627,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 @@ -8431,10 +8671,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 @@ -8475,10 +8715,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 @@ -8519,10 +8759,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 @@ -8563,10 +8803,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 @@ -8607,10 +8847,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 @@ -8620,6 +8860,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 @@ -8651,10 +8935,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 @@ -8695,10 +8979,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 @@ -8739,10 +9023,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 @@ -8783,10 +9067,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 @@ -8827,10 +9111,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 @@ -8871,10 +9155,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 @@ -8915,10 +9199,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 @@ -8959,10 +9243,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 @@ -9003,10 +9287,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 @@ -9047,10 +9331,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 @@ -9091,10 +9375,10 @@ 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 + else + result=no fi else result=$wxUSE_RICHTEXT @@ -9114,34 +9398,34 @@ echo "${ECHO_T}$result" >&6; } 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; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; } + # Check whether --enable-postscript was given. +if test "${enable_postscript+set}" = set; then + enableval=$enable_postscript; if test "$enableval" = yes; then - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' + wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes' else - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' + wx_cv_use_postscript='wxUSE_POSTSCRIPT=no' fi else - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" + wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" fi - eval "$wx_cv_use_graphics_ctx" + eval "$wx_cv_use_postscript" if test x"$enablestring" = xdisable; then - if test $wxUSE_GRAPHICS_CONTEXT = yes; then - result=no - else + if test $wxUSE_POSTSCRIPT = no; then result=yes + else + result=no fi else - result=$wxUSE_GRAPHICS_CONTEXT + result=$wxUSE_POSTSCRIPT fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9158,34 +9442,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; } - # Check whether --enable-postscript was given. -if test "${enable_postscript+set}" = set; then - enableval=$enable_postscript; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; } + # Check whether --enable-printarch was given. +if test "${enable_printarch+set}" = set; then + enableval=$enable_printarch; if test "$enableval" = yes; then - wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes' + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' else - wx_cv_use_postscript='wxUSE_POSTSCRIPT=no' + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' fi else - wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" fi - eval "$wx_cv_use_postscript" + eval "$wx_cv_use_printarch" if test x"$enablestring" = xdisable; then - if test $wxUSE_POSTSCRIPT = yes; then - result=no - else + if test $wxUSE_PRINTING_ARCHITECTURE = no; then result=yes + else + result=no fi else - result=$wxUSE_POSTSCRIPT + result=$wxUSE_PRINTING_ARCHITECTURE fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9202,40 +9486,42 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; } - # Check whether --enable-printarch was given. -if test "${enable_printarch+set}" = set; then - enableval=$enable_printarch; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-svg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; } + # Check whether --enable-svg was given. +if test "${enable_svg+set}" = set; then + enableval=$enable_svg; if test "$enableval" = yes; then - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' + wx_cv_use_svg='wxUSE_SVG=yes' else - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' + wx_cv_use_svg='wxUSE_SVG=no' fi else - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" + wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" fi - eval "$wx_cv_use_printarch" + eval "$wx_cv_use_svg" if test x"$enablestring" = xdisable; then - if test $wxUSE_PRINTING_ARCHITECTURE = yes; then - result=no - else + if test $wxUSE_SVG = no; then result=yes + else + result=no fi else - result=$wxUSE_PRINTING_ARCHITECTURE + result=$wxUSE_SVG fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_MAC" != 1; then + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -9246,39 +9532,40 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-svg" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; } - # Check whether --enable-svg was given. -if test "${enable_svg+set}" = set; then - enableval=$enable_svg; + { 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_svg='wxUSE_SVG=yes' + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' else - wx_cv_use_svg='wxUSE_SVG=no' + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' fi else - wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" fi - eval "$wx_cv_use_svg" + eval "$wx_cv_use_graphics_ctx" if test x"$enablestring" = xdisable; then - if test $wxUSE_SVG = yes; then - result=no - else + if test $wxUSE_GRAPHICS_CONTEXT = no; then result=yes + else + result=no fi else - result=$wxUSE_SVG + result=$wxUSE_GRAPHICS_CONTEXT fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } +fi @@ -9313,10 +9600,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 @@ -9357,10 +9644,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 @@ -9401,10 +9688,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 @@ -9448,10 +9735,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 @@ -9461,114 +9748,63 @@ fi echo "${ECHO_T}$result" >&6; } -if test "$wxUSE_CONTROLS" = "yes"; then - DEFAULT_wxUSE_ACCEL=yes - DEFAULT_wxUSE_ANIMATIONCTRL=yes - DEFAULT_wxUSE_BMPBUTTON=yes - DEFAULT_wxUSE_BUTTON=yes - DEFAULT_wxUSE_CALCTRL=yes - DEFAULT_wxUSE_CARET=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_CHECKBOX=yes - DEFAULT_wxUSE_CHECKLISTBOX=yes - DEFAULT_wxUSE_CHOICE=yes - DEFAULT_wxUSE_CHOICEBOOK=yes - DEFAULT_wxUSE_COLLPANE=yes - DEFAULT_wxUSE_COLOURPICKERCTRL=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_DATEPICKCTRL=yes - DEFAULT_wxUSE_DISPLAY=yes - DEFAULT_wxUSE_DETECT_SM=yes - DEFAULT_wxUSE_DIRPICKERCTRL=yes - DEFAULT_wxUSE_FILECTRL=yes - DEFAULT_wxUSE_FILEPICKERCTRL=yes - DEFAULT_wxUSE_FONTPICKERCTRL=yes - DEFAULT_wxUSE_GAUGE=yes - DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_HYPERLINKCTRL=yes - DEFAULT_wxUSE_DATAVIEWCTRL=yes - DEFAULT_wxUSE_IMAGLIST=yes - DEFAULT_wxUSE_LISTBOOK=yes - DEFAULT_wxUSE_LISTBOX=yes - DEFAULT_wxUSE_LISTCTRL=yes - DEFAULT_wxUSE_NOTEBOOK=yes - DEFAULT_wxUSE_RADIOBOX=yes - DEFAULT_wxUSE_RADIOBTN=yes - DEFAULT_wxUSE_SASH=yes - DEFAULT_wxUSE_SCROLLBAR=yes - DEFAULT_wxUSE_SEARCHCTRL=yes - DEFAULT_wxUSE_SLIDER=yes - DEFAULT_wxUSE_SPINBTN=yes - DEFAULT_wxUSE_SPINCTRL=yes - DEFAULT_wxUSE_SPLITTER=yes - DEFAULT_wxUSE_STATBMP=yes - DEFAULT_wxUSE_STATBOX=yes - DEFAULT_wxUSE_STATLINE=yes - DEFAULT_wxUSE_STATUSBAR=yes - DEFAULT_wxUSE_TAB_DIALOG=yes - DEFAULT_wxUSE_TOGGLEBTN=yes - DEFAULT_wxUSE_TOOLBAR=yes - DEFAULT_wxUSE_TOOLBAR_NATIVE=yes - DEFAULT_wxUSE_TOOLTIPS=yes - DEFAULT_wxUSE_TREEBOOK=yes - DEFAULT_wxUSE_TOOLBOOK=yes - DEFAULT_wxUSE_TREECTRL=yes - DEFAULT_wxUSE_POPUPWIN=yes - DEFAULT_wxUSE_TIPWINDOW=yes -elif test "$wxUSE_CONTROLS" = "no"; then - DEFAULT_wxUSE_ACCEL=no - DEFAULT_wxUSE_ANIMATIONCTRL=no - DEFAULT_wxUSE_BMPBUTTON=no - DEFAULT_wxUSE_BUTTON=no - DEFAULT_wxUSE_CALCTRL=no - DEFAULT_wxUSE_CARET=no - DEFAULT_wxUSE_COLLPANE=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_CHECKBOX=no - DEFAULT_wxUSE_CHECKLISTBOX=no - DEFAULT_wxUSE_CHOICE=no - DEFAULT_wxUSE_CHOICEBOOK=no - DEFAULT_wxUSE_COLOURPICKERCTRL=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_DATEPICKCTRL=no - DEFAULT_wxUSE_DISPLAY=no - DEFAULT_wxUSE_DETECT_SM=no - DEFAULT_wxUSE_DIRPICKERCTRL=no - DEFAULT_wxUSE_FILECTRL=no - DEFAULT_wxUSE_FILEPICKERCTRL=no - DEFAULT_wxUSE_FONTPICKERCTRL=no - DEFAULT_wxUSE_GAUGE=no - DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_HYPERLINKCTRL=no - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=no - DEFAULT_wxUSE_LISTBOOK=no - DEFAULT_wxUSE_LISTBOX=no - DEFAULT_wxUSE_LISTCTRL=no - DEFAULT_wxUSE_NOTEBOOK=no - DEFAULT_wxUSE_RADIOBOX=no - DEFAULT_wxUSE_RADIOBTN=no - DEFAULT_wxUSE_SASH=no - DEFAULT_wxUSE_SCROLLBAR=no - DEFAULT_wxUSE_SEARCHCTRL=no - DEFAULT_wxUSE_SLIDER=no - DEFAULT_wxUSE_SPINBTN=no - DEFAULT_wxUSE_SPINCTRL=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_STATBMP=no - DEFAULT_wxUSE_STATBOX=no - DEFAULT_wxUSE_STATLINE=no - DEFAULT_wxUSE_STATUSBAR=no - DEFAULT_wxUSE_TAB_DIALOG=no - DEFAULT_wxUSE_TOGGLEBTN=no - DEFAULT_wxUSE_TOOLBAR=no - DEFAULT_wxUSE_TOOLBAR_NATIVE=no - DEFAULT_wxUSE_TOOLTIPS=no - DEFAULT_wxUSE_TREEBOOK=no - DEFAULT_wxUSE_TOOLBOOK=no - DEFAULT_wxUSE_TREECTRL=no - DEFAULT_wxUSE_POPUPWIN=no - DEFAULT_wxUSE_TIPWINDOW=no +if test "$wxUSE_CONTROLS" = "no"; then + DEFAULT_wxUSE_ACCEL=no + DEFAULT_wxUSE_ANIMATIONCTRL=no + DEFAULT_wxUSE_BMPBUTTON=no + DEFAULT_wxUSE_BUTTON=no + DEFAULT_wxUSE_CALCTRL=no + DEFAULT_wxUSE_CARET=no + DEFAULT_wxUSE_CHECKBOX=no + DEFAULT_wxUSE_CHECKLISTBOX=no + DEFAULT_wxUSE_CHOICE=no + DEFAULT_wxUSE_CHOICEBOOK=no + DEFAULT_wxUSE_COLLPANE=no + 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 + DEFAULT_wxUSE_DIRPICKERCTRL=no + DEFAULT_wxUSE_DISPLAY=no + DEFAULT_wxUSE_FILECTRL=no + DEFAULT_wxUSE_FILEPICKERCTRL=no + DEFAULT_wxUSE_FONTPICKERCTRL=no + DEFAULT_wxUSE_GAUGE=no + DEFAULT_wxUSE_GRID=no + DEFAULT_wxUSE_HEADERCTRL=no + DEFAULT_wxUSE_HYPERLINKCTRL=no + DEFAULT_wxUSE_IMAGLIST=no + DEFAULT_wxUSE_LISTBOOK=no + DEFAULT_wxUSE_LISTBOX=no + DEFAULT_wxUSE_LISTCTRL=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 + DEFAULT_wxUSE_SEARCHCTRL=no + DEFAULT_wxUSE_SLIDER=no + DEFAULT_wxUSE_SPINBTN=no + DEFAULT_wxUSE_SPINCTRL=no + DEFAULT_wxUSE_SPLITTER=no + DEFAULT_wxUSE_STATBMP=no + DEFAULT_wxUSE_STATBOX=no + DEFAULT_wxUSE_STATLINE=no + DEFAULT_wxUSE_STATUSBAR=no + DEFAULT_wxUSE_TIPWINDOW=no + DEFAULT_wxUSE_TOGGLEBTN=no + DEFAULT_wxUSE_TOOLBAR=no + DEFAULT_wxUSE_TOOLBAR_NATIVE=no + DEFAULT_wxUSE_TOOLBOOK=no + DEFAULT_wxUSE_TOOLTIPS=no + DEFAULT_wxUSE_TREEBOOK=no + DEFAULT_wxUSE_TREECTRL=no fi @@ -9603,10 +9839,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 @@ -9647,10 +9883,10 @@ fi eval "$wx_cv_use_animatectrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_ANIMATIONCTRL = yes; then - result=no - else + if test $wxUSE_ANIMATIONCTRL = no; then result=yes + else + result=no fi else result=$wxUSE_ANIMATIONCTRL @@ -9670,34 +9906,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; } - # Check whether --enable-button was given. -if test "${enable_button+set}" = set; then - enableval=$enable_button; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; } + # Check whether --enable-bmpbutton was given. +if test "${enable_bmpbutton+set}" = set; then + enableval=$enable_bmpbutton; if test "$enableval" = yes; then - wx_cv_use_button='wxUSE_BUTTON=yes' + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' else - wx_cv_use_button='wxUSE_BUTTON=no' + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' fi else - wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" fi - eval "$wx_cv_use_button" + eval "$wx_cv_use_bmpbutton" if test x"$enablestring" = xdisable; then - if test $wxUSE_BUTTON = yes; then - result=no - else + if test $wxUSE_BMPBUTTON = no; then result=yes + else + result=no fi else - result=$wxUSE_BUTTON + result=$wxUSE_BMPBUTTON fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9714,34 +9950,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; } - # Check whether --enable-bmpbutton was given. -if test "${enable_bmpbutton+set}" = set; then - enableval=$enable_bmpbutton; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; } + # Check whether --enable-bmpcombobox was given. +if test "${enable_bmpcombobox+set}" = set; then + enableval=$enable_bmpcombobox; if test "$enableval" = yes; then - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes' else - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' fi else - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" fi - eval "$wx_cv_use_bmpbutton" + eval "$wx_cv_use_bmpcombobox" if test x"$enablestring" = xdisable; then - if test $wxUSE_BMPBUTTON = yes; then - result=no - else + if test $wxUSE_BITMAPCOMBOBOX = no; then result=yes + else + result=no fi else - result=$wxUSE_BMPBUTTON + result=$wxUSE_BITMAPCOMBOBOX fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9758,34 +9994,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; } - # Check whether --enable-bmpcombobox was given. -if test "${enable_bmpcombobox+set}" = set; then - enableval=$enable_bmpcombobox; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; } + # Check whether --enable-button was given. +if test "${enable_button+set}" = set; then + enableval=$enable_button; if test "$enableval" = yes; then - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes' + wx_cv_use_button='wxUSE_BUTTON=yes' else - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' + wx_cv_use_button='wxUSE_BUTTON=no' fi else - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" + wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" fi - eval "$wx_cv_use_bmpcombobox" + eval "$wx_cv_use_button" if test x"$enablestring" = xdisable; then - if test $wxUSE_BITMAPCOMBOBOX = yes; then - result=no - else + if test $wxUSE_BUTTON = no; then result=yes + else + result=no fi else - result=$wxUSE_BITMAPCOMBOBOX + result=$wxUSE_BUTTON fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9823,10 +10059,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 @@ -9867,10 +10103,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 @@ -9911,10 +10147,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 @@ -9955,10 +10191,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 @@ -9999,10 +10235,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 @@ -10043,10 +10279,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 @@ -10087,10 +10323,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 @@ -10131,10 +10367,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 @@ -10175,10 +10411,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 @@ -10219,10 +10455,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 @@ -10242,34 +10478,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; } - # Check whether --enable-datepick was given. -if test "${enable_datepick+set}" = set; then - enableval=$enable_datepick; + { 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_datepick='wxUSE_DATEPICKCTRL=yes' + wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=yes' else - wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no' + wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=no' fi else - wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" + wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=${'DEFAULT_wxUSE_COMMANDLINKBUTTON":-$defaultval}" fi - eval "$wx_cv_use_datepick" + eval "$wx_cv_use_commandlinkbutton" if test x"$enablestring" = xdisable; then - if test $wxUSE_DATEPICKCTRL = yes; then - result=no - else + if test $wxUSE_COMMANDLINKBUTTON = no; then result=yes + else + result=no fi else - result=$wxUSE_DATEPICKCTRL + result=$wxUSE_COMMANDLINKBUTTON fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10286,34 +10522,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; } - # Check whether --enable-dirpicker was given. -if test "${enable_dirpicker+set}" = set; then - enableval=$enable_dirpicker; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; } + # Check whether --enable-dataviewctrl was given. +if test "${enable_dataviewctrl+set}" = set; then + enableval=$enable_dataviewctrl; if test "$enableval" = yes; then - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes' + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' else - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' fi else - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" fi - eval "$wx_cv_use_dirpicker" + eval "$wx_cv_use_dataviewctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_DIRPICKERCTRL = yes; then - result=no - else + if test $wxUSE_DATAVIEWCTRL = no; then result=yes + else + result=no fi else - result=$wxUSE_DIRPICKERCTRL + result=$wxUSE_DATAVIEWCTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10330,34 +10566,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; } - # Check whether --enable-display was given. -if test "${enable_display+set}" = set; then - enableval=$enable_display; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; } + # Check whether --enable-datepick was given. +if test "${enable_datepick+set}" = set; then + enableval=$enable_datepick; if test "$enableval" = yes; then - wx_cv_use_display='wxUSE_DISPLAY=yes' + wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes' else - wx_cv_use_display='wxUSE_DISPLAY=no' + wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no' fi else - wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" + wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" fi - eval "$wx_cv_use_display" + eval "$wx_cv_use_datepick" if test x"$enablestring" = xdisable; then - if test $wxUSE_DISPLAY = yes; then - result=no - else + if test $wxUSE_DATEPICKCTRL = no; then result=yes + else + result=no fi else - result=$wxUSE_DISPLAY + result=$wxUSE_DATEPICKCTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10395,10 +10631,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 @@ -10418,34 +10654,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6; } - # Check whether --enable-editablebox was given. -if test "${enable_editablebox+set}" = set; then - enableval=$enable_editablebox; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; } + # Check whether --enable-dirpicker was given. +if test "${enable_dirpicker+set}" = set; then + enableval=$enable_dirpicker; if test "$enableval" = yes; then - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes' + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes' else - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' fi else - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" fi - eval "$wx_cv_use_editablebox" + eval "$wx_cv_use_dirpicker" if test x"$enablestring" = xdisable; then - if test $wxUSE_EDITABLELISTBOX = yes; then - result=no - else + if test $wxUSE_DIRPICKERCTRL = no; then result=yes + else + result=no fi else - result=$wxUSE_EDITABLELISTBOX + result=$wxUSE_DIRPICKERCTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10462,34 +10698,78 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; } - # Check whether --enable-filepicker was given. -if test "${enable_filepicker+set}" = set; then - enableval=$enable_filepicker; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; } + # Check whether --enable-display was given. +if test "${enable_display+set}" = set; then + enableval=$enable_display; if test "$enableval" = yes; then - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes' + wx_cv_use_display='wxUSE_DISPLAY=yes' else - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' + wx_cv_use_display='wxUSE_DISPLAY=no' fi else - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" + wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" fi - eval "$wx_cv_use_filepicker" + eval "$wx_cv_use_display" if test x"$enablestring" = xdisable; then - if test $wxUSE_FILEPICKERCTRL = yes; then - result=no + if test $wxUSE_DISPLAY = no; then + result=yes else + result=no + fi + else + result=$wxUSE_DISPLAY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6; } + # Check whether --enable-editablebox was given. +if test "${enable_editablebox+set}" = set; then + enableval=$enable_editablebox; + if test "$enableval" = yes; then + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes' + else + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' + fi + +else + + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" + +fi + + + eval "$wx_cv_use_editablebox" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_EDITABLELISTBOX = no; then result=yes + else + result=no fi else - result=$wxUSE_FILEPICKERCTRL + result=$wxUSE_EDITABLELISTBOX fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10527,10 +10807,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 @@ -10540,6 +10820,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}-filepicker" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; } + # Check whether --enable-filepicker was given. +if test "${enable_filepicker+set}" = set; then + enableval=$enable_filepicker; + if test "$enableval" = yes; then + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes' + else + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' + fi + +else + + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_filepicker" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILEPICKERCTRL = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_FILEPICKERCTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -10571,10 +10895,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 @@ -10615,10 +10939,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 @@ -10659,10 +10983,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 @@ -10682,34 +11006,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; } - # Check whether --enable-dataviewctrl was given. -if test "${enable_dataviewctrl+set}" = set; then - enableval=$enable_dataviewctrl; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-headerctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-headerctrl... $ECHO_C" >&6; } + # Check whether --enable-headerctrl was given. +if test "${enable_headerctrl+set}" = set; then + enableval=$enable_headerctrl; if test "$enableval" = yes; then - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' + wx_cv_use_headerctrl='wxUSE_HEADERCTRL=yes' else - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' + wx_cv_use_headerctrl='wxUSE_HEADERCTRL=no' fi else - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" + wx_cv_use_headerctrl='wxUSE_HEADERCTRL=${'DEFAULT_wxUSE_HEADERCTRL":-$defaultval}" fi - eval "$wx_cv_use_dataviewctrl" + eval "$wx_cv_use_headerctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_DATAVIEWCTRL = yes; then - result=no - else + if test $wxUSE_HEADERCTRL = no; then result=yes + else + result=no fi else - result=$wxUSE_DATAVIEWCTRL + result=$wxUSE_HEADERCTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10747,10 +11071,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 @@ -10791,10 +11115,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 @@ -10804,6 +11128,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 @@ -10835,10 +11203,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 @@ -10879,10 +11247,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 @@ -10923,10 +11291,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 @@ -10967,10 +11335,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 @@ -11011,10 +11379,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 @@ -11055,10 +11423,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 @@ -11068,6 +11436,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}-popupwin" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; } + # Check whether --enable-popupwin was given. +if test "${enable_popupwin+set}" = set; then + enableval=$enable_popupwin; + if test "$enableval" = yes; then + wx_cv_use_popupwin='wxUSE_POPUPWIN=yes' + else + wx_cv_use_popupwin='wxUSE_POPUPWIN=no' + fi + +else + + wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" + +fi + + + eval "$wx_cv_use_popupwin" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_POPUPWIN = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_POPUPWIN + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11099,10 +11511,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 @@ -11143,13 +11555,101 @@ fi eval "$wx_cv_use_radiobtn" if test x"$enablestring" = xdisable; then - if test $wxUSE_RADIOBTN = yes; then + if test $wxUSE_RADIOBTN = no; then + result=yes + else result=no + fi + else + result=$wxUSE_RADIOBTN + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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 + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rearrangectrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-rearrangectrl... $ECHO_C" >&6; } + # Check whether --enable-rearrangectrl was given. +if test "${enable_rearrangectrl+set}" = set; then + enableval=$enable_rearrangectrl; + if test "$enableval" = yes; then + wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=yes' + else + wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=no' + fi + +else + + wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=${'DEFAULT_wxUSE_REARRANGECTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_rearrangectrl" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_REARRANGECTRL = no; then result=yes + else + result=no fi else - result=$wxUSE_RADIOBTN + result=$wxUSE_REARRANGECTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11187,10 +11687,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 @@ -11231,10 +11731,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 @@ -11275,10 +11775,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 @@ -11319,10 +11819,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 @@ -11363,10 +11863,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 @@ -11407,10 +11907,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 @@ -11451,10 +11951,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 @@ -11495,10 +11995,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 @@ -11539,10 +12039,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 @@ -11583,10 +12083,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 @@ -11627,10 +12127,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 @@ -11671,10 +12171,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 @@ -11694,34 +12194,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tabdialog" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6; } - # Check whether --enable-tabdialog was given. -if test "${enable_tabdialog+set}" = set; then - enableval=$enable_tabdialog; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-taskbaricon" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6; } + # Check whether --enable-taskbaricon was given. +if test "${enable_taskbaricon+set}" = set; then + enableval=$enable_taskbaricon; if test "$enableval" = yes; then - wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes' + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes' else - wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no' + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no' fi else - wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}" + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}" fi - eval "$wx_cv_use_tabdialog" + eval "$wx_cv_use_taskbaricon" if test x"$enablestring" = xdisable; then - if test $wxUSE_TAB_DIALOG = yes; then - result=no - else + if test $wxUSE_TASKBARICON = no; then result=yes + else + result=no fi else - result=$wxUSE_TAB_DIALOG + result=$wxUSE_TASKBARICON fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11738,34 +12238,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-taskbaricon" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6; } - # Check whether --enable-taskbaricon was given. -if test "${enable_taskbaricon+set}" = set; then - enableval=$enable_taskbaricon; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; } + # Check whether --enable-tbarnative was given. +if test "${enable_tbarnative+set}" = set; then + enableval=$enable_tbarnative; if test "$enableval" = yes; then - wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes' + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' else - wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no' + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' fi else - wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}" + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" fi - eval "$wx_cv_use_taskbaricon" + eval "$wx_cv_use_tbarnative" if test x"$enablestring" = xdisable; then - if test $wxUSE_TASKBARICON = yes; then - result=no - else + if test $wxUSE_TOOLBAR_NATIVE = no; then result=yes + else + result=no fi else - result=$wxUSE_TASKBARICON + result=$wxUSE_TOOLBAR_NATIVE fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11803,10 +12303,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 @@ -11826,78 +12326,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; } - # Check whether --enable-togglebtn was given. -if test "${enable_togglebtn+set}" = set; then - enableval=$enable_togglebtn; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; } + # Check whether --enable-tipwindow was given. +if test "${enable_tipwindow+set}" = set; then + enableval=$enable_tipwindow; if test "$enableval" = yes; then - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' else - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' fi else - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" fi - eval "$wx_cv_use_togglebtn" + eval "$wx_cv_use_tipwindow" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOGGLEBTN = yes; then - result=no - else + if test $wxUSE_TIPWINDOW = no; then result=yes - fi - else - result=$wxUSE_TOGGLEBTN - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; } - # Check whether --enable-toolbar was given. -if test "${enable_toolbar+set}" = set; then - enableval=$enable_toolbar; - if test "$enableval" = yes; then - wx_cv_use_toolbar='wxUSE_TOOLBAR=yes' - else - wx_cv_use_toolbar='wxUSE_TOOLBAR=no' - fi - -else - - wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" - -fi - - - eval "$wx_cv_use_toolbar" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_TOOLBAR = yes; then - result=no else - result=yes + result=no fi else - result=$wxUSE_TOOLBAR + result=$wxUSE_TIPWINDOW fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11914,34 +12370,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; } - # Check whether --enable-tbarnative was given. -if test "${enable_tbarnative+set}" = set; then - enableval=$enable_tbarnative; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; } + # Check whether --enable-togglebtn was given. +if test "${enable_togglebtn+set}" = set; then + enableval=$enable_togglebtn; if test "$enableval" = yes; then - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' else - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' fi else - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" fi - eval "$wx_cv_use_tbarnative" + eval "$wx_cv_use_togglebtn" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOOLBAR_NATIVE = yes; then - result=no - else + if test $wxUSE_TOGGLEBTN = no; then result=yes + else + result=no fi else - result=$wxUSE_TOOLBAR_NATIVE + result=$wxUSE_TOGGLEBTN fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11958,34 +12414,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; } - # Check whether --enable-treebook was given. -if test "${enable_treebook+set}" = set; then - enableval=$enable_treebook; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; } + # Check whether --enable-toolbar was given. +if test "${enable_toolbar+set}" = set; then + enableval=$enable_toolbar; if test "$enableval" = yes; then - wx_cv_use_treebook='wxUSE_TREEBOOK=yes' + wx_cv_use_toolbar='wxUSE_TOOLBAR=yes' else - wx_cv_use_treebook='wxUSE_TREEBOOK=no' + wx_cv_use_toolbar='wxUSE_TOOLBAR=no' fi else - wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" + wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" fi - eval "$wx_cv_use_treebook" + eval "$wx_cv_use_toolbar" if test x"$enablestring" = xdisable; then - if test $wxUSE_TREEBOOK = yes; then - result=no - else + if test $wxUSE_TOOLBAR = no; then result=yes + else + result=no fi else - result=$wxUSE_TREEBOOK + result=$wxUSE_TOOLBAR fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -12023,10 +12479,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 @@ -12046,78 +12502,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; } - # Check whether --enable-treectrl was given. -if test "${enable_treectrl+set}" = set; then - enableval=$enable_treectrl; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; } + # Check whether --enable-treebook was given. +if test "${enable_treebook+set}" = set; then + enableval=$enable_treebook; if test "$enableval" = yes; then - wx_cv_use_treectrl='wxUSE_TREECTRL=yes' + wx_cv_use_treebook='wxUSE_TREEBOOK=yes' else - wx_cv_use_treectrl='wxUSE_TREECTRL=no' + wx_cv_use_treebook='wxUSE_TREEBOOK=no' fi else - wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" + wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" fi - eval "$wx_cv_use_treectrl" + eval "$wx_cv_use_treebook" if test x"$enablestring" = xdisable; then - if test $wxUSE_TREECTRL = yes; then - result=no - else + if test $wxUSE_TREEBOOK = no; then result=yes - fi - else - result=$wxUSE_TREECTRL - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; } - # Check whether --enable-tipwindow was given. -if test "${enable_tipwindow+set}" = set; then - enableval=$enable_tipwindow; - if test "$enableval" = yes; then - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' - else - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' - fi - -else - - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" - -fi - - - eval "$wx_cv_use_tipwindow" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_TIPWINDOW = yes; then - result=no else - result=yes + result=no fi else - result=$wxUSE_TIPWINDOW + result=$wxUSE_TREEBOOK fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -12134,34 +12546,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; } - # Check whether --enable-popupwin was given. -if test "${enable_popupwin+set}" = set; then - enableval=$enable_popupwin; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; } + # Check whether --enable-treectrl was given. +if test "${enable_treectrl+set}" = set; then + enableval=$enable_treectrl; if test "$enableval" = yes; then - wx_cv_use_popupwin='wxUSE_POPUPWIN=yes' + wx_cv_use_treectrl='wxUSE_TREECTRL=yes' else - wx_cv_use_popupwin='wxUSE_POPUPWIN=no' + wx_cv_use_treectrl='wxUSE_TREECTRL=no' fi else - wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" + wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" fi - eval "$wx_cv_use_popupwin" + eval "$wx_cv_use_treectrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_POPUPWIN = yes; then - result=no - else + if test $wxUSE_TREECTRL = no; then result=yes + else + result=no fi else - result=$wxUSE_POPUPWIN + result=$wxUSE_TREECTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -12201,10 +12613,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 @@ -12245,10 +12657,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 @@ -12289,10 +12701,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 @@ -12333,10 +12745,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 @@ -12377,10 +12789,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 @@ -12421,10 +12833,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 @@ -12465,10 +12877,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 @@ -12509,10 +12921,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 @@ -12553,10 +12965,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 @@ -12597,10 +13009,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 @@ -12641,10 +13053,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 @@ -12685,10 +13097,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 @@ -12729,10 +13141,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 @@ -12773,10 +13185,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 @@ -12817,10 +13229,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 @@ -12863,10 +13275,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 @@ -12907,10 +13319,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 @@ -12951,10 +13363,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 @@ -12995,10 +13407,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 @@ -13039,10 +13451,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 @@ -13083,10 +13495,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 @@ -13127,10 +13539,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 @@ -13171,10 +13583,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 @@ -13215,10 +13627,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 @@ -13259,10 +13671,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 @@ -13303,10 +13715,10 @@ fi eval "$wx_cv_use_accessibility" if test x"$enablestring" = xdisable; then - if test $wxUSE_ACCESSIBILITY = yes; then - result=no - else + if test $wxUSE_ACCESSIBILITY = no; then result=yes + else + result=no fi else result=$wxUSE_ACCESSIBILITY @@ -13316,6 +13728,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}-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= @@ -13349,10 +13805,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 @@ -13393,10 +13849,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 @@ -13437,10 +13893,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 @@ -13481,10 +13937,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 @@ -13525,10 +13981,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 @@ -13569,10 +14025,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 @@ -13613,10 +14069,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 @@ -13657,10 +14113,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 @@ -13701,10 +14157,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 @@ -13747,10 +14203,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 @@ -13791,10 +14247,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 @@ -13835,10 +14291,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 @@ -13879,10 +14335,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 @@ -13923,10 +14379,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 @@ -13972,10 +14428,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 @@ -14063,10 +14519,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' @@ -14988,6 +15441,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' @@ -16501,7 +16958,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_prog_gcc_traditional=no fi -rm -f conftest* +rm -f -r conftest* if test $ac_cv_prog_gcc_traditional = no; then @@ -16518,7 +16975,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi -rm -f conftest* +rm -f -r conftest* fi fi @@ -16531,10 +16988,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' @@ -16901,6 +17355,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' @@ -18109,9 +18567,16 @@ 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 @@ -18143,19 +18608,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= @@ -18214,14 +18687,108 @@ 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="/usr/bin/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="/usr/bin/g++-4.0" + fi fi 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\"" @@ -18356,7 +18923,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi - +fi case "${host}" in *-*-darwin* ) @@ -19031,7 +19598,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f conftest* +rm -f -r conftest* fi @@ -19052,7 +19619,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f conftest* +rm -f -r conftest* fi @@ -23853,13 +24420,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -23899,13 +24464,11 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include +#include int main () { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } @@ -23952,7 +24515,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -f conftest* +rm -f -r conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. @@ -24367,56 +24930,96 @@ 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 + { 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 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #if _SGI_COMPILER_VERSION >= 744 + chock me: mipsPro is 7.4.4 or later + #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 + wx_cv_prog_sgicc744=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_prog_sgicc744=yes -if test "x$HPCC" = "xyes"; then - CFLAGS="+W 2011,2450 $CFLAGS" fi -if test "x$HPCXX" = "xyes"; then - CXXFLAGS="+W 2340,4232 $CXXFLAGS" + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi +{ echo "$as_me:$LINENO: result: $wx_cv_prog_sgicc744" >&5 +echo "${ECHO_T}$wx_cv_prog_sgicc744" >&6; } -if test "x$COMPAQCXX" = "xyes"; then - CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit" + 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 -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' 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 $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include + int main () { -$std_string foo; + + #if _SGI_COMPILER_VERSION >= 744 + chock me: mipsPro is 7.4.4 or later + #endif + ; return 0; } @@ -24438,60 +25041,152 @@ 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_stdstring=yes + wx_cv_prog_sgicxx744=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_class_stdstring=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_stdstring" >&5 -echo "${ECHO_T}$wx_cv_class_stdstring" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_prog_sgicxx744" >&5 +echo "${ECHO_T}$wx_cv_prog_sgicxx744" >&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 "x$wx_cv_prog_sgicxx744" = "xyes"; then + CXXFLAGS="-woff 3970 $CXXFLAGS" + fi +fi - 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$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 $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. */ - - #ifdef HAVE_WCHAR_H - # ifdef __CYGWIN__ - # include - # endif - # include - #endif - #ifdef HAVE_STDLIB_H - # include - #endif - #include - #include - +#include int main () { -std::basic_string<$char_type> foo; - const $char_type* dummy = foo.c_str(); +$std_string foo; + ; + 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_stdstring=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_class_stdstring=no + +fi + +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; } + + 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 + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #ifdef HAVE_WCHAR_H + # ifdef __CYGWIN__ + # include + # endif + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + #include + +int +main () +{ +std::basic_string<$char_type> foo; + const $char_type* dummy = foo.c_str(); ; return 0; } @@ -25283,6 +25978,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 @@ -25368,7 +26437,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 \ @@ -25380,9 +26451,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 \ @@ -26800,9 +27873,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 @@ -26820,11 +27893,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; } @@ -26847,21 +27920,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 @@ -28194,12 +29267,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 @@ -28284,7 +29355,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;} @@ -29319,7 +30390,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 @@ -29366,8 +30437,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 @@ -29381,8 +30452,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 ; @@ -29407,6 +30478,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 @@ -29417,7 +30492,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 @@ -29426,15 +30501,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 @@ -29448,8 +30523,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 ; @@ -29474,13 +30549,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 @@ -29489,11 +30568,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" @@ -29675,6 +30818,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 @@ -30080,7 +31225,7 @@ _ACEOF eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do + for ac_extension in a so sl dylib la dll; do if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break @@ -30233,7 +31378,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do + for ac_extension in a so sl dylib la dll; do if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 @@ -32639,22 +33784,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_COCOA" = 1; then + if test "$wxUSE_OSX_IPHONE" = 1; then + TOOLKIT=OSX_IPHONE + fi + + if test "$wxUSE_OLD_COCOA" = 1; then TOOLKIT=COCOA GUIDIST=COCOA_DIST fi @@ -32895,8 +34048,9 @@ 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; } @@ -32928,11 +34082,70 @@ 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; } + 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 +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (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 + ac_cv_header_ddraw_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_ddraw_h=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; } - { echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5 + + fi +fi + +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; } ac_find_libraries= @@ -32946,8 +34159,8 @@ echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; } done done - if test "$ac_find_libraries" != "" ; then - { echo "$as_me:$LINENO: result: yes" >&5 + 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 @@ -32965,9 +34178,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #if HAVE_X11_XLIB_H - #include - #endif + #if HAVE_X11_XLIB_H + #include + #endif #include <$ac_header> @@ -33007,76 +34220,21 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" fi done - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { 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 -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -#include -_ACEOF -rm -f conftest.$ac_objext -if { (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 - ac_cv_header_ddraw_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_ddraw_h=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; } - - 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; } @@ -33126,16 +34284,15 @@ fi USE_OPENGL=0 -if test "$wxUSE_OPENGL" = "yes"; then - if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then - { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 -echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} - wxUSE_OPENGL="no" - elif test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then +if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; 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" - else + elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then + { echo "$as_me:$LINENO: checking for OpenGL headers" >&5 echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; } @@ -33393,10 +34550,25 @@ fi if test "x$OPENGL_LIBS" = "x"; then - { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5 + if test "$wxUSE_OPENGL" = "yes"; then + { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5 echo "$as_me: error: OpenGL libraries not available" >&2;} { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&5 +echo "$as_me: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&2;} + wxUSE_OPENGL=no + USE_OPENGL=0 + fi fi + else + { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 +echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} + wxUSE_OPENGL="no" + fi + + if test "$wxUSE_OPENGL" = "auto"; then + wxUSE_OPENGL=yes fi if test "$wxUSE_OPENGL" = "yes"; then @@ -33916,20 +35088,24 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ;; *-*-darwin* ) - install_name_tool=`which install_name_tool` + install_name_tool=`which ${HOST_PREFIX}install_name_tool` if test "$install_name_tool" -a -x "$install_name_tool"; then - SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@" + 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\$'\` -inst_cmd="install_name_tool " for i in \${libnames} ; do - inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}" + ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i} + for dep in \${libnames} ; do + ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i} + done done -\${inst_cmd} \${3} EOF chmod +x change-install-names + DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib" fi + + HEADER_PAD_OPTION="-headerpad_max_install_names" ;; *-*-cygwin* | *-*-mingw32* ) @@ -33947,7 +35123,7 @@ EOF if test $wxUSE_RPATH = "no"; then SAMPLES_RPATH_FLAG='' - SAMPLES_RPATH_POSTLINK='' + DYLIB_PATH_POSTLINK='' WXCONFIG_RPATH='' fi @@ -33970,15 +35146,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 '-' '_'` @@ -33987,28 +35154,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}" +TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" -TOOLCHAIN_FULLNAME="${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 "$cross_compiling" = "yes"; then - HOST_SUFFIX="-$host_alias" - TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX" - TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME" -fi -WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${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}${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' @@ -34985,7 +36151,11 @@ _ACEOF fi -for ac_func in wcsdup + + + + +for ac_func in wcsdup 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 @@ -38924,6 +40094,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" @@ -38931,7 +40105,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 @@ -39021,7 +40203,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 @@ -39030,6 +40213,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*) @@ -40261,13 +41445,24 @@ echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;} fi fi - { echo "$as_me:$LINENO: checking for __thread keyword" >&5 + if test "$wxUSE_COMPILER_TLS" = "auto"; then + if test "$USE_NETBSD" = 1; then + { echo "$as_me:$LINENO: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&5 +echo "$as_me: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&2;} + wxUSE_COMPILER_TLS=no + else + wxUSE_COMPILER_TLS=yes + fi + fi + + if test "$wxUSE_COMPILER_TLS" = "yes"; then + { echo "$as_me:$LINENO: checking for __thread keyword" >&5 echo $ECHO_N "checking for __thread keyword... $ECHO_C" >&6; } if test "${wx_cv_cc___thread+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 @@ -40278,8 +41473,8 @@ int main () { - static __thread int n = 0; - static __thread int *p = 0; + static __thread int n = 0; + static __thread int *p = 0; ; return 0; @@ -40313,16 +41508,135 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { echo "$as_me:$LINENO: result: $wx_cv_cc___thread" >&5 echo "${ECHO_T}$wx_cv_cc___thread" >&6; } - if test "$wx_cv_cc___thread" = "yes"; then - cat >>confdefs.h <<\_ACEOF + if test "$wx_cv_cc___thread" = "yes"; then + + GXX_VERSION="" + + + + { echo "$as_me:$LINENO: checking if gcc accepts -dumpversion option" >&5 +echo $ECHO_N "checking if gcc accepts -dumpversion option... $ECHO_C" >&6; } + + if test "x$GCC" = "xyes" ; then + + if test -z "" ; then + + ax_gcc_option_test="int main() +{ + return 0; +}" + +else + + ax_gcc_option_test="" + +fi + + + # Dump the test program to file + cat < conftest.c +$ax_gcc_option_test +EOF + + # Dump back the file to the log, useful for debugging purposes + { ac_try='cat conftest.c 1>&5' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } + + if { ac_try='$CC -dumpversion -c conftest.c 1>&5' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } ; then + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + ax_gcc_version_option=yes + + +else + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + + ax_gcc_version_option=no + + +fi + + +else + + { echo "$as_me:$LINENO: result: no gcc available" >&5 +echo "${ECHO_T}no gcc available" >&6; } + +fi + + + if test "x$GXX" = "xyes"; then + + if test "x$ax_gxx_version_option" != "no"; then + + { echo "$as_me:$LINENO: checking gxx version" >&5 +echo $ECHO_N "checking gxx version... $ECHO_C" >&6; } +if test "${ax_cv_gxx_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ax_cv_gxx_version="`$CXX -dumpversion`" + if test "x$ax_cv_gxx_version" = "x"; then + + ax_cv_gxx_version="" + +fi + + +fi +{ echo "$as_me:$LINENO: result: $ax_cv_gxx_version" >&5 +echo "${ECHO_T}$ax_cv_gxx_version" >&6; } + GXX_VERSION=$ax_cv_gxx_version + +fi + + +fi + + + + if test -n "$ax_cv_gxx_version"; then + { echo "$as_me:$LINENO: checking whether __thread support in g++ is usable" >&5 +echo $ECHO_N "checking whether __thread support in g++ is usable... $ECHO_C" >&6; } + case "$ax_cv_gxx_version" in + 1.* | 2.* | 3.* ) + { echo "$as_me:$LINENO: result: no, it's broken" >&5 +echo "${ECHO_T}no, it's broken" >&6; } + wx_cv_cc___thread=no + ;; + *) + { echo "$as_me:$LINENO: result: yes, it works" >&5 +echo "${ECHO_T}yes, it works" >&6; } + ;; + esac + fi + fi + + if test "$wx_cv_cc___thread" = "yes"; then + cat >>confdefs.h <<\_ACEOF #define HAVE___THREAD_KEYWORD 1 _ACEOF - fi + fi + fi fi else @@ -41319,7 +42633,10 @@ _ACEOF fi DEBUG_CFLAGS= -if test "$wxUSE_DEBUG_INFO" = "yes" ; then +if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then + { echo "$as_me:$LINENO: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&5 +echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&2;} +elif test "$wxUSE_DEBUG_INFO" = "yes" ; then DEBUG_CFLAGS="-g" fi @@ -41330,13 +42647,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" @@ -41371,7 +42684,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" @@ -41391,22 +42704,27 @@ if test "$GCC" = "yes" ; then fi OPTIMISE_CFLAGS= -if test "$wxUSE_OPTIMISE" = "no" ; then - if test "$GCC" = yes ; then - OPTIMISE_CFLAGS="-O0" - fi +if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then + { echo "$as_me:$LINENO: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&5 +echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&2;} else - if test "$GCC" = yes ; then - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - OPTIMISE_CFLAGS="-O2" - ;; - *) - OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing" - ;; - esac + if test "$wxUSE_OPTIMISE" = "no" ; then + if test "$GCC" = yes ; then + OPTIMISE_CFLAGS="-O0" + fi else - OPTIMISE_CFLAGS="-O" + if test "$GCC" = yes ; then + case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + OPTIMISE_CFLAGS="-O2" + ;; + *) + OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing" + ;; + esac + else + OPTIMISE_CFLAGS="-O" + fi fi fi @@ -42036,6 +43354,158 @@ _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 + 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 @@ -42050,6 +43520,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 @@ -42990,6 +44467,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 @@ -42997,6 +44475,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 @@ -43012,9 +44491,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 @@ -43092,6 +44662,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 @@ -43697,239 +45274,6 @@ _ACEOF fi if test "$wxUSE_DATETIME" = "yes"; then - { echo "$as_me:$LINENO: checking for strptime" >&5 -echo $ECHO_N "checking for strptime... $ECHO_C" >&6; } -if test "${ac_cv_func_strptime+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define strptime to an innocuous variant, in case declares strptime. - For example, HP-UX 11i declares gettimeofday. */ -#define strptime innocuous_strptime - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strptime (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef strptime - -/* 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 strptime (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_strptime || defined __stub___strptime -choke me -#endif - -int -main () -{ -return strptime (); - ; - 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 - ac_cv_func_strptime=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_strptime=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5 -echo "${ECHO_T}$ac_cv_func_strptime" >&6; } - - if test "$ac_cv_func_strptime" = "yes"; then - { echo "$as_me:$LINENO: checking for strptime declaration" >&5 -echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6; } -if test "${wx_cv_func_strptime_decl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ac_ext=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 - -int -main () -{ - - struct tm t; - strptime("foo", "bar", &t); - - ; - 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_func_strptime_decl=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_func_strptime_decl=no - -fi - -rm -f 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_func_strptime_decl" >&5 -echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6; } - fi - if test "$wx_cv_func_strptime_decl" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRPTIME_DECL 1 -_ACEOF - - else - wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);" - fi - if test "$ac_cv_func_strptime" = "yes"; then - { echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5 -echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6; } -if test "${wx_cv_func_strptime_ok+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - wx_cv_func_strptime_ok=no - -else - cat >conftest.$ac_ext <<_ACEOF - - #include - #include - #include "confdefs.h" - - $wx_strptime_decl - - int main() - { - struct tm t; - return !!strptime("", "%x", &t); - } - -_ACEOF -rm -f conftest$ac_exeext -if { (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>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_func_strptime_ok=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -wx_cv_func_strptime_ok=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5 -echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; } - - if test "$wx_cv_func_strptime_ok" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRPTIME 1 -_ACEOF - - fi - fi - { echo "$as_me:$LINENO: checking for timezone variable in " >&5 echo $ECHO_N "checking for timezone variable in ... $ECHO_C" >&6; } if test "${wx_cv_var_timezone+set}" = set; then @@ -45298,15 +46642,10 @@ echo "$as_me: WARNING: Cannot use wxHTML-based help without wxHTML so it won't b fi if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:$LINENO: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&5 -echo "$as_me: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&2;} - else - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define wxUSE_PRINTING_ARCHITECTURE 1 _ACEOF - fi SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" fi @@ -45564,6 +46903,10 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" -o "$wxUSE_CLIPBOARD" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" fi +if test "$wxUSE_CLIPBOARD" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS clipboard" +fi + if test "$wxUSE_SPLINES" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SPLINES 1 @@ -45578,6 +46921,14 @@ _ACEOF fi +if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UIACTIONSIMULATOR 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction" +fi + USES_CONTROLS=0 if test "$wxUSE_CONTROLS" = "yes"; then @@ -45660,6 +47011,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 @@ -45778,6 +47137,14 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" fi +if test "$wxUSE_HEADERCTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_HEADERCTRL 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_HYPERLINKCTRL" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_HYPERLINKCTRL 1 @@ -45810,6 +47177,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 @@ -45846,7 +47220,6 @@ if test "$wxUSE_EDITABLELISTBOX" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox" fi if test "$wxUSE_NOTEBOOK" = "yes"; then @@ -45890,6 +47263,20 @@ _ACEOF USES_CONTROLS=1 fi +if test "$wxUSE_REARRANGECTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_REARRANGECTRL 1 +_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 @@ -45904,7 +47291,7 @@ if test "$wxUSE_SCROLLBAR" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" fi if test "$wxUSE_SEARCHCTRL" = "yes"; then @@ -45993,13 +47380,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar" fi -if test "$wxUSE_TAB_DIALOG" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_TAB_DIALOG 1 -_ACEOF - -fi - if test "$wxUSE_TEXTCTRL" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_TEXTCTRL 1 @@ -46019,7 +47399,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 @@ -46102,7 +47482,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 @@ -46122,7 +47502,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 @@ -46261,7 +47641,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 @@ -46310,6 +47690,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 @@ -46318,6 +47708,51 @@ _ACEOF USE_STC=1 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc" + + # Extract the first word of "python", so it can be a program name with args. +set dummy python; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PYTHON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PYTHON in + [\\/]* | ?:[\\/]*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { echo "$as_me:$LINENO: result: $PYTHON" >&5 +echo "${ECHO_T}$PYTHON" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + if test "x$PYTHON" = "x"; then + COND_PYTHON="#" + fi + fi if test "$wxUSE_MENUS" = "yes"; then @@ -46527,15 +47962,10 @@ _ACEOF fi if test "$wxUSE_PROGRESSDLG" = "yes"; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:$LINENO: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&5 -echo "$as_me: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&2;} - else - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define wxUSE_PROGRESSDLG 1 _ACEOF - fi fi if test "$wxUSE_SPLASH" = "yes"; then @@ -46547,15 +47977,10 @@ _ACEOF fi if test "$wxUSE_STARTUP_TIPS" = "yes"; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:$LINENO: WARNING: Startup tips requires constraints and won't be compiled without them" >&5 -echo "$as_me: WARNING: Startup tips requires constraints and won't be compiled without them" >&2;} - else - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define wxUSE_STARTUP_TIPS 1 _ACEOF - fi fi if test "$wxUSE_TEXTDLG" = "yes"; then @@ -46641,21 +48066,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; then pkg_failed=no { echo "$as_me:$LINENO: checking for CAIRO" >&5 @@ -46715,30 +48203,39 @@ 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 + wx_has_graphics=1 +fi + else + wx_has_graphics=1 + fi + + if test "$wx_has_graphics" = 1; then + cat >>confdefs.h <<\_ACEOF #define wxUSE_GRAPHICS_CONTEXT 1 _ACEOF -fi - fi + else + { echo "$as_me:$LINENO: WARNING: wxGraphicsContext won't be available" >&5 +echo "$as_me: WARNING: wxGraphicsContext won't be available" >&2;} + fi fi USE_MEDIA=0 -if test "$wxUSE_MEDIACTRL" = "yes"; then +if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then USE_MEDIA=1 if test "$wxUSE_GTK" = 1; then @@ -46934,11 +48431,20 @@ _ACEOF #define wxUSE_MEDIACTRL 1 _ACEOF + else + if test "$wxUSE_MEDIACTRL" = "yes"; then + { { echo "$as_me:$LINENO: error: GStreamer not available" >&5 +echo "$as_me: error: GStreamer not available" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: GStreamer not available... disabling wxMediaCtrl" >&5 +echo "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2;} + fi fi fi -if test "$cross_compiling" = "yes"; then +if test "$cross_compiling" != "no"; then OSINFO="\"$host\"" else OSINFO=`uname -s -r -m` @@ -47002,6 +48508,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 @@ -47020,36 +48529,37 @@ 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 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ - erase event exec font image minimal mobile \ - mobile/wxedit mobile/styles render \ - shaped svg taborder vscroll widgets" + erase event exec font image minimal render \ + shaped svg taborder vscroll widgets wrapsizer" if test "$wxUSE_MONOLITHIC" != "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" @@ -47057,7 +48567,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 @@ -47173,6 +48683,10 @@ case ".$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" in ;; esac + + if test "$wxUSE_MAC" = 1 ; then + CXXWARNINGS="$CXXWARNINGS -Wno-deprecated-declarations" + fi fi @@ -47206,7 +48720,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 @@ -47238,7 +48752,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 @@ -47321,21 +48835,10 @@ fi + +TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'` -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 @@ -47361,6 +48864,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 ' '`" @@ -48075,7 +49581,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 @@ -48346,7 +49855,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 @@ -49024,7 +50533,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= @@ -49038,20 +50547,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* ) @@ -49454,10 +50962,10 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.2.5" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.8" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.5" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.8" @@ -49729,6 +51237,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="" @@ -49804,6 +51317,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="" @@ -49854,6 +51372,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="" @@ -49904,6 +51427,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="" @@ -49964,6 +51492,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="" @@ -49984,6 +51517,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="" @@ -50069,6 +51612,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="" @@ -50269,11 +51817,6 @@ EOF COND_TOOLKIT_OSX_CARBON_USE_GUI_1="" fi - COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="" - fi - COND_TOOLKIT_OSX_COCOA="#" if test "x$TOOLKIT" = "xOSX_COCOA" ; then COND_TOOLKIT_OSX_COCOA="" @@ -50284,16 +51827,21 @@ EOF COND_TOOLKIT_OSX_COCOA_USE_GUI_1="" fi - COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="" - fi - COND_TOOLKIT_OSX_IPHONE="#" if test "x$TOOLKIT" = "xOSX_IPHONE" ; then 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="" @@ -50344,6 +51892,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="" @@ -50434,9 +51987,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="#" @@ -50454,6 +52007,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="" @@ -50592,10 +52150,10 @@ echo "$as_me: error: Required windres program not found" >&2;} { (exit 1); exit 1; }; } fi - RESCOMP="$WINDRES" + RESCOMP="$WINDRES $WINDRES_CPU_DEFINE" 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" @@ -50838,9 +52396,7 @@ ac_config_headers="$ac_config_headers lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/se if test "$USE_WIN32" = 1; then - ac_config_commands="$ac_config_commands - rcdefs.h - " + ac_config_commands="$ac_config_commands rcdefs.h" fi @@ -51442,7 +52998,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 @@ -51495,7 +53051,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'`\\" @@ -51734,10 +53290,6 @@ host!$host$ac_delim host_cpu!$host_cpu$ac_delim host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim -target!$target$ac_delim -target_cpu!$target_cpu$ac_delim -target_vendor!$target_vendor$ac_delim -target_os!$target_os$ac_delim wx_top_builddir!$wx_top_builddir$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim @@ -51753,6 +53305,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 @@ -51774,6 +53328,7 @@ PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim LIBICONV!$LIBICONV$ac_delim +GXX_VERSION!$GXX_VERSION$ac_delim SDL_CONFIG!$SDL_CONFIG$ac_delim SDL_CFLAGS!$SDL_CFLAGS$ac_delim SDL_LIBS!$SDL_LIBS$ac_delim @@ -51785,7 +53340,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 -CAIRO_CFLAGS!$CAIRO_CFLAGS$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 @@ -51827,6 +53383,9 @@ _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 @@ -51862,13 +53421,14 @@ 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 TOOLKIT_VERSION!$TOOLKIT_VERSION$ac_delim +DYLIB_RPATH_INSTALL!$DYLIB_RPATH_INSTALL$ac_delim +DYLIB_RPATH_POSTLINK!$DYLIB_RPATH_POSTLINK$ac_delim SAMPLES_RPATH_FLAG!$SAMPLES_RPATH_FLAG$ac_delim -SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$ac_delim +HEADER_PAD_OPTION!$HEADER_PAD_OPTION$ac_delim HOST_SUFFIX!$HOST_SUFFIX$ac_delim CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim @@ -51913,17 +53473,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 -ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51965,6 +53521,10 @@ _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 COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim @@ -51985,6 +53545,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 @@ -52000,6 +53561,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 @@ -52010,6 +53572,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 @@ -52020,6 +53583,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 @@ -52032,10 +53596,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 @@ -52051,17 +53618,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 -COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52103,6 +53659,18 @@ _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 COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim @@ -52134,11 +53702,11 @@ COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_deli COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim COND_TOOLKIT_OSX_CARBON!$COND_TOOLKIT_OSX_CARBON$ac_delim COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim -COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$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_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$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 @@ -52149,6 +53717,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 @@ -52167,10 +53736,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 @@ -52186,20 +53756,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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52241,6 +53797,20 @@ _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 @@ -52250,12 +53820,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 @@ -52280,7 +53850,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` = 37; 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 @@ -52911,8 +54481,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