X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b55e184291caa58235d58e6329ec1060d9839815..3cd9070c7887383f12a393ed430dcd1cdabdd3c7:/configure diff --git a/configure b/configure index cf6e413b3e..c194d90ab8 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 47765 2007-07-28 00:08:01Z VZ . +# From configure.in Id: configure.in 60470 2009-05-02 12:52:54Z VZ . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -661,10 +661,6 @@ host host_cpu host_vendor host_os -target -target_cpu -target_vendor -target_os wx_top_builddir CC CFLAGS @@ -679,16 +675,7 @@ EGREP CXX CXXFLAGS ac_ct_CXX -RANLIB AR -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -STRIP -WINDRES -DLLTOOL -IF_GNU_MAKE -LN_S subdirs PKG_CONFIG GTK_CFLAGS @@ -709,19 +696,21 @@ PANGOXFT_CFLAGS PANGOXFT_LIBS CFLAGS_VISIBILITY CXXFLAGS_VISIBILITY -REZ -DEREZ -SETFILE LIBICONV +GXX_VERSION SDL_CONFIG SDL_CFLAGS SDL_LIBS +GTKPRINT_CFLAGS +GTKPRINT_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS +PYTHON +COND_PYTHON CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS @@ -733,7 +722,6 @@ STD_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT -wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF @@ -748,11 +736,13 @@ CXXWARNINGS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML -EXTRALIBS_ODBC +EXTRALIBS_MEDIA EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL +EXTRALIBS_STC WITH_PLUGIN_SDL +EXTRALIBS_GTKPRINT EXTRALIBS_GNOMEPRINT EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON @@ -762,17 +752,26 @@ 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 +RANLIB +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +LN_S SET_MAKE MAKE_SET AROPTIONS +STRIP NM INSTALL_DIR LDFLAGS_GUI +IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS @@ -805,8 +804,14 @@ USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING BK_DEPS +WINDRES +REZ +SETFILE +OBJCXXFLAGS GCC_PCH ICC_PCH +ICC_PCH_CREATE_SWITCH +ICC_PCH_USE_SWITCH BK_MAKE_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT @@ -817,6 +822,15 @@ COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 +COND_BUILD_debug +COND_BUILD_debug_DEBUG_FLAG_default +COND_BUILD_debug_DEBUG_INFO_default +COND_BUILD_debug_UNICODE_0 +COND_BUILD_debug_UNICODE_1 +COND_BUILD_release +COND_BUILD_release_DEBUG_INFO_default +COND_BUILD_release_UNICODE_0 +COND_BUILD_release_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 @@ -830,9 +844,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 -COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 -COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 +COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_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 @@ -841,19 +854,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_AUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 -COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 -COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 +COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_1_USE_STC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_AUI_1 COND_MONOLITHIC_0_USE_GUI_1 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1 -COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_HTML_1 COND_MONOLITHIC_0_USE_MEDIA_1 -COND_MONOLITHIC_0_USE_ODBC_1 +COND_MONOLITHIC_0_USE_PROPGRID_1 COND_MONOLITHIC_0_USE_QA_1 COND_MONOLITHIC_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_USE_STC_1 @@ -866,16 +877,16 @@ COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 -COND_PLATFORM_MACOSX_1_TOOLKIT_ -COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA -COND_PLATFORM_MACOSX_1_TOOLKIT_GTK -COND_PLATFORM_MACOSX_1_TOOLKIT_MAC -COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 -COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF -COND_PLATFORM_MACOSX_1_TOOLKIT_X11 +COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_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_USE_GUI_1 +COND_PLATFORM_MACOSX_1_USE_OPENGL_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 +COND_PLATFORM_MAC_0 COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_0 COND_PLATFORM_MSDOS_1 @@ -893,18 +904,15 @@ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 -COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN -COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN -COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN +COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin +COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin +COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin COND_SHARED_0_USE_STC_1 -COND_SHARED_0_USE_XRC_1 -COND_SHARED_0_WXUSE_EXPAT_BUILTIN -COND_SHARED_0_WXUSE_ODBC_BUILTIN -COND_SHARED_0_WXUSE_REGEX_BUILTIN -COND_SHARED_0_WXUSE_ZLIB_BUILTIN +COND_SHARED_0_wxUSE_EXPAT_builtin +COND_SHARED_0_wxUSE_REGEX_builtin +COND_SHARED_0_wxUSE_ZLIB_builtin COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 -COND_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 @@ -920,8 +928,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_MAC -COND_TOOLKIT_MAC_USE_GUI_1 -COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF @@ -931,6 +937,11 @@ COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 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_COCOA +COND_TOOLKIT_OSX_COCOA_USE_GUI_1 +COND_TOOLKIT_OSX_IPHONE COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 @@ -951,7 +962,9 @@ COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN -COND_USE_ODBC_1 +COND_USE_GUI_1_wxUSE_LIBJPEG_builtin +COND_USE_GUI_1_wxUSE_LIBPNG_builtin +COND_USE_GUI_1_wxUSE_LIBTIFF_builtin COND_USE_OPENGL_1 COND_USE_PCH_1 COND_USE_PLUGINS_0 @@ -974,9 +987,15 @@ COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN -COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN +COND_wxUSE_EXPAT_builtin +COND_wxUSE_LIBJPEG_builtin +COND_wxUSE_LIBPNG_builtin +COND_wxUSE_LIBTIFF_builtin +COND_wxUSE_REGEX_builtin +COND_wxUSE_ZLIB_builtin +DEREZ SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI @@ -1001,7 +1020,6 @@ WXCONFIG_LIBS WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_RESFLAGS -EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS @@ -1018,6 +1036,7 @@ LIBWXMACRES POSTLINK_COMMAND MACSETFILE GCC +DLLTOOL CPPUNIT_CONFIG LIBOBJS LTLIBOBJS' @@ -1044,6 +1063,8 @@ PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS +GTKPRINT_CFLAGS +GTKPRINT_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS @@ -1054,7 +1075,8 @@ CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS GST_LIBS' -ac_subdirs_all='src/expat' +ac_subdirs_all='src/tiff +src/expat' # Initialize some variables set by options. ac_init_help= @@ -1620,7 +1642,6 @@ 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 @@ -1644,7 +1665,6 @@ Optional Features: --disable-gtk2 use GTK+ 1.2 instead of 2.0 --enable-gpe use GNOME PDA Environment features if possible --disable-shared create static library instead of shared - --disable-optimise create optimised code --enable-debug same as debug_flag and debug_info --enable-stl use STL for containers --enable-std_iostreams use standard C++ stream classes @@ -1652,11 +1672,12 @@ Optional Features: --disable-unicode compile without Unicode support --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only) --enable-utf8 use UTF-8 representation for strings (Unix only) - --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only) + --enable-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 @@ -1666,24 +1687,26 @@ Optional Features: --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 (not yet working) + --enable-universal_binary create Mac PowerPC and Intel Universal binary --enable-compat26 enable wxWidgets 2.6 compatibility --disable-compat28 disable wxWidgets 2.8 compatibility --disable-rpath disable use of rpath for uninstalled builds --enable-objc_uniquifying enable Objective-C class name uniquifying --disable-visibility disable use of ELF symbols visibility even if supported --enable-intl use internationalization system + --enable-xlocale use x-locale support (requires wxLocale) --enable-config use wxConfig (and derived) classes --enable-protocols use wxProtocol and derived classes --enable-ftp use wxFTP (requires wxProtocol --enable-http use wxHTTP (requires wxProtocol --enable-fileproto use wxFileProto class (requires wxProtocol --enable-sockets use socket/network classes + --enable-ipv6 enable IPv6 support in wxSocket --enable-ole use OLE classes (Win32 only) --enable-dataobj use data object classes --enable-ipc use interprocess communication (wxSocket etc.) --enable-baseevtloop use event loop in console programs too - --enable-epoolloop use wxEpollDispatcher class (Linux only) + --enable-epollloop use wxEpollDispatcher class (Linux only) --enable-selectloop use wxSelectDispatcher class --enable-apple_ieee use the Apple IEEE codec --enable-arcstream use wxArchive streams @@ -1709,7 +1732,9 @@ Optional Features: --enable-log use logging system --enable-longlong use wxLongLong class --enable-mimetype use wxMimeTypesManager + --enable-printfposparam use wxVsnprintf() which supports positional parameters --enable-snglinst use wxSingleInstanceChecker class + --enable-sound use wxSound class --enable-stdpaths use wxStandardPaths class --enable-stopwatch use wxStopWatch class --enable-streams use wxStream etc classes @@ -1718,18 +1743,16 @@ Optional Features: --enable-textbuf use wxTextBuffer class --enable-textfile use wxTextFile class --enable-timer use wxTimer class - --enable-sound use wxSound class - --enable-mediactrl use wxMediaCtrl class - --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix - --enable-printfposparam use wxVsnprintf() which supports positional parameters + --enable-variant use wxVariant class --enable-zipstream use wxZip streams --enable-url use wxURL class - --enable-variant use wxVariant class --enable-protocol use wxProtocol class --enable-protocol-http HTTP support in wxProtocol --enable-protocol-ftp FTP support in wxProtocol --enable-protocol-file FILE support in wxProtocol --enable-threads use threads + --enable-iniconf use wxIniConfig (Win32 only) + --enable-regkey use wxRegKey class (Win32 only) --enable-docview use document view architecture --enable-help use help subsystem --enable-mshtmlhelp use MS HTML Help (win32) @@ -1737,18 +1760,21 @@ Optional Features: --enable-htmlhelp use wxHTML-based help --enable-xrc use XRC resources sub-library --enable-aui use AUI docking library + --enable-propgrid use wxPropertyGrid library --enable-stc use wxStyledTextCtrl library --enable-constraints use layout-constraints system - --enable-printarch use printing architecture - --enable-mdi use multiple document interface architecture - --enable-mdidoc use docview architecture with MDI --enable-loggui use standard GUI logger --enable-logwin use wxLogWindow --enable-logdialog use wxLogDialog + --enable-mdi use multiple document interface architecture + --enable-mdidoc use docview architecture with MDI + --enable-mediactrl use wxMediaCtrl class + --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-clipboard use wxClipboard class --enable-dnd use Drag'n'Drop classes @@ -1756,9 +1782,9 @@ Optional Features: --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 @@ -1769,25 +1795,30 @@ Optional Features: --enable-colourpicker use wxColourPickerCtrl class --enable-combobox use wxComboBox class --enable-comboctrl use wxComboCtrl 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-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-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-rearrangectrl use wxRearrangeList/Ctrl/Dialog --enable-sash use wxSashWindow class --enable-scrollbar use wxScrollBar class and scrollable windows --enable-searchctrl use wxSearchCtrl class @@ -1800,17 +1831,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 @@ -1845,14 +1874,13 @@ Optional Features: --enable-iff use iff images (IFF file format) --enable-pnm use pnm images (PNM file format) --enable-xpm use xpm images (XPM file format) - --enable-icocur use Windows ICO and CUR formats + --enable-ico_cur use Windows ICO and CUR formats --enable-dccache cache temporary wxDC objects (Win32 only) - --enable-iniconf use wxIniConfig (Win32 only) --enable-ps-in-msw use PS printing in wxMSW (Win32 only) - --enable-ownerdrawn use owner drawn controls (Win32 only) - --enable-regkey use wxRegKey class (Win32 only) + --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only) --enable-uxtheme enable support for Windows XP themed look (Win32 only) --enable-wxdib use wxDIB class (Win32 only) + --enable-autoidman use automatic ids management --disable-largefile omit support for large files --disable-gtktest do not try to compile and run a test GTK+ program --disable-gtktest Do not try to compile and run a test GTK program @@ -1872,7 +1900,9 @@ Optional Packages: --with-themes=all|list use only the specified comma-separated list of wxUniversal themes --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any" --with-motif use Motif/Lesstif - --with-mac use Mac OS X + --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-wine use Wine --with-msw use MS-Windows @@ -1885,7 +1915,9 @@ Optional Packages: --with-libjpeg use libjpeg (JPEG file format) --with-libtiff use libtiff (TIFF file format) --with-libxpm use libxpm (XPM file format) + --with-libiconv use libiconv (character conversion) --with-libmspack use libmspack (CHM help files loading) + --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 @@ -1894,7 +1926,6 @@ Optional Packages: --with-sdl use SDL for audio on Unix --with-regex enable support for wxRegEx class --with-zlib use zlib for LZW compression - --with-odbc use the IODBC and wxODBC classes --with-expat enable XML support using expat parser --with-macosx-sdk=PATH use an OS X SDK at PATH --with-macosx-version-min=VER build binaries which require at least this OS X version @@ -1935,6 +1966,10 @@ Some influential environment variables: C compiler flags for PANGOXFT, overriding pkg-config PANGOXFT_LIBS linker flags for PANGOXFT, overriding pkg-config + GTKPRINT_CFLAGS + C compiler flags for GTKPRINT, overriding pkg-config + GTKPRINT_LIBS + linker flags for GTKPRINT, overriding pkg-config LIBGNOMEPRINTUI_CFLAGS C compiler flags for LIBGNOMEPRINTUI, overriding pkg-config LIBGNOMEPRINTUI_LIBS @@ -2500,51 +2535,15 @@ 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 @@ -2585,11 +2584,12 @@ USE_ALPHA= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11 DFB" +ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB" DEFAULT_wxUSE_COCOA=0 DEFAULT_wxUSE_GTK=0 -DEFAULT_wxUSE_MAC=0 +DEFAULT_wxUSE_OSX_CARBON=0 +DEFAULT_wxUSE_OSX_COCOA=0 DEFAULT_wxUSE_MGL=0 DEFAULT_wxUSE_MICROWIN=0 DEFAULT_wxUSE_MOTIF=0 @@ -2600,7 +2600,8 @@ DEFAULT_wxUSE_DFB=0 DEFAULT_DEFAULT_wxUSE_COCOA=0 DEFAULT_DEFAULT_wxUSE_GTK=0 -DEFAULT_DEFAULT_wxUSE_MAC=0 +DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0 +DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0 DEFAULT_DEFAULT_wxUSE_MGL=0 DEFAULT_DEFAULT_wxUSE_MICROWIN=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 @@ -2610,9 +2611,9 @@ DEFAULT_DEFAULT_wxUSE_X11=0 DEFAULT_DEFAULT_wxUSE_DFB=0 PROGRAM_EXT= -SO_SUFFIX=so SAMPLES_RPATH_FLAG= -SAMPLES_RPATH_POSTLINK= +DYLIB_RPATH_INSTALL= +DYLIB_RPATH_POSTLINK= DEFAULT_STD_FLAG=yes @@ -2621,7 +2622,6 @@ case "${host}" in USE_HPUX=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1 NEEDS_D_REENTRANT_FOR_R_FUNCS=1 - SO_SUFFIX=sl cat >>confdefs.h <<\_ACEOF #define __HPUX__ 1 _ACEOF @@ -2793,7 +2793,6 @@ _ACEOF USE_AIX=1 USE_SYSV=1 USE_SVR4=1 - SO_SUFFIX=a cat >>confdefs.h <<\_ACEOF #define __AIX__ 1 _ACEOF @@ -2820,8 +2819,7 @@ _ACEOF ;; *-*-cygwin* | *-*-mingw32* ) - SO_SUFFIX=dll - PROGRAM_EXT=".exe" + PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_MSW=1 ;; @@ -2871,7 +2869,6 @@ _ACEOF *-*-darwin* ) USE_BSD=1 USE_DARWIN=1 - SO_SUFFIX=dylib cat >>confdefs.h <<\_ACEOF #define __BSD__ 1 _ACEOF @@ -2884,14 +2881,13 @@ _ACEOF #define TARGET_CARBON 1 _ACEOF - DEFAULT_DEFAULT_wxUSE_MAC=1 + DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1 DEFAULT_STD_FLAG=no ;; powerpc-apple-macos* ) USE_UNIX=0 ac_cv_c_bigendian=yes - SO_SUFFIX=shlib - DEFAULT_DEFAULT_wxUSE_MAC=1 + DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1 DEFAULT_STD_FLAG=no ;; @@ -2915,14 +2911,6 @@ esac - - wx_arg_cache_file="configarg.cache" - echo "loading argument cache $wx_arg_cache_file" - rm -f ${wx_arg_cache_file}.tmp - touch ${wx_arg_cache_file}.tmp - touch ${wx_arg_cache_file} - - DEFAULT_wxUSE_ALL_FEATURES=yes DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG @@ -2933,16 +2921,16 @@ DEFAULT_wxUSE_LIBGNOMEVFS=no DEFAULT_wxUSE_LIBHILDON=no DEFAULT_wxUSE_LIBMSPACK=no DEFAULT_wxUSE_LIBSDL=no -DEFAULT_wxUSE_ODBC=no -DEFAULT_wxUSE_OPENGL=no DEFAULT_wxUSE_ACCESSIBILITY=no -DEFAULT_wxUSE_DATAVIEWCTRL=no DEFAULT_wxUSE_GRAPHICS_CONTEXT=no -DEFAULT_wxUSE_MEDIACTRL=no -DEFAULT_wxUSE_TAB_DIALOG=no +DEFAULT_wxUSE_IPV6=no +DEFAULT_wxUSE_GSTREAMER8=no DEFAULT_wxUSE_UNICODE_UTF8=auto +DEFAULT_wxUSE_OPENGL=auto +DEFAULT_wxUSE_MEDIACTRL=auto + DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no DEFAULT_wxUSE_UNIVERSAL_BINARY=no @@ -2954,21 +2942,6 @@ DEFAULT_wxUSE_GTK2=yes DEFAULT_wxUSE_OBJC_UNIQUIFYING=no -for toolkit in `echo $ALL_TOOLKITS`; do - LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}` - if test "x$LINE" != "x" ; then - has_toolkit_in_cache=1 - eval "DEFAULT_$LINE" - eval "CACHE_$toolkit=1" - - LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}` - if test "x$LINE" != "x" ; then - eval "DEFAULT_$LINE" - fi - fi -done - - @@ -2992,25 +2965,15 @@ if test "${enable_gui+set}" = set; then else wx_cv_use_gui='wxUSE_GUI=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}" fi eval "$wx_cv_use_gui" - if test "x$cache" = xyes; then - echo "wxUSE_GUI=$wxUSE_GUI" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GUI = yes; then @@ -3046,25 +3009,15 @@ if test "${enable_monolithic+set}" = set; then else wx_cv_use_monolithic='wxUSE_MONOLITHIC=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}" fi eval "$wx_cv_use_monolithic" - if test "x$cache" = xyes; then - echo "wxUSE_MONOLITHIC=$wxUSE_MONOLITHIC" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MONOLITHIC = yes; then @@ -3100,25 +3053,15 @@ if test "${enable_plugins+set}" = set; then else wx_cv_use_plugins='wxUSE_PLUGINS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}" fi eval "$wx_cv_use_plugins" - if test "x$cache" = xyes; then - echo "wxUSE_PLUGINS=$wxUSE_PLUGINS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PLUGINS = yes; then @@ -3154,25 +3097,15 @@ if test "${with_subdirs+set}" = set; then else wx_cv_use_subdirs='wxWITH_SUBDIRS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}" fi eval "$wx_cv_use_subdirs" - if test "x$cache" = xyes; then - echo "wxWITH_SUBDIRS=$wxWITH_SUBDIRS" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxWITH_SUBDIRS = yes; then @@ -3214,25 +3147,15 @@ if test "${enable_official_build+set}" = set; then else wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}" fi eval "$wx_cv_use_official_build" - if test "x$cache" = xyes; then - echo "wxUSE_OFFICIAL_BUILD=$wxUSE_OFFICIAL_BUILD" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OFFICIAL_BUILD = yes; then @@ -3277,25 +3200,15 @@ if test "${enable_all_features+set}" = set; then else wx_cv_use_all_features='wxUSE_ALL_FEATURES=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}" fi eval "$wx_cv_use_all_features" - if test "x$cache" = xyes; then - echo "wxUSE_ALL_FEATURES=$wxUSE_ALL_FEATURES" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ALL_FEATURES = yes; then @@ -3311,6 +3224,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 @@ -3335,25 +3252,15 @@ if test "${enable_universal+set}" = set; then else wx_cv_use_universal='wxUSE_UNIVERSAL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}" fi eval "$wx_cv_use_universal" - if test "x$cache" = xyes; then - echo "wxUSE_UNIVERSAL=$wxUSE_UNIVERSAL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNIVERSAL = yes; then @@ -3390,9 +3297,21 @@ if test "${with_motif+set}" = set; then fi +# Check whether --with-osx_carbon was given. +if test "${with_osx_carbon+set}" = set; then + withval=$with_osx_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 +fi + + +# Check whether --with-osx_cocoa was given. +if test "${with_osx_cocoa+set}" = set; then + withval=$with_osx_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1 +fi + + # Check whether --with-mac was given. if test "${with_mac+set}" = set; then - withval=$with_mac; wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1 + withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 fi @@ -3464,25 +3383,15 @@ if test "${enable_nanox+set}" = set; then else wx_cv_use_nanox='wxUSE_NANOX=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}" fi eval "$wx_cv_use_nanox" - if test "x$cache" = xyes; then - echo "wxUSE_NANOX=$wxUSE_NANOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NANOX = yes; then @@ -3524,25 +3433,15 @@ if test "${enable_gpe+set}" = set; then else wx_cv_use_gpe='wxUSE_GPE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}" fi eval "$wx_cv_use_gpe" - if test "x$cache" = xyes; then - echo "wxUSE_GPE=$wxUSE_GPE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GPE = yes; then @@ -3559,6 +3458,106 @@ echo "${ECHO_T}$result" >&6; } +{ echo "$as_me:$LINENO: checking for toolkit" >&5 +echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; } + + + +# In Wine, we need to default to MSW, not GTK or MOTIF +if test "$wxUSE_WINE" = "yes"; then + DEFAULT_DEFAULT_wxUSE_GTK=0 + DEFAULT_DEFAULT_wxUSE_MOTIF=0 + DEFAULT_DEFAULT_wxUSE_MSW=1 + wxUSE_SHARED=no + CC=${CC:-winegcc} + CXX=${CXX:-wineg++} +fi + + +if test "$wxUSE_GUI" = "yes"; then + + if test "$USE_BEOS" = 1; then + { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5 +echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} + { (exit 1); exit 1; }; } + fi + + if test "$TOOLKIT_GIVEN" = 1; then + for toolkit in $ALL_TOOLKITS; do + var=wxUSE_$toolkit + eval "value=\$${var}" + if test "x$value" = "xno"; then + eval "$var=0" + elif test "x$value" != "x"; then + eval "$var=1" + fi + + if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then + eval "wx${toolkit}_VERSION=$value" + fi + done + else + for toolkit in $ALL_TOOLKITS; do + var=DEFAULT_DEFAULT_wxUSE_$toolkit + eval "wxUSE_$toolkit=\$${var}" + 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} \ + + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` + + case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` + esac + + case "$NUM_TOOLKITS" in + 1) + ;; + 0) + { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5 +echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;} + { (exit 1); exit 1; }; } + ;; + *) + { { echo "$as_me:$LINENO: error: Please specify at most one toolkit" >&5 +echo "$as_me: error: Please specify at most one toolkit" >&2;} + { (exit 1); exit 1; }; } + esac + + # to be removed when --disable-gtk2 isn't needed + if test "x$wxUSE_GTK2" = "xyes"; then + wxGTK_VERSION=2 + elif test "x$wxUSE_GTK2" = "xno"; then + wxGTK_VERSION=1 + fi + + for toolkit in $ALL_TOOLKITS; do + var=wxUSE_$toolkit + eval "value=\$${var}" + if test "$value" = 1; then + toolkit_echo=`echo $toolkit | tr '[A-Z]' '[a-z]'` + { echo "$as_me:$LINENO: result: $toolkit_echo" >&5 +echo "${ECHO_T}$toolkit_echo" >&6; } + fi + done +else + if test "x$host_alias" != "x"; then + { echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5 +echo "${ECHO_T}base ($host_alias hosted) only" >&6; } + else + { echo "$as_me:$LINENO: result: base only" >&5 +echo "${ECHO_T}base only" >&6; } + fi +fi + +wxUSE_MAC=0 +if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then + wxUSE_MAC=1 +fi + + { echo "$as_me:$LINENO: checking for --with-libpng" >&5 echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; } @@ -3579,25 +3578,15 @@ if test "${with_libpng+set}" = set; then echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libpng" - if test "x$cache" = xyes; then - echo "wxUSE_LIBPNG=$wxUSE_LIBPNG" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBPNG" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3637,25 +3626,15 @@ if test "${with_libjpeg+set}" = set; then echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libjpeg" - if test "x$cache" = xyes; then - echo "wxUSE_LIBJPEG=$wxUSE_LIBJPEG" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBJPEG" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3695,25 +3674,15 @@ if test "${with_libtiff+set}" = set; then echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libtiff" - if test "x$cache" = xyes; then - echo "wxUSE_LIBTIFF=$wxUSE_LIBTIFF" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBTIFF" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3753,25 +3722,15 @@ if test "${with_libxpm+set}" = set; then echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libxpm" - if test "x$cache" = xyes; then - echo "wxUSE_LIBXPM=$wxUSE_LIBXPM" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBXPM" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3792,6 +3751,50 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or fi + withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${withstring:-with}-libiconv" >&5 +echo $ECHO_N "checking for --${withstring:-with}-libiconv... $ECHO_C" >&6; } + +# Check whether --with-libiconv was given. +if test "${with_libiconv+set}" = set; then + withval=$with_libiconv; + if test "$withval" = yes; then + wx_cv_use_libiconv='wxUSE_LIBICONV=yes' + else + wx_cv_use_libiconv='wxUSE_LIBICONV=no' + fi + +else + + wx_cv_use_libiconv='wxUSE_LIBICONV=${'DEFAULT_wxUSE_LIBICONV":-$defaultval}" + +fi + + + eval "$wx_cv_use_libiconv" + + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBICONV = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_LIBICONV + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + withstring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -3812,25 +3815,15 @@ if test "${with_libmspack+set}" = set; then else wx_cv_use_libmspack='wxUSE_LIBMSPACK=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}" fi eval "$wx_cv_use_libmspack" - if test "x$cache" = xyes; then - echo "wxUSE_LIBMSPACK=$wxUSE_LIBMSPACK" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBMSPACK = yes; then @@ -3846,6 +3839,50 @@ fi echo "${ECHO_T}$result" >&6; } + withstring=without + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${withstring:-with}-gtkprint" >&5 +echo $ECHO_N "checking for --${withstring:-with}-gtkprint... $ECHO_C" >&6; } + +# Check whether --with-gtkprint was given. +if test "${with_gtkprint+set}" = set; then + withval=$with_gtkprint; + if test "$withval" = yes; then + wx_cv_use_gtkprint='wxUSE_GTKPRINT=yes' + else + wx_cv_use_gtkprint='wxUSE_GTKPRINT=no' + fi + +else + + wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}" + +fi + + + eval "$wx_cv_use_gtkprint" + + if test x"$withstring" = xwithout; then + if test $wxUSE_GTKPRINT = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_GTKPRINT + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + withstring=without defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -3866,25 +3903,15 @@ if test "${with_gnomeprint+set}" = set; then else wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}" fi eval "$wx_cv_use_gnomeprint" - if test "x$cache" = xyes; then - echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBGNOMEPRINT = yes; then @@ -3920,25 +3947,15 @@ if test "${with_gnomevfs+set}" = set; then else wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" fi eval "$wx_cv_use_gnomevfs" - if test "x$cache" = xyes; then - echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBGNOMEVFS = yes; then @@ -3974,25 +3991,15 @@ if test "${with_hildon+set}" = set; then else wx_cv_use_hildon='wxUSE_LIBHILDON=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}" fi eval "$wx_cv_use_hildon" - if test "x$cache" = xyes; then - echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBHILDON = yes; then @@ -4028,25 +4035,15 @@ if test "${with_opengl+set}" = set; then else wx_cv_use_opengl='wxUSE_OPENGL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}" fi eval "$wx_cv_use_opengl" - if test "x$cache" = xyes; then - echo "wxUSE_OPENGL=$wxUSE_OPENGL" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_OPENGL = yes; then @@ -4085,25 +4082,15 @@ if test "${with_dmalloc+set}" = set; then else wx_cv_use_dmalloc='wxUSE_DMALLOC=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}" fi eval "$wx_cv_use_dmalloc" - if test "x$cache" = xyes; then - echo "wxUSE_DMALLOC=$wxUSE_DMALLOC" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_DMALLOC = yes; then @@ -4139,25 +4126,15 @@ if test "${with_sdl+set}" = set; then else wx_cv_use_sdl='wxUSE_LIBSDL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}" fi eval "$wx_cv_use_sdl" - if test "x$cache" = xyes; then - echo "wxUSE_LIBSDL=$wxUSE_LIBSDL" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBSDL = yes; then @@ -4192,25 +4169,15 @@ if test "${with_regex+set}" = set; then echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_regex" - if test "x$cache" = xyes; then - echo "wxUSE_REGEX=$wxUSE_REGEX" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_REGEX" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -4250,25 +4217,15 @@ if test "${with_zlib+set}" = set; then echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_zlib" - if test "x$cache" = xyes; then - echo "wxUSE_ZLIB=$wxUSE_ZLIB" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_ZLIB" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -4289,64 +4246,6 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b fi - { echo "$as_me:$LINENO: checking for --with-odbc" >&5 -echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; } - -# Check whether --with-odbc was given. -if test "${with_odbc+set}" = set; then - withval=$with_odbc; - if test "$withval" = yes; then - wx_cv_use_odbc='wxUSE_ODBC=yes' - elif test "$withval" = no; then - wx_cv_use_odbc='wxUSE_ODBC=no' - elif test "$withval" = sys; then - wx_cv_use_odbc='wxUSE_ODBC=sys' - elif test "$withval" = builtin; then - wx_cv_use_odbc='wxUSE_ODBC=builtin' - else - { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5 -echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;} - { (exit 1); exit 1; }; } - fi - cache=yes - -else - - cache=no - LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}" - -fi - - - eval "$wx_cv_use_odbc" - if test "x$cache" = xyes; then - echo "wxUSE_ODBC=$wxUSE_ODBC" >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_ODBC" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - elif test "$wxUSE_ODBC" = no; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - elif test "$wxUSE_ODBC" = sys; then - { echo "$as_me:$LINENO: result: system version" >&5 -echo "${ECHO_T}system version" >&6; } - elif test "$wxUSE_ODBC" = builtin; then - { echo "$as_me:$LINENO: result: builtin version" >&5 -echo "${ECHO_T}builtin version" >&6; } - else - { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5 -echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;} - { (exit 1); exit 1; }; } - fi - - { echo "$as_me:$LINENO: checking for --with-expat" >&5 echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; } @@ -4366,25 +4265,15 @@ if test "${with_expat+set}" = set; then echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_expat" - if test "x$cache" = xyes; then - echo "wxUSE_EXPAT=$wxUSE_EXPAT" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_EXPAT" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -4413,18 +4302,6 @@ if test "${with_macosx_sdk+set}" = set; then withval=$with_macosx_sdk; wxUSE_MACOSX_SDK=$withval wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval" - echo "wxUSE_MACOSX_SDK=$wxUSE_MACOSX_SDK" >> ${wx_arg_cache_file}.tmp - -else - - # NOTE: Empty string on purpose so that --without-macosx-sdk (thus no) - # will override --enable-universal_binary's automatic SDK usage. - wxUSE_MACOSX_SDK= - LINE=`grep "^wxUSE_MACOSX_SDK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "$LINE" - echo "$LINE" >> ${wx_arg_cache_file}.tmp - fi fi @@ -4439,19 +4316,6 @@ if test "${with_macosx_version_min+set}" = set; then withval=$with_macosx_version_min; wxUSE_MACOSX_VERSION_MIN=$withval wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval" - echo "wxUSE_MACOSX_VERSION_MIN=$wxUSE_MACOSX_VERSION_MIN" >> ${wx_arg_cache_file}.tmp - -else - - # default "yes" because when not using an SDK it means the same as no - # but when using an SDK it means to use the SDK version - wxUSE_MACOSX_VERSION_MIN=yes - # See if there is a value in the cache - LINE=`grep "^wxUSE_MACOSX_VERSION_MIN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "$LINE" - echo "$LINE" >> ${wx_arg_cache_file}.tmp - fi fi @@ -4480,25 +4344,15 @@ if test "${enable_shared+set}" = set; then else wx_cv_use_shared='wxUSE_SHARED=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" fi eval "$wx_cv_use_shared" - if test "x$cache" = xyes; then - echo "wxUSE_SHARED=$wxUSE_SHARED" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SHARED = yes; then @@ -4514,60 +4368,6 @@ 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}-optimise" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; } - # Check whether --enable-optimise was given. -if test "${enable_optimise+set}" = set; then - enableval=$enable_optimise; - if test "$enableval" = yes; then - wx_cv_use_optimise='wxUSE_OPTIMISE=yes' - else - wx_cv_use_optimise='wxUSE_OPTIMISE=no' - fi - cache=yes - -else - - cache=no - LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" - -fi - - - eval "$wx_cv_use_optimise" - if test "x$cache" = xyes; then - echo "wxUSE_OPTIMISE=$wxUSE_OPTIMISE" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_OPTIMISE = yes; then - result=no - else - 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 @@ -4588,25 +4388,15 @@ if test "${enable_debug+set}" = set; then else wx_cv_use_debug='wxUSE_DEBUG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}" fi eval "$wx_cv_use_debug" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUG=$wxUSE_DEBUG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG = yes; then @@ -4642,25 +4432,15 @@ if test "${enable_stl+set}" = set; then else wx_cv_use_stl='wxUSE_STL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}" fi eval "$wx_cv_use_stl" - if test "x$cache" = xyes; then - echo "wxUSE_STL=$wxUSE_STL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STL = yes; then @@ -4696,25 +4476,15 @@ if test "${enable_std_iostreams+set}" = set; then else wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}" fi eval "$wx_cv_use_std_iostreams" - if test "x$cache" = xyes; then - echo "wxUSE_STD_IOSTREAM=$wxUSE_STD_IOSTREAM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STD_IOSTREAM = yes; then @@ -4750,25 +4520,15 @@ if test "${enable_std_string+set}" = set; then else wx_cv_use_std_string='wxUSE_STD_STRING=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}" fi eval "$wx_cv_use_std_string" - if test "x$cache" = xyes; then - echo "wxUSE_STD_STRING=$wxUSE_STD_STRING" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STD_STRING = yes; then @@ -4804,25 +4564,15 @@ if test "${enable_unicode+set}" = set; then else wx_cv_use_unicode='wxUSE_UNICODE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}" fi eval "$wx_cv_use_unicode" - if test "x$cache" = xyes; then - echo "wxUSE_UNICODE=$wxUSE_UNICODE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNICODE = yes; then @@ -4858,25 +4608,15 @@ if test "${enable_mslu+set}" = set; then else wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}" fi eval "$wx_cv_use_mslu" - if test "x$cache" = xyes; then - echo "wxUSE_UNICODE_MSLU=$wxUSE_UNICODE_MSLU" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNICODE_MSLU = yes; then @@ -4899,25 +4639,15 @@ echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; } if test "${enable_utf8+set}" = set; then enableval=$enable_utf8; wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'" - cache=yes else - cache=no - LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8 fi eval "$wx_cv_use_utf8" - if test "x$cache" = xyes; then - echo "wxUSE_UNICODE_UTF8=$wxUSE_UNICODE_UTF8" >> ${wx_arg_cache_file}.tmp - fi { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5 echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; } @@ -4943,25 +4673,15 @@ if test "${enable_utf8only+set}" = set; then else wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}" fi eval "$wx_cv_use_utf8only" - if test "x$cache" = xyes; then - echo "wxUSE_UNICODE_UTF8_LOCALE=$wxUSE_UNICODE_UTF8_LOCALE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then @@ -4997,25 +4717,15 @@ if test "${enable_extended_rtti+set}" = set; then else wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}" fi eval "$wx_cv_use_extended_rtti" - if test "x$cache" = xyes; then - echo "wxUSE_EXTENDED_RTTI=$wxUSE_EXTENDED_RTTI" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_EXTENDED_RTTI = yes; then @@ -5030,7 +4740,7 @@ fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } -if test "$USE_OS2" = "1"; then +if test "$USE_OS2" = 1; then DEFAULT_wxUSE_OMF=no enablestring= @@ -5053,25 +4763,15 @@ if test "${enable_omf+set}" = set; then else wx_cv_use_omf='wxUSE_OMF=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}" fi eval "$wx_cv_use_omf" - if test "x$cache" = xyes; then - echo "wxUSE_OMF=$wxUSE_OMF" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OMF = yes; then @@ -5089,13 +4789,13 @@ echo "${ECHO_T}$result" >&6; } fi if test "$wxUSE_DEBUG" = "yes"; then - DEFAULT_wxUSE_DEBUG_FLAG=yes - DEFAULT_wxUSE_DEBUG_INFO=yes - BUILD=debug + 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 + DEFAULT_wxUSE_DEBUG_FLAG=no + DEFAULT_wxUSE_DEBUG_INFO=no + BUILD=release fi @@ -5119,25 +4819,15 @@ if test "${enable_debug_flag+set}" = set; then else wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" fi eval "$wx_cv_use_debug_flag" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUG_FLAG=$wxUSE_DEBUG_FLAG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_FLAG = yes; then @@ -5173,25 +4863,15 @@ if test "${enable_debug_info+set}" = set; then else wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" fi eval "$wx_cv_use_debug_info" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUG_INFO=$wxUSE_DEBUG_INFO" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_INFO = yes; then @@ -5207,6 +4887,61 @@ fi 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 + + + 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}-optimise" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; } + # Check whether --enable-optimise was given. +if test "${enable_optimise+set}" = set; then + enableval=$enable_optimise; + if test "$enableval" = yes; then + wx_cv_use_optimise='wxUSE_OPTIMISE=yes' + else + wx_cv_use_optimise='wxUSE_OPTIMISE=no' + fi + +else + + wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" + +fi + + + eval "$wx_cv_use_optimise" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_OPTIMISE = yes; then + result=no + else + 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 @@ -5227,25 +4962,15 @@ if test "${enable_debug_gdb+set}" = set; then else wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" fi eval "$wx_cv_use_debug_gdb" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUG_GDB=$wxUSE_DEBUG_GDB" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_GDB = yes; then @@ -5281,25 +5006,15 @@ if test "${enable_debug_cntxt+set}" = set; then else wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" fi eval "$wx_cv_use_debug_cntxt" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUG_CONTEXT=$wxUSE_DEBUG_CONTEXT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_CONTEXT = yes; then @@ -5335,25 +5050,15 @@ if test "${enable_mem_tracing+set}" = set; then else wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" fi eval "$wx_cv_use_mem_tracing" - if test "x$cache" = xyes; then - echo "wxUSE_MEM_TRACING=$wxUSE_MEM_TRACING" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MEM_TRACING = yes; then @@ -5389,25 +5094,15 @@ if test "${enable_profile+set}" = set; then else wx_cv_use_profile='wxUSE_PROFILE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}" fi eval "$wx_cv_use_profile" - if test "x$cache" = xyes; then - echo "wxUSE_PROFILE=$wxUSE_PROFILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROFILE = yes; then @@ -5443,25 +5138,15 @@ if test "${enable_no_rtti+set}" = set; then else wx_cv_use_no_rtti='wxUSE_NO_RTTI=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}" fi eval "$wx_cv_use_no_rtti" - if test "x$cache" = xyes; then - echo "wxUSE_NO_RTTI=$wxUSE_NO_RTTI" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NO_RTTI = yes; then @@ -5497,25 +5182,15 @@ if test "${enable_no_exceptions+set}" = set; then else wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}" fi eval "$wx_cv_use_no_exceptions" - if test "x$cache" = xyes; then - echo "wxUSE_NO_EXCEPTIONS=$wxUSE_NO_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NO_EXCEPTIONS = yes; then @@ -5551,25 +5226,15 @@ if test "${enable_permissive+set}" = set; then else wx_cv_use_permissive='wxUSE_PERMISSIVE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}" fi eval "$wx_cv_use_permissive" - if test "x$cache" = xyes; then - echo "wxUSE_PERMISSIVE=$wxUSE_PERMISSIVE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PERMISSIVE = yes; then @@ -5605,25 +5270,15 @@ if test "${enable_no_deps+set}" = set; then else wx_cv_use_no_deps='wxUSE_NO_DEPS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}" fi eval "$wx_cv_use_no_deps" - if test "x$cache" = xyes; then - echo "wxUSE_NO_DEPS=$wxUSE_NO_DEPS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NO_DEPS = yes; then @@ -5659,25 +5314,15 @@ if test "${enable_vararg_macros+set}" = set; then else wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}" fi eval "$wx_cv_use_vararg_macros" - if test "x$cache" = xyes; then - echo "wxUSE_VARARG_MACROS=$wxUSE_VARARG_MACROS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_VARARG_MACROS = yes; then @@ -5700,25 +5345,15 @@ echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C if test "${enable_universal_binary+set}" = set; then enableval=$enable_universal_binary; wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'" - cache=yes else - cache=no - LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY fi eval "$wx_cv_use_universal_binary" - if test "x$cache" = xyes; then - echo "wxUSE_UNIVERSAL_BINARY=$wxUSE_UNIVERSAL_BINARY" >> ${wx_arg_cache_file}.tmp - fi { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5 echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; } @@ -5745,25 +5380,15 @@ if test "${enable_compat26+set}" = set; then else wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no' fi - cache=yes else - cache=no - LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}" fi eval "$wx_cv_use_compat26" - if test "x$cache" = xyes; then - echo "WXWIN_COMPATIBILITY_2_6=$WXWIN_COMPATIBILITY_2_6" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $WXWIN_COMPATIBILITY_2_6 = yes; then @@ -5799,25 +5424,15 @@ if test "${enable_compat28+set}" = set; then else wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no' fi - cache=yes else - cache=no - LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" fi eval "$wx_cv_use_compat28" - if test "x$cache" = xyes; then - echo "WXWIN_COMPATIBILITY_2_8=$WXWIN_COMPATIBILITY_2_8" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $WXWIN_COMPATIBILITY_2_8 = yes; then @@ -5854,25 +5469,15 @@ if test "${enable_rpath+set}" = set; then else wx_cv_use_rpath='wxUSE_RPATH=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}" fi eval "$wx_cv_use_rpath" - if test "x$cache" = xyes; then - echo "wxUSE_RPATH=$wxUSE_RPATH" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RPATH = yes; then @@ -5909,25 +5514,15 @@ if test "${enable_objc_uniquifying+set}" = set; then else wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}" fi eval "$wx_cv_use_objc_uniquifying" - if test "x$cache" = xyes; then - echo "wxUSE_OBJC_UNIQUIFYING=$wxUSE_OBJC_UNIQUIFYING" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OBJC_UNIQUIFYING = yes; then @@ -5964,25 +5559,15 @@ if test "${enable_visibility+set}" = set; then else wx_cv_use_visibility='wxUSE_VISIBILITY=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}" fi eval "$wx_cv_use_visibility" - if test "x$cache" = xyes; then - echo "wxUSE_VISIBILITY=$wxUSE_VISIBILITY" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_VISIBILITY = yes; then @@ -6020,25 +5605,15 @@ if test "${enable_intl+set}" = set; then else wx_cv_use_intl='wxUSE_INTL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}" fi eval "$wx_cv_use_intl" - if test "x$cache" = xyes; then - echo "wxUSE_INTL=$wxUSE_INTL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_INTL = yes; then @@ -6054,6 +5629,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}-xlocale" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-xlocale... $ECHO_C" >&6; } + # Check whether --enable-xlocale was given. +if test "${enable_xlocale+set}" = set; then + enableval=$enable_xlocale; + if test "$enableval" = yes; then + wx_cv_use_xlocale='wxUSE_XLOCALE=yes' + else + wx_cv_use_xlocale='wxUSE_XLOCALE=no' + fi + +else + + wx_cv_use_xlocale='wxUSE_XLOCALE=${'DEFAULT_wxUSE_XLOCALE":-$defaultval}" + +fi + + + eval "$wx_cv_use_xlocale" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_XLOCALE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_XLOCALE + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -6074,25 +5693,15 @@ if test "${enable_config+set}" = set; then else wx_cv_use_config='wxUSE_CONFIG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}" fi eval "$wx_cv_use_config" - if test "x$cache" = xyes; then - echo "wxUSE_CONFIG=$wxUSE_CONFIG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONFIG = yes; then @@ -6129,25 +5738,15 @@ if test "${enable_protocols+set}" = set; then else wx_cv_use_protocols='wxUSE_PROTOCOL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi eval "$wx_cv_use_protocols" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL = yes; then @@ -6183,25 +5782,15 @@ if test "${enable_ftp+set}" = set; then else wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi eval "$wx_cv_use_ftp" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FTP = yes; then @@ -6237,25 +5826,15 @@ if test "${enable_http+set}" = set; then else wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi eval "$wx_cv_use_http" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_HTTP = yes; then @@ -6291,25 +5870,15 @@ if test "${enable_fileproto+set}" = set; then else wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi eval "$wx_cv_use_fileproto" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FILE = yes; then @@ -6345,25 +5914,15 @@ if test "${enable_sockets+set}" = set; then else wx_cv_use_sockets='wxUSE_SOCKETS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}" fi eval "$wx_cv_use_sockets" - if test "x$cache" = xyes; then - echo "wxUSE_SOCKETS=$wxUSE_SOCKETS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SOCKETS = yes; then @@ -6379,6 +5938,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}-ipv6" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ipv6... $ECHO_C" >&6; } + # Check whether --enable-ipv6 was given. +if test "${enable_ipv6+set}" = set; then + enableval=$enable_ipv6; + if test "$enableval" = yes; then + wx_cv_use_ipv6='wxUSE_IPV6=yes' + else + wx_cv_use_ipv6='wxUSE_IPV6=no' + fi + +else + + wx_cv_use_ipv6='wxUSE_IPV6=${'DEFAULT_wxUSE_IPV6":-$defaultval}" + +fi + + + eval "$wx_cv_use_ipv6" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_IPV6 = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_IPV6 + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -6399,25 +6002,15 @@ if test "${enable_ole+set}" = set; then else wx_cv_use_ole='wxUSE_OLE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}" fi eval "$wx_cv_use_ole" - if test "x$cache" = xyes; then - echo "wxUSE_OLE=$wxUSE_OLE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OLE = yes; then @@ -6453,25 +6046,15 @@ if test "${enable_dataobj+set}" = set; then else wx_cv_use_dataobj='wxUSE_DATAOBJ=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}" fi eval "$wx_cv_use_dataobj" - if test "x$cache" = xyes; then - echo "wxUSE_DATAOBJ=$wxUSE_DATAOBJ" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATAOBJ = yes; then @@ -6508,25 +6091,15 @@ if test "${enable_ipc+set}" = set; then else wx_cv_use_ipc='wxUSE_IPC=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}" fi eval "$wx_cv_use_ipc" - if test "x$cache" = xyes; then - echo "wxUSE_IPC=$wxUSE_IPC" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_IPC = yes; then @@ -6563,25 +6136,15 @@ if test "${enable_baseevtloop+set}" = set; then else wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}" fi eval "$wx_cv_use_baseevtloop" - if test "x$cache" = xyes; then - echo "wxUSE_CONSOLE_EVENTLOOP=$wxUSE_CONSOLE_EVENTLOOP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONSOLE_EVENTLOOP = yes; then @@ -6607,35 +6170,25 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epoolloop" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-epoolloop... $ECHO_C" >&6; } - # Check whether --enable-epoolloop was given. -if test "${enable_epoolloop+set}" = set; then - enableval=$enable_epoolloop; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epollloop" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-epollloop... $ECHO_C" >&6; } + # Check whether --enable-epollloop was given. +if test "${enable_epollloop+set}" = set; then + enableval=$enable_epollloop; if test "$enableval" = yes; then - wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes' + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=yes' else - wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=no' + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" fi - eval "$wx_cv_use_epoolloop" - if test "x$cache" = xyes; then - echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_epollloop" if test x"$enablestring" = xdisable; then if test $wxUSE_EPOLL_DISPATCHER = yes; then @@ -6671,25 +6224,15 @@ if test "${enable_selectloop+set}" = set; then else wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}" fi eval "$wx_cv_use_selectloop" - if test "x$cache" = xyes; then - echo "wxUSE_SELECT_DISPATCHER=$wxUSE_SELECT_DISPATCHER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SELECT_DISPATCHER = yes; then @@ -6726,25 +6269,15 @@ if test "${enable_apple_ieee+set}" = set; then else wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}" fi eval "$wx_cv_use_apple_ieee" - if test "x$cache" = xyes; then - echo "wxUSE_APPLE_IEEE=$wxUSE_APPLE_IEEE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_APPLE_IEEE = yes; then @@ -6780,25 +6313,15 @@ if test "${enable_arcstream+set}" = set; then else wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}" fi eval "$wx_cv_use_arcstream" - if test "x$cache" = xyes; then - echo "wxUSE_ARCHIVE_STREAMS=$wxUSE_ARCHIVE_STREAMS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ARCHIVE_STREAMS = yes; then @@ -6834,25 +6357,15 @@ if test "${enable_base64+set}" = set; then else wx_cv_use_base64='wxUSE_BASE64=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}" fi eval "$wx_cv_use_base64" - if test "x$cache" = xyes; then - echo "wxUSE_BASE64=$wxUSE_BASE64" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BASE64 = yes; then @@ -6888,25 +6401,15 @@ if test "${enable_backtrace+set}" = set; then else wx_cv_use_backtrace='wxUSE_STACKWALKER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}" fi eval "$wx_cv_use_backtrace" - if test "x$cache" = xyes; then - echo "wxUSE_STACKWALKER=$wxUSE_STACKWALKER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STACKWALKER = yes; then @@ -6942,25 +6445,15 @@ if test "${enable_catch_segvs+set}" = set; then else wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}" fi eval "$wx_cv_use_catch_segvs" - if test "x$cache" = xyes; then - echo "wxUSE_ON_FATAL_EXCEPTION=$wxUSE_ON_FATAL_EXCEPTION" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ON_FATAL_EXCEPTION = yes; then @@ -6996,25 +6489,15 @@ if test "${enable_cmdline+set}" = set; then else wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}" fi eval "$wx_cv_use_cmdline" - if test "x$cache" = xyes; then - echo "wxUSE_CMDLINE_PARSER=$wxUSE_CMDLINE_PARSER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CMDLINE_PARSER = yes; then @@ -7050,25 +6533,15 @@ if test "${enable_datetime+set}" = set; then else wx_cv_use_datetime='wxUSE_DATETIME=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}" fi eval "$wx_cv_use_datetime" - if test "x$cache" = xyes; then - echo "wxUSE_DATETIME=$wxUSE_DATETIME" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATETIME = yes; then @@ -7104,25 +6577,15 @@ if test "${enable_debugreport+set}" = set; then else wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}" fi eval "$wx_cv_use_debugreport" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUGREPORT=$wxUSE_DEBUGREPORT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUGREPORT = yes; then @@ -7158,25 +6621,15 @@ if test "${enable_dialupman+set}" = set; then else wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}" fi eval "$wx_cv_use_dialupman" - if test "x$cache" = xyes; then - echo "wxUSE_DIALUP_MANAGER=$wxUSE_DIALUP_MANAGER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DIALUP_MANAGER = yes; then @@ -7212,25 +6665,15 @@ if test "${enable_dynlib+set}" = set; then else wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}" fi eval "$wx_cv_use_dynlib" - if test "x$cache" = xyes; then - echo "wxUSE_DYNLIB_CLASS=$wxUSE_DYNLIB_CLASS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DYNLIB_CLASS = yes; then @@ -7266,25 +6709,15 @@ if test "${enable_dynamicloader+set}" = set; then else wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}" fi eval "$wx_cv_use_dynamicloader" - if test "x$cache" = xyes; then - echo "wxUSE_DYNAMIC_LOADER=$wxUSE_DYNAMIC_LOADER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DYNAMIC_LOADER = yes; then @@ -7320,25 +6753,15 @@ if test "${enable_exceptions+set}" = set; then else wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}" fi eval "$wx_cv_use_exceptions" - if test "x$cache" = xyes; then - echo "wxUSE_EXCEPTIONS=$wxUSE_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_EXCEPTIONS = yes; then @@ -7374,25 +6797,15 @@ if test "${enable_ffile+set}" = set; then else wx_cv_use_ffile='wxUSE_FFILE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}" fi eval "$wx_cv_use_ffile" - if test "x$cache" = xyes; then - echo "wxUSE_FFILE=$wxUSE_FFILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FFILE = yes; then @@ -7428,25 +6841,15 @@ if test "${enable_file+set}" = set; then else wx_cv_use_file='wxUSE_FILE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}" fi eval "$wx_cv_use_file" - if test "x$cache" = xyes; then - echo "wxUSE_FILE=$wxUSE_FILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILE = yes; then @@ -7482,25 +6885,15 @@ if test "${enable_filesystem+set}" = set; then else wx_cv_use_filesystem='wxUSE_FILESYSTEM=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}" fi eval "$wx_cv_use_filesystem" - if test "x$cache" = xyes; then - echo "wxUSE_FILESYSTEM=$wxUSE_FILESYSTEM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILESYSTEM = yes; then @@ -7536,25 +6929,15 @@ if test "${enable_fontenum+set}" = set; then else wx_cv_use_fontenum='wxUSE_FONTENUM=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}" fi eval "$wx_cv_use_fontenum" - if test "x$cache" = xyes; then - echo "wxUSE_FONTENUM=$wxUSE_FONTENUM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTENUM = yes; then @@ -7590,25 +6973,15 @@ if test "${enable_fontmap+set}" = set; then else wx_cv_use_fontmap='wxUSE_FONTMAP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}" fi eval "$wx_cv_use_fontmap" - if test "x$cache" = xyes; then - echo "wxUSE_FONTMAP=$wxUSE_FONTMAP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTMAP = yes; then @@ -7644,25 +7017,15 @@ if test "${enable_fs_archive+set}" = set; then else wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}" fi eval "$wx_cv_use_fs_archive" - if test "x$cache" = xyes; then - echo "wxUSE_FS_ARCHIVE=$wxUSE_FS_ARCHIVE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FS_ARCHIVE = yes; then @@ -7698,25 +7061,15 @@ if test "${enable_fs_inet+set}" = set; then else wx_cv_use_fs_inet='wxUSE_FS_INET=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}" fi eval "$wx_cv_use_fs_inet" - if test "x$cache" = xyes; then - echo "wxUSE_FS_INET=$wxUSE_FS_INET" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FS_INET = yes; then @@ -7752,25 +7105,15 @@ if test "${enable_fs_zip+set}" = set; then else wx_cv_use_fs_zip='wxUSE_FS_ZIP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}" fi eval "$wx_cv_use_fs_zip" - if test "x$cache" = xyes; then - echo "wxUSE_FS_ZIP=$wxUSE_FS_ZIP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FS_ZIP = yes; then @@ -7806,25 +7149,15 @@ if test "${enable_geometry+set}" = set; then else wx_cv_use_geometry='wxUSE_GEOMETRY=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}" fi eval "$wx_cv_use_geometry" - if test "x$cache" = xyes; then - echo "wxUSE_GEOMETRY=$wxUSE_GEOMETRY" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GEOMETRY = yes; then @@ -7860,25 +7193,15 @@ if test "${enable_log+set}" = set; then else wx_cv_use_log='wxUSE_LOG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}" fi eval "$wx_cv_use_log" - if test "x$cache" = xyes; then - echo "wxUSE_LOG=$wxUSE_LOG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LOG = yes; then @@ -7914,25 +7237,15 @@ if test "${enable_longlong+set}" = set; then else wx_cv_use_longlong='wxUSE_LONGLONG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}" fi eval "$wx_cv_use_longlong" - if test "x$cache" = xyes; then - echo "wxUSE_LONGLONG=$wxUSE_LONGLONG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LONGLONG = yes; then @@ -7968,25 +7281,15 @@ if test "${enable_mimetype+set}" = set; then else wx_cv_use_mimetype='wxUSE_MIMETYPE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}" fi eval "$wx_cv_use_mimetype" - if test "x$cache" = xyes; then - echo "wxUSE_MIMETYPE=$wxUSE_MIMETYPE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MIMETYPE = yes; then @@ -8002,6 +7305,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}-printfposparam" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; } + # Check whether --enable-printfposparam was given. +if test "${enable_printfposparam+set}" = set; then + enableval=$enable_printfposparam; + if test "$enableval" = yes; then + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes' + else + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' + fi + +else + + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" + +fi + + + eval "$wx_cv_use_printfposparam" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PRINTF_POS_PARAMS = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_PRINTF_POS_PARAMS + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -8022,25 +7369,15 @@ if test "${enable_snglinst+set}" = set; then else wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}" fi eval "$wx_cv_use_snglinst" - if test "x$cache" = xyes; then - echo "wxUSE_SNGLINST_CHECKER=$wxUSE_SNGLINST_CHECKER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SNGLINST_CHECKER = yes; then @@ -8056,6 +7393,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}-sound" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; } + # Check whether --enable-sound was given. +if test "${enable_sound+set}" = set; then + enableval=$enable_sound; + if test "$enableval" = yes; then + wx_cv_use_sound='wxUSE_SOUND=yes' + else + wx_cv_use_sound='wxUSE_SOUND=no' + fi + +else + + wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" + +fi + + + eval "$wx_cv_use_sound" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_SOUND = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_SOUND + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -8076,25 +7457,15 @@ if test "${enable_stdpaths+set}" = set; then else wx_cv_use_stdpaths='wxUSE_STDPATHS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}" fi eval "$wx_cv_use_stdpaths" - if test "x$cache" = xyes; then - echo "wxUSE_STDPATHS=$wxUSE_STDPATHS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STDPATHS = yes; then @@ -8130,25 +7501,15 @@ if test "${enable_stopwatch+set}" = set; then else wx_cv_use_stopwatch='wxUSE_STOPWATCH=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}" fi eval "$wx_cv_use_stopwatch" - if test "x$cache" = xyes; then - echo "wxUSE_STOPWATCH=$wxUSE_STOPWATCH" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STOPWATCH = yes; then @@ -8184,25 +7545,15 @@ if test "${enable_streams+set}" = set; then else wx_cv_use_streams='wxUSE_STREAMS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}" fi eval "$wx_cv_use_streams" - if test "x$cache" = xyes; then - echo "wxUSE_STREAMS=$wxUSE_STREAMS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STREAMS = yes; then @@ -8238,25 +7589,15 @@ if test "${enable_system_options+set}" = set; then else wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" fi eval "$wx_cv_use_system_options" - if test "x$cache" = xyes; then - echo "wxUSE_SYSTEM_OPTIONS=$wxUSE_SYSTEM_OPTIONS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SYSTEM_OPTIONS = yes; then @@ -8292,25 +7633,15 @@ if test "${enable_tarstream+set}" = set; then else wx_cv_use_tarstream='wxUSE_TARSTREAM=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}" fi eval "$wx_cv_use_tarstream" - if test "x$cache" = xyes; then - echo "wxUSE_TARSTREAM=$wxUSE_TARSTREAM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TARSTREAM = yes; then @@ -8346,25 +7677,15 @@ if test "${enable_textbuf+set}" = set; then else wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}" fi eval "$wx_cv_use_textbuf" - if test "x$cache" = xyes; then - echo "wxUSE_TEXTBUFFER=$wxUSE_TEXTBUFFER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTBUFFER = yes; then @@ -8400,25 +7721,15 @@ if test "${enable_textfile+set}" = set; then else wx_cv_use_textfile='wxUSE_TEXTFILE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}" fi eval "$wx_cv_use_textfile" - if test "x$cache" = xyes; then - echo "wxUSE_TEXTFILE=$wxUSE_TEXTFILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTFILE = yes; then @@ -8454,25 +7765,15 @@ if test "${enable_timer+set}" = set; then else wx_cv_use_timer='wxUSE_TIMER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}" fi eval "$wx_cv_use_timer" - if test "x$cache" = xyes; then - echo "wxUSE_TIMER=$wxUSE_TIMER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TIMER = yes; then @@ -8498,206 +7799,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; } - # Check whether --enable-sound was given. -if test "${enable_sound+set}" = set; then - enableval=$enable_sound; - if test "$enableval" = yes; then - wx_cv_use_sound='wxUSE_SOUND=yes' - else - wx_cv_use_sound='wxUSE_SOUND=no' - fi - cache=yes - -else - - cache=no - LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" - -fi - - - eval "$wx_cv_use_sound" - if test "x$cache" = xyes; then - echo "wxUSE_SOUND=$wxUSE_SOUND" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_SOUND = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_SOUND - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; } - # Check whether --enable-mediactrl was given. -if test "${enable_mediactrl+set}" = set; then - enableval=$enable_mediactrl; - if test "$enableval" = yes; then - wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' - else - wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no' - fi - cache=yes - -else - - cache=no - LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" - -fi - - - eval "$wx_cv_use_mediactrl" - if test "x$cache" = xyes; then - echo "wxUSE_MEDIACTRL=$wxUSE_MEDIACTRL" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_MEDIACTRL = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_MEDIACTRL - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; } - # Check whether --enable-gstreamer8 was given. -if test "${enable_gstreamer8+set}" = set; then - enableval=$enable_gstreamer8; - if test "$enableval" = yes; then - wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes' - else - wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no' - fi - cache=yes - -else - - cache=no - LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" - -fi - - - eval "$wx_cv_use_gstreamer8" - if test "x$cache" = xyes; then - echo "wxUSE_GSTREAMER8=$wxUSE_GSTREAMER8" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_GSTREAMER8 = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_GSTREAMER8 - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; } - # Check whether --enable-printfposparam was given. -if test "${enable_printfposparam+set}" = set; then - enableval=$enable_printfposparam; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; } + # Check whether --enable-variant was given. +if test "${enable_variant+set}" = set; then + enableval=$enable_variant; if test "$enableval" = yes; then - wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes' + wx_cv_use_variant='wxUSE_VARIANT=yes' else - wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' + wx_cv_use_variant='wxUSE_VARIANT=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" + wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" fi - eval "$wx_cv_use_printfposparam" - if test "x$cache" = xyes; then - echo "wxUSE_PRINTF_POS_PARAMS=$wxUSE_PRINTF_POS_PARAMS" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_variant" if test x"$enablestring" = xdisable; then - if test $wxUSE_PRINTF_POS_PARAMS = yes; then + if test $wxUSE_VARIANT = yes; then result=no else result=yes fi else - result=$wxUSE_PRINTF_POS_PARAMS + result=$wxUSE_VARIANT fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -8724,25 +7853,15 @@ if test "${enable_zipstream+set}" = set; then else wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}" fi eval "$wx_cv_use_zipstream" - if test "x$cache" = xyes; then - echo "wxUSE_ZIPSTREAM=$wxUSE_ZIPSTREAM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ZIPSTREAM = yes; then @@ -8779,25 +7898,15 @@ if test "${enable_url+set}" = set; then else wx_cv_use_url='wxUSE_URL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}" fi eval "$wx_cv_use_url" - if test "x$cache" = xyes; then - echo "wxUSE_URL=$wxUSE_URL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_URL = yes; then @@ -8813,60 +7922,6 @@ 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}-variant" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; } - # Check whether --enable-variant was given. -if test "${enable_variant+set}" = set; then - enableval=$enable_variant; - if test "$enableval" = yes; then - wx_cv_use_variant='wxUSE_VARIANT=yes' - else - wx_cv_use_variant='wxUSE_VARIANT=no' - fi - cache=yes - -else - - cache=no - LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" - -fi - - - eval "$wx_cv_use_variant" - if test "x$cache" = xyes; then - echo "wxUSE_VARIANT=$wxUSE_VARIANT" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_VARIANT = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_VARIANT - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -8887,25 +7942,15 @@ if test "${enable_protocol+set}" = set; then else wx_cv_use_protocol='wxUSE_PROTOCOL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi eval "$wx_cv_use_protocol" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL = yes; then @@ -8941,25 +7986,15 @@ if test "${enable_protocol_http+set}" = set; then else wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi eval "$wx_cv_use_protocol_http" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_HTTP = yes; then @@ -8995,25 +8030,15 @@ if test "${enable_protocol_ftp+set}" = set; then else wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi eval "$wx_cv_use_protocol_ftp" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FTP = yes; then @@ -9049,25 +8074,15 @@ if test "${enable_protocol_file+set}" = set; then else wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi eval "$wx_cv_use_protocol_file" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FILE = yes; then @@ -9104,25 +8119,15 @@ if test "${enable_threads+set}" = set; then else wx_cv_use_threads='wxUSE_THREADS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}" fi eval "$wx_cv_use_threads" - if test "x$cache" = xyes; then - echo "wxUSE_THREADS=$wxUSE_THREADS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_THREADS = yes; then @@ -9138,6 +8143,95 @@ fi echo "${ECHO_T}$result" >&6; } + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iniconf" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-iniconf... $ECHO_C" >&6; } + # Check whether --enable-iniconf was given. +if test "${enable_iniconf+set}" = set; then + enableval=$enable_iniconf; + if test "$enableval" = yes; then + wx_cv_use_iniconf='wxUSE_INICONF=yes' + else + wx_cv_use_iniconf='wxUSE_INICONF=no' + fi + +else + + wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}" + +fi + + + eval "$wx_cv_use_iniconf" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_INICONF = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_INICONF + 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}-regkey" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6; } + # Check whether --enable-regkey was given. +if test "${enable_regkey+set}" = set; then + enableval=$enable_regkey; + if test "$enableval" = yes; then + wx_cv_use_regkey='wxUSE_REGKEY=yes' + else + wx_cv_use_regkey='wxUSE_REGKEY=no' + fi + +else + + wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}" + +fi + + + eval "$wx_cv_use_regkey" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_REGKEY = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_REGKEY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + if test "$wxUSE_GUI" = "yes"; then @@ -9162,25 +8256,15 @@ if test "${enable_docview+set}" = set; then else wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}" fi eval "$wx_cv_use_docview" - if test "x$cache" = xyes; then - echo "wxUSE_DOC_VIEW_ARCHITECTURE=$wxUSE_DOC_VIEW_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then @@ -9216,25 +8300,15 @@ if test "${enable_help+set}" = set; then else wx_cv_use_help='wxUSE_HELP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}" fi eval "$wx_cv_use_help" - if test "x$cache" = xyes; then - echo "wxUSE_HELP=$wxUSE_HELP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_HELP = yes; then @@ -9270,25 +8344,15 @@ if test "${enable_mshtmlhelp+set}" = set; then else wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}" fi eval "$wx_cv_use_mshtmlhelp" - if test "x$cache" = xyes; then - echo "wxUSE_MS_HTML_HELP=$wxUSE_MS_HTML_HELP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MS_HTML_HELP = yes; then @@ -9324,25 +8388,15 @@ if test "${enable_html+set}" = set; then else wx_cv_use_html='wxUSE_HTML=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}" fi eval "$wx_cv_use_html" - if test "x$cache" = xyes; then - echo "wxUSE_HTML=$wxUSE_HTML" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_HTML = yes; then @@ -9378,25 +8432,15 @@ if test "${enable_htmlhelp+set}" = set; then else wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}" fi eval "$wx_cv_use_htmlhelp" - if test "x$cache" = xyes; then - echo "wxUSE_WXHTML_HELP=$wxUSE_WXHTML_HELP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_WXHTML_HELP = yes; then @@ -9432,25 +8476,15 @@ if test "${enable_xrc+set}" = set; then else wx_cv_use_xrc='wxUSE_XRC=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}" fi eval "$wx_cv_use_xrc" - if test "x$cache" = xyes; then - echo "wxUSE_XRC=$wxUSE_XRC" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_XRC = yes; then @@ -9486,25 +8520,15 @@ if test "${enable_aui+set}" = set; then else wx_cv_use_aui='wxUSE_AUI=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}" fi eval "$wx_cv_use_aui" - if test "x$cache" = xyes; then - echo "wxUSE_AUI=$wxUSE_AUI" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_AUI = yes; then @@ -9520,6 +8544,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}-propgrid" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-propgrid... $ECHO_C" >&6; } + # Check whether --enable-propgrid was given. +if test "${enable_propgrid+set}" = set; then + enableval=$enable_propgrid; + if test "$enableval" = yes; then + wx_cv_use_propgrid='wxUSE_PROPGRID=yes' + else + wx_cv_use_propgrid='wxUSE_PROPGRID=no' + fi + +else + + wx_cv_use_propgrid='wxUSE_PROPGRID=${'DEFAULT_wxUSE_PROPGRID":-$defaultval}" + +fi + + + eval "$wx_cv_use_propgrid" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROPGRID = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_PROPGRID + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -9540,25 +8608,15 @@ if test "${enable_stc+set}" = set; then else wx_cv_use_stc='wxUSE_STC=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}" fi eval "$wx_cv_use_stc" - if test "x$cache" = xyes; then - echo "wxUSE_STC=$wxUSE_STC" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STC = yes; then @@ -9594,25 +8652,15 @@ if test "${enable_constraints+set}" = set; then else wx_cv_use_constraints='wxUSE_CONSTRAINTS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}" fi eval "$wx_cv_use_constraints" - if test "x$cache" = xyes; then - echo "wxUSE_CONSTRAINTS=$wxUSE_CONSTRAINTS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONSTRAINTS = yes; then @@ -9638,44 +8686,34 @@ 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}-loggui" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; } + # Check whether --enable-loggui was given. +if test "${enable_loggui+set}" = set; then + enableval=$enable_loggui; if test "$enableval" = yes; then - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' + wx_cv_use_loggui='wxUSE_LOGGUI=yes' else - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' + wx_cv_use_loggui='wxUSE_LOGGUI=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" + wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" fi - eval "$wx_cv_use_printarch" - if test "x$cache" = xyes; then - echo "wxUSE_PRINTING_ARCHITECTURE=$wxUSE_PRINTING_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_loggui" if test x"$enablestring" = xdisable; then - if test $wxUSE_PRINTING_ARCHITECTURE = yes; then + if test $wxUSE_LOGGUI = yes; then result=no else result=yes fi else - result=$wxUSE_PRINTING_ARCHITECTURE + result=$wxUSE_LOGGUI fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9692,44 +8730,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; } - # Check whether --enable-mdi was given. -if test "${enable_mdi+set}" = set; then - enableval=$enable_mdi; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; } + # Check whether --enable-logwin was given. +if test "${enable_logwin+set}" = set; then + enableval=$enable_logwin; if test "$enableval" = yes; then - wx_cv_use_mdi='wxUSE_MDI=yes' + wx_cv_use_logwin='wxUSE_LOGWINDOW=yes' else - wx_cv_use_mdi='wxUSE_MDI=no' + wx_cv_use_logwin='wxUSE_LOGWINDOW=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" + wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" fi - eval "$wx_cv_use_mdi" - if test "x$cache" = xyes; then - echo "wxUSE_MDI=$wxUSE_MDI" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_logwin" if test x"$enablestring" = xdisable; then - if test $wxUSE_MDI = yes; then + if test $wxUSE_LOGWINDOW = yes; then result=no else result=yes fi else - result=$wxUSE_MDI + result=$wxUSE_LOGWINDOW fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9746,44 +8774,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; } - # Check whether --enable-mdidoc was given. -if test "${enable_mdidoc+set}" = set; then - enableval=$enable_mdidoc; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; } + # Check whether --enable-logdialog was given. +if test "${enable_logdialog+set}" = set; then + enableval=$enable_logdialog; if test "$enableval" = yes; then - wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes' + wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes' else - wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' + wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" + wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" fi - eval "$wx_cv_use_mdidoc" - if test "x$cache" = xyes; then - echo "wxUSE_MDI_ARCHITECTURE=$wxUSE_MDI_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_logdialog" if test x"$enablestring" = xdisable; then - if test $wxUSE_MDI_ARCHITECTURE = yes; then + if test $wxUSE_LOGDIALOG = yes; then result=no else result=yes fi else - result=$wxUSE_MDI_ARCHITECTURE + result=$wxUSE_LOGDIALOG fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9800,44 +8818,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; } - # Check whether --enable-loggui was given. -if test "${enable_loggui+set}" = set; then - enableval=$enable_loggui; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; } + # Check whether --enable-mdi was given. +if test "${enable_mdi+set}" = set; then + enableval=$enable_mdi; if test "$enableval" = yes; then - wx_cv_use_loggui='wxUSE_LOGGUI=yes' + wx_cv_use_mdi='wxUSE_MDI=yes' else - wx_cv_use_loggui='wxUSE_LOGGUI=no' + wx_cv_use_mdi='wxUSE_MDI=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" + wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" fi - eval "$wx_cv_use_loggui" - if test "x$cache" = xyes; then - echo "wxUSE_LOGGUI=$wxUSE_LOGGUI" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_mdi" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGGUI = yes; then + if test $wxUSE_MDI = yes; then result=no else result=yes fi else - result=$wxUSE_LOGGUI + result=$wxUSE_MDI fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9854,44 +8862,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; } - # Check whether --enable-logwin was given. -if test "${enable_logwin+set}" = set; then - enableval=$enable_logwin; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; } + # Check whether --enable-mdidoc was given. +if test "${enable_mdidoc+set}" = set; then + enableval=$enable_mdidoc; if test "$enableval" = yes; then - wx_cv_use_logwin='wxUSE_LOGWINDOW=yes' + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes' else - wx_cv_use_logwin='wxUSE_LOGWINDOW=no' + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" fi - eval "$wx_cv_use_logwin" - if test "x$cache" = xyes; then - echo "wxUSE_LOGWINDOW=$wxUSE_LOGWINDOW" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_mdidoc" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGWINDOW = yes; then + if test $wxUSE_MDI_ARCHITECTURE = yes; then result=no else result=yes fi else - result=$wxUSE_LOGWINDOW + result=$wxUSE_MDI_ARCHITECTURE fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9908,44 +8906,78 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; } - # Check whether --enable-logdialog was given. -if test "${enable_logdialog+set}" = set; then - enableval=$enable_logdialog; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; } + # Check whether --enable-mediactrl was given. +if test "${enable_mediactrl+set}" = set; then + enableval=$enable_mediactrl; if test "$enableval" = yes; then - wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes' + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' else - wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_mediactrl" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_MEDIACTRL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_MEDIACTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; } + # Check whether --enable-gstreamer8 was given. +if test "${enable_gstreamer8+set}" = set; then + enableval=$enable_gstreamer8; + if test "$enableval" = yes; then + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes' + else + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no' fi - wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" +else + + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" fi - eval "$wx_cv_use_logdialog" - if test "x$cache" = xyes; then - echo "wxUSE_LOGDIALOG=$wxUSE_LOGDIALOG" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_gstreamer8" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGDIALOG = yes; then + if test $wxUSE_GSTREAMER8 = yes; then result=no else result=yes fi else - result=$wxUSE_LOGDIALOG + result=$wxUSE_GSTREAMER8 fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9972,25 +9004,15 @@ if test "${enable_webkit+set}" = set; then else wx_cv_use_webkit='wxUSE_WEBKIT=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" fi eval "$wx_cv_use_webkit" - if test "x$cache" = xyes; then - echo "wxUSE_WEBKIT=$wxUSE_WEBKIT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_WEBKIT = yes; then @@ -10026,25 +9048,15 @@ if test "${enable_richtext+set}" = set; then else wx_cv_use_richtext='wxUSE_RICHTEXT=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}" fi eval "$wx_cv_use_richtext" - if test "x$cache" = xyes; then - echo "wxUSE_RICHTEXT=$wxUSE_RICHTEXT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RICHTEXT = yes; then @@ -10080,25 +9092,15 @@ if test "${enable_graphics_ctx+set}" = set; then else wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" fi eval "$wx_cv_use_graphics_ctx" - if test "x$cache" = xyes; then - echo "wxUSE_GRAPHICS_CONTEXT=$wxUSE_GRAPHICS_CONTEXT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GRAPHICS_CONTEXT = yes; then @@ -10134,25 +9136,15 @@ if test "${enable_postscript+set}" = set; then else wx_cv_use_postscript='wxUSE_POSTSCRIPT=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" fi eval "$wx_cv_use_postscript" - if test "x$cache" = xyes; then - echo "wxUSE_POSTSCRIPT=$wxUSE_POSTSCRIPT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_POSTSCRIPT = yes; then @@ -10168,6 +9160,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}-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_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' + else + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' + fi + +else + + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" + +fi + + + eval "$wx_cv_use_printarch" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PRINTING_ARCHITECTURE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_PRINTING_ARCHITECTURE + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -10188,25 +9224,15 @@ if test "${enable_svg+set}" = set; then else wx_cv_use_svg='wxUSE_SVG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" fi eval "$wx_cv_use_svg" - if test "x$cache" = xyes; then - echo "wxUSE_SVG=$wxUSE_SVG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SVG = yes; then @@ -10244,25 +9270,15 @@ if test "${enable_clipboard+set}" = set; then else wx_cv_use_clipboard='wxUSE_CLIPBOARD=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}" fi eval "$wx_cv_use_clipboard" - if test "x$cache" = xyes; then - echo "wxUSE_CLIPBOARD=$wxUSE_CLIPBOARD" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CLIPBOARD = yes; then @@ -10298,25 +9314,15 @@ if test "${enable_dnd+set}" = set; then else wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}" fi eval "$wx_cv_use_dnd" - if test "x$cache" = xyes; then - echo "wxUSE_DRAG_AND_DROP=$wxUSE_DRAG_AND_DROP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DRAG_AND_DROP = yes; then @@ -10352,25 +9358,15 @@ if test "${enable_metafile+set}" = set; then else wx_cv_use_metafile='wxUSE_METAFILE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" fi eval "$wx_cv_use_metafile" - if test "x$cache" = xyes; then - echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_METAFILE = yes; then @@ -10409,25 +9405,15 @@ if test "${enable_controls+set}" = set; then else wx_cv_use_controls='wxUSE_CONTROLS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}" fi eval "$wx_cv_use_controls" - if test "x$cache" = xyes; then - echo "wxUSE_CONTROLS=$wxUSE_CONTROLS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONTROLS = yes; then @@ -10443,112 +9429,61 @@ 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_FILEPICKERCTRL=yes - DEFAULT_wxUSE_FONTPICKERCTRL=yes - DEFAULT_wxUSE_GAUGE=yes - DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_HYPERLINKCTRL=yes - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=yes - DEFAULT_wxUSE_LISTBOOK=yes - DEFAULT_wxUSE_LISTBOX=yes - DEFAULT_wxUSE_LISTCTRL=yes - DEFAULT_wxUSE_NOTEBOOK=yes - DEFAULT_wxUSE_RADIOBOX=yes - DEFAULT_wxUSE_RADIOBTN=yes - DEFAULT_wxUSE_SASH=yes - DEFAULT_wxUSE_SCROLLBAR=yes - DEFAULT_wxUSE_SEARCHCTRL=yes - DEFAULT_wxUSE_SLIDER=yes - DEFAULT_wxUSE_SPINBTN=yes - DEFAULT_wxUSE_SPINCTRL=yes - DEFAULT_wxUSE_SPLITTER=yes - DEFAULT_wxUSE_STATBMP=yes - DEFAULT_wxUSE_STATBOX=yes - DEFAULT_wxUSE_STATLINE=yes - DEFAULT_wxUSE_STATUSBAR=yes - DEFAULT_wxUSE_TAB_DIALOG=yes - DEFAULT_wxUSE_TOGGLEBTN=yes - DEFAULT_wxUSE_TOOLBAR=yes - DEFAULT_wxUSE_TOOLBAR_NATIVE=yes - DEFAULT_wxUSE_TOOLTIPS=yes - DEFAULT_wxUSE_TREEBOOK=yes - DEFAULT_wxUSE_TOOLBOOK=yes - DEFAULT_wxUSE_TREECTRL=yes - DEFAULT_wxUSE_POPUPWIN=yes - DEFAULT_wxUSE_TIPWINDOW=yes -elif test "$wxUSE_CONTROLS" = "no"; then - DEFAULT_wxUSE_ACCEL=no - DEFAULT_wxUSE_ANIMATIONCTRL=no - DEFAULT_wxUSE_BMPBUTTON=no - DEFAULT_wxUSE_BUTTON=no - DEFAULT_wxUSE_CALCTRL=no - DEFAULT_wxUSE_CARET=no - DEFAULT_wxUSE_COLLPANE=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_CHECKBOX=no - DEFAULT_wxUSE_CHECKLISTBOX=no - DEFAULT_wxUSE_CHOICE=no - DEFAULT_wxUSE_CHOICEBOOK=no - DEFAULT_wxUSE_COLOURPICKERCTRL=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_DATEPICKCTRL=no - DEFAULT_wxUSE_DISPLAY=no - DEFAULT_wxUSE_DETECT_SM=no - DEFAULT_wxUSE_DIRPICKERCTRL=no - DEFAULT_wxUSE_FILEPICKERCTRL=no - DEFAULT_wxUSE_FONTPICKERCTRL=no - DEFAULT_wxUSE_GAUGE=no - DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_HYPERLINKCTRL=no - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=no - DEFAULT_wxUSE_LISTBOOK=no - DEFAULT_wxUSE_LISTBOX=no - DEFAULT_wxUSE_LISTCTRL=no - DEFAULT_wxUSE_NOTEBOOK=no - DEFAULT_wxUSE_RADIOBOX=no - DEFAULT_wxUSE_RADIOBTN=no - DEFAULT_wxUSE_SASH=no - DEFAULT_wxUSE_SCROLLBAR=no - DEFAULT_wxUSE_SEARCHCTRL=no - DEFAULT_wxUSE_SLIDER=no - DEFAULT_wxUSE_SPINBTN=no - DEFAULT_wxUSE_SPINCTRL=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_STATBMP=no - DEFAULT_wxUSE_STATBOX=no - DEFAULT_wxUSE_STATLINE=no - DEFAULT_wxUSE_STATUSBAR=no - DEFAULT_wxUSE_TAB_DIALOG=no - DEFAULT_wxUSE_TOGGLEBTN=no - DEFAULT_wxUSE_TOOLBAR=no - DEFAULT_wxUSE_TOOLBAR_NATIVE=no - DEFAULT_wxUSE_TOOLTIPS=no - DEFAULT_wxUSE_TREEBOOK=no - DEFAULT_wxUSE_TOOLBOOK=no - DEFAULT_wxUSE_TREECTRL=no - DEFAULT_wxUSE_POPUPWIN=no - DEFAULT_wxUSE_TIPWINDOW=no +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_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_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 @@ -10572,25 +9507,15 @@ if test "${enable_accel+set}" = set; then else wx_cv_use_accel='wxUSE_ACCEL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}" fi eval "$wx_cv_use_accel" - if test "x$cache" = xyes; then - echo "wxUSE_ACCEL=$wxUSE_ACCEL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ACCEL = yes; then @@ -10626,25 +9551,15 @@ if test "${enable_animatectrl+set}" = set; then else wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}" fi eval "$wx_cv_use_animatectrl" - if test "x$cache" = xyes; then - echo "wxUSE_ANIMATIONCTRL=$wxUSE_ANIMATIONCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ANIMATIONCTRL = yes; then @@ -10670,44 +9585,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 - cache=yes else - cache=no - LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - 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" - if test "x$cache" = xyes; then - echo "wxUSE_BUTTON=$wxUSE_BUTTON" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_bmpbutton" if test x"$enablestring" = xdisable; then - if test $wxUSE_BUTTON = yes; then + if test $wxUSE_BMPBUTTON = yes; then result=no else result=yes fi else - result=$wxUSE_BUTTON + result=$wxUSE_BMPBUTTON fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10724,44 +9629,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 - cache=yes else - cache=no - LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - 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" - if test "x$cache" = xyes; then - echo "wxUSE_BMPBUTTON=$wxUSE_BMPBUTTON" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_bmpcombobox" if test x"$enablestring" = xdisable; then - if test $wxUSE_BMPBUTTON = yes; then + if test $wxUSE_BITMAPCOMBOBOX = yes; then result=no else result=yes fi else - result=$wxUSE_BMPBUTTON + result=$wxUSE_BITMAPCOMBOBOX fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10778,44 +9673,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 - cache=yes else - cache=no - LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - 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" - if test "x$cache" = xyes; then - echo "wxUSE_BITMAPCOMBOBOX=$wxUSE_BITMAPCOMBOBOX" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_button" if test x"$enablestring" = xdisable; then - if test $wxUSE_BITMAPCOMBOBOX = yes; then + if test $wxUSE_BUTTON = yes; then result=no else result=yes fi else - result=$wxUSE_BITMAPCOMBOBOX + result=$wxUSE_BUTTON fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10842,25 +9727,15 @@ if test "${enable_calendar+set}" = set; then else wx_cv_use_calendar='wxUSE_CALCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}" fi eval "$wx_cv_use_calendar" - if test "x$cache" = xyes; then - echo "wxUSE_CALCTRL=$wxUSE_CALCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CALCTRL = yes; then @@ -10896,25 +9771,15 @@ if test "${enable_caret+set}" = set; then else wx_cv_use_caret='wxUSE_CARET=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}" fi eval "$wx_cv_use_caret" - if test "x$cache" = xyes; then - echo "wxUSE_CARET=$wxUSE_CARET" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CARET = yes; then @@ -10950,25 +9815,15 @@ if test "${enable_checkbox+set}" = set; then else wx_cv_use_checkbox='wxUSE_CHECKBOX=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}" fi eval "$wx_cv_use_checkbox" - if test "x$cache" = xyes; then - echo "wxUSE_CHECKBOX=$wxUSE_CHECKBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHECKBOX = yes; then @@ -11004,25 +9859,15 @@ if test "${enable_checklst+set}" = set; then else wx_cv_use_checklst='wxUSE_CHECKLST=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}" fi eval "$wx_cv_use_checklst" - if test "x$cache" = xyes; then - echo "wxUSE_CHECKLST=$wxUSE_CHECKLST" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHECKLST = yes; then @@ -11058,25 +9903,15 @@ if test "${enable_choice+set}" = set; then else wx_cv_use_choice='wxUSE_CHOICE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}" fi eval "$wx_cv_use_choice" - if test "x$cache" = xyes; then - echo "wxUSE_CHOICE=$wxUSE_CHOICE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHOICE = yes; then @@ -11112,25 +9947,15 @@ if test "${enable_choicebook+set}" = set; then else wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}" fi eval "$wx_cv_use_choicebook" - if test "x$cache" = xyes; then - echo "wxUSE_CHOICEBOOK=$wxUSE_CHOICEBOOK" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHOICEBOOK = yes; then @@ -11166,25 +9991,15 @@ if test "${enable_collpane+set}" = set; then else wx_cv_use_collpane='wxUSE_COLLPANE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}" fi eval "$wx_cv_use_collpane" - if test "x$cache" = xyes; then - echo "wxUSE_COLLPANE=$wxUSE_COLLPANE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COLLPANE = yes; then @@ -11220,25 +10035,15 @@ if test "${enable_colourpicker+set}" = set; then else wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_colourpicker" - if test "x$cache" = xyes; then - echo "wxUSE_COLOURPICKERCTRL=$wxUSE_COLOURPICKERCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COLOURPICKERCTRL = yes; then @@ -11274,25 +10079,15 @@ if test "${enable_combobox+set}" = set; then else wx_cv_use_combobox='wxUSE_COMBOBOX=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}" fi eval "$wx_cv_use_combobox" - if test "x$cache" = xyes; then - echo "wxUSE_COMBOBOX=$wxUSE_COMBOBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COMBOBOX = yes; then @@ -11328,25 +10123,15 @@ if test "${enable_comboctrl+set}" = set; then else wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}" fi eval "$wx_cv_use_comboctrl" - if test "x$cache" = xyes; then - echo "wxUSE_COMBOCTRL=$wxUSE_COMBOCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COMBOCTRL = yes; then @@ -11362,6 +10147,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}-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_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' + else + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' + fi + +else + + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_dataviewctrl" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DATAVIEWCTRL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DATAVIEWCTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11382,25 +10211,15 @@ if test "${enable_datepick+set}" = set; then else wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" fi eval "$wx_cv_use_datepick" - if test "x$cache" = xyes; then - echo "wxUSE_DATEPICKCTRL=$wxUSE_DATEPICKCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATEPICKCTRL = yes; then @@ -11416,6 +10235,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}-detect_sm" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; } + # Check whether --enable-detect_sm was given. +if test "${enable_detect_sm+set}" = set; then + enableval=$enable_detect_sm; + if test "$enableval" = yes; then + wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes' + else + wx_cv_use_detect_sm='wxUSE_DETECT_SM=no' + fi + +else + + wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" + +fi + + + eval "$wx_cv_use_detect_sm" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DETECT_SM = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DETECT_SM + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11436,25 +10299,15 @@ if test "${enable_dirpicker+set}" = set; then else wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_dirpicker" - if test "x$cache" = xyes; then - echo "wxUSE_DIRPICKERCTRL=$wxUSE_DIRPICKERCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DIRPICKERCTRL = yes; then @@ -11490,25 +10343,15 @@ if test "${enable_display+set}" = set; then else wx_cv_use_display='wxUSE_DISPLAY=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" fi eval "$wx_cv_use_display" - if test "x$cache" = xyes; then - echo "wxUSE_DISPLAY=$wxUSE_DISPLAY" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DISPLAY = yes; then @@ -11534,44 +10377,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; } - # Check whether --enable-detect_sm was given. -if test "${enable_detect_sm+set}" = set; then - enableval=$enable_detect_sm; + { 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_detect_sm='wxUSE_DETECT_SM=yes' + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes' else - wx_cv_use_detect_sm='wxUSE_DETECT_SM=no' + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" fi - eval "$wx_cv_use_detect_sm" - if test "x$cache" = xyes; then - echo "wxUSE_DETECT_SM=$wxUSE_DETECT_SM" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_editablebox" if test x"$enablestring" = xdisable; then - if test $wxUSE_DETECT_SM = yes; then + if test $wxUSE_EDITABLELISTBOX = yes; then result=no else result=yes fi else - result=$wxUSE_DETECT_SM + result=$wxUSE_EDITABLELISTBOX fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11588,44 +10421,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}-filectrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-filectrl... $ECHO_C" >&6; } + # Check whether --enable-filectrl was given. +if test "${enable_filectrl+set}" = set; then + enableval=$enable_filectrl; if test "$enableval" = yes; then - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes' + wx_cv_use_filectrl='wxUSE_FILECTRL=yes' else - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' + wx_cv_use_filectrl='wxUSE_FILECTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" + wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}" fi - eval "$wx_cv_use_editablebox" - if test "x$cache" = xyes; then - echo "wxUSE_EDITABLELISTBOX=$wxUSE_EDITABLELISTBOX" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_filectrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_EDITABLELISTBOX = yes; then + if test $wxUSE_FILECTRL = yes; then result=no else result=yes fi else - result=$wxUSE_EDITABLELISTBOX + result=$wxUSE_FILECTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11652,25 +10475,15 @@ if test "${enable_filepicker+set}" = set; then else wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_filepicker" - if test "x$cache" = xyes; then - echo "wxUSE_FILEPICKERCTRL=$wxUSE_FILEPICKERCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILEPICKERCTRL = yes; then @@ -11706,25 +10519,15 @@ if test "${enable_fontpicker+set}" = set; then else wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_fontpicker" - if test "x$cache" = xyes; then - echo "wxUSE_FONTPICKERCTRL=$wxUSE_FONTPICKERCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTPICKERCTRL = yes; then @@ -11760,25 +10563,15 @@ if test "${enable_gauge+set}" = set; then else wx_cv_use_gauge='wxUSE_GAUGE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}" fi eval "$wx_cv_use_gauge" - if test "x$cache" = xyes; then - echo "wxUSE_GAUGE=$wxUSE_GAUGE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GAUGE = yes; then @@ -11814,25 +10607,15 @@ if test "${enable_grid+set}" = set; then else wx_cv_use_grid='wxUSE_GRID=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}" fi eval "$wx_cv_use_grid" - if test "x$cache" = xyes; then - echo "wxUSE_GRID=$wxUSE_GRID" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GRID = yes; then @@ -11858,44 +10641,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 - cache=yes else - cache=no - LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - 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" - if test "x$cache" = xyes; then - echo "wxUSE_DATAVIEWCTRL=$wxUSE_DATAVIEWCTRL" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_headerctrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_DATAVIEWCTRL = yes; then + if test $wxUSE_HEADERCTRL = yes; then result=no else result=yes fi else - result=$wxUSE_DATAVIEWCTRL + result=$wxUSE_HEADERCTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -11922,25 +10695,15 @@ if test "${enable_hyperlink+set}" = set; then else wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}" fi eval "$wx_cv_use_hyperlink" - if test "x$cache" = xyes; then - echo "wxUSE_HYPERLINKCTRL=$wxUSE_HYPERLINKCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_HYPERLINKCTRL = yes; then @@ -11976,25 +10739,15 @@ if test "${enable_imaglist+set}" = set; then else wx_cv_use_imaglist='wxUSE_IMAGLIST=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}" fi eval "$wx_cv_use_imaglist" - if test "x$cache" = xyes; then - echo "wxUSE_IMAGLIST=$wxUSE_IMAGLIST" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_IMAGLIST = yes; then @@ -12030,25 +10783,15 @@ if test "${enable_listbook+set}" = set; then else wx_cv_use_listbook='wxUSE_LISTBOOK=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}" fi eval "$wx_cv_use_listbook" - if test "x$cache" = xyes; then - echo "wxUSE_LISTBOOK=$wxUSE_LISTBOOK" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LISTBOOK = yes; then @@ -12084,25 +10827,15 @@ if test "${enable_listbox+set}" = set; then else wx_cv_use_listbox='wxUSE_LISTBOX=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}" fi eval "$wx_cv_use_listbox" - if test "x$cache" = xyes; then - echo "wxUSE_LISTBOX=$wxUSE_LISTBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LISTBOX = yes; then @@ -12138,25 +10871,15 @@ if test "${enable_listctrl+set}" = set; then else wx_cv_use_listctrl='wxUSE_LISTCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}" fi eval "$wx_cv_use_listctrl" - if test "x$cache" = xyes; then - echo "wxUSE_LISTCTRL=$wxUSE_LISTCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LISTCTRL = yes; then @@ -12192,25 +10915,15 @@ if test "${enable_notebook+set}" = set; then else wx_cv_use_notebook='wxUSE_NOTEBOOK=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}" fi eval "$wx_cv_use_notebook" - if test "x$cache" = xyes; then - echo "wxUSE_NOTEBOOK=$wxUSE_NOTEBOOK" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NOTEBOOK = yes; then @@ -12226,6 +10939,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}-notifmsg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-notifmsg... $ECHO_C" >&6; } + # Check whether --enable-notifmsg was given. +if test "${enable_notifmsg+set}" = set; then + enableval=$enable_notifmsg; + if test "$enableval" = yes; then + wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=yes' + else + wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=no' + fi + +else + + wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=${'DEFAULT_wxUSE_NOTIFICATION_MESSAGE":-$defaultval}" + +fi + + + eval "$wx_cv_use_notifmsg" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_NOTIFICATION_MESSAGE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_NOTIFICATION_MESSAGE + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -12246,25 +11003,15 @@ if test "${enable_odcombobox+set}" = set; then else wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}" fi eval "$wx_cv_use_odcombobox" - if test "x$cache" = xyes; then - echo "wxUSE_ODCOMBOBOX=$wxUSE_ODCOMBOBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ODCOMBOBOX = yes; then @@ -12280,6 +11027,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 = yes; then + result=no + else + result=yes + 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 @@ -12300,25 +11091,15 @@ if test "${enable_radiobox+set}" = set; then else wx_cv_use_radiobox='wxUSE_RADIOBOX=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}" fi eval "$wx_cv_use_radiobox" - if test "x$cache" = xyes; then - echo "wxUSE_RADIOBOX=$wxUSE_RADIOBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RADIOBOX = yes; then @@ -12354,25 +11135,15 @@ if test "${enable_radiobtn+set}" = set; then else wx_cv_use_radiobtn='wxUSE_RADIOBTN=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}" fi eval "$wx_cv_use_radiobtn" - if test "x$cache" = xyes; then - echo "wxUSE_RADIOBTN=$wxUSE_RADIOBTN" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RADIOBTN = yes; then @@ -12388,6 +11159,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}-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 = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_REARRANGECTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -12408,25 +11223,15 @@ if test "${enable_sash+set}" = set; then else wx_cv_use_sash='wxUSE_SASH=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}" fi eval "$wx_cv_use_sash" - if test "x$cache" = xyes; then - echo "wxUSE_SASH=$wxUSE_SASH" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SASH = yes; then @@ -12462,25 +11267,15 @@ if test "${enable_scrollbar+set}" = set; then else wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}" fi eval "$wx_cv_use_scrollbar" - if test "x$cache" = xyes; then - echo "wxUSE_SCROLLBAR=$wxUSE_SCROLLBAR" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SCROLLBAR = yes; then @@ -12516,25 +11311,15 @@ if test "${enable_searchctrl+set}" = set; then else wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}" fi eval "$wx_cv_use_searchctrl" - if test "x$cache" = xyes; then - echo "wxUSE_SEARCHCTRL=$wxUSE_SEARCHCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SEARCHCTRL = yes; then @@ -12570,25 +11355,15 @@ if test "${enable_slider+set}" = set; then else wx_cv_use_slider='wxUSE_SLIDER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}" fi eval "$wx_cv_use_slider" - if test "x$cache" = xyes; then - echo "wxUSE_SLIDER=$wxUSE_SLIDER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SLIDER = yes; then @@ -12624,25 +11399,15 @@ if test "${enable_spinbtn+set}" = set; then else wx_cv_use_spinbtn='wxUSE_SPINBTN=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}" fi eval "$wx_cv_use_spinbtn" - if test "x$cache" = xyes; then - echo "wxUSE_SPINBTN=$wxUSE_SPINBTN" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPINBTN = yes; then @@ -12678,25 +11443,15 @@ if test "${enable_spinctrl+set}" = set; then else wx_cv_use_spinctrl='wxUSE_SPINCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}" fi eval "$wx_cv_use_spinctrl" - if test "x$cache" = xyes; then - echo "wxUSE_SPINCTRL=$wxUSE_SPINCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPINCTRL = yes; then @@ -12732,25 +11487,15 @@ if test "${enable_splitter+set}" = set; then else wx_cv_use_splitter='wxUSE_SPLITTER=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}" fi eval "$wx_cv_use_splitter" - if test "x$cache" = xyes; then - echo "wxUSE_SPLITTER=$wxUSE_SPLITTER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPLITTER = yes; then @@ -12786,25 +11531,15 @@ if test "${enable_statbmp+set}" = set; then else wx_cv_use_statbmp='wxUSE_STATBMP=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}" fi eval "$wx_cv_use_statbmp" - if test "x$cache" = xyes; then - echo "wxUSE_STATBMP=$wxUSE_STATBMP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATBMP = yes; then @@ -12840,25 +11575,15 @@ if test "${enable_statbox+set}" = set; then else wx_cv_use_statbox='wxUSE_STATBOX=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}" fi eval "$wx_cv_use_statbox" - if test "x$cache" = xyes; then - echo "wxUSE_STATBOX=$wxUSE_STATBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATBOX = yes; then @@ -12894,25 +11619,15 @@ if test "${enable_statline+set}" = set; then else wx_cv_use_statline='wxUSE_STATLINE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}" fi eval "$wx_cv_use_statline" - if test "x$cache" = xyes; then - echo "wxUSE_STATLINE=$wxUSE_STATLINE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATLINE = yes; then @@ -12948,25 +11663,15 @@ if test "${enable_stattext+set}" = set; then else wx_cv_use_stattext='wxUSE_STATTEXT=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}" fi eval "$wx_cv_use_stattext" - if test "x$cache" = xyes; then - echo "wxUSE_STATTEXT=$wxUSE_STATTEXT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATTEXT = yes; then @@ -13002,25 +11707,15 @@ if test "${enable_statusbar+set}" = set; then else wx_cv_use_statusbar='wxUSE_STATUSBAR=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}" fi eval "$wx_cv_use_statusbar" - if test "x$cache" = xyes; then - echo "wxUSE_STATUSBAR=$wxUSE_STATUSBAR" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATUSBAR = yes; then @@ -13046,44 +11741,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 - cache=yes else - cache=no - LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - 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" - if test "x$cache" = xyes; then - echo "wxUSE_TAB_DIALOG=$wxUSE_TAB_DIALOG" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_taskbaricon" if test x"$enablestring" = xdisable; then - if test $wxUSE_TAB_DIALOG = yes; then + if test $wxUSE_TASKBARICON = yes; then result=no else result=yes fi else - result=$wxUSE_TAB_DIALOG + result=$wxUSE_TASKBARICON fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -13100,44 +11785,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 - cache=yes else - cache=no - LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - 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" - if test "x$cache" = xyes; then - echo "wxUSE_TASKBARICON=$wxUSE_TASKBARICON" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_tbarnative" if test x"$enablestring" = xdisable; then - if test $wxUSE_TASKBARICON = yes; then + if test $wxUSE_TOOLBAR_NATIVE = yes; then result=no else result=yes fi else - result=$wxUSE_TASKBARICON + result=$wxUSE_TOOLBAR_NATIVE fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -13164,25 +11839,15 @@ if test "${enable_textctrl+set}" = set; then else wx_cv_use_textctrl='wxUSE_TEXTCTRL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" fi eval "$wx_cv_use_textctrl" - if test "x$cache" = xyes; then - echo "wxUSE_TEXTCTRL=$wxUSE_TEXTCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTCTRL = yes; then @@ -13208,98 +11873,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; - if test "$enableval" = yes; then - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' - else - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' - fi - cache=yes - -else - - cache=no - LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" - -fi - - - eval "$wx_cv_use_togglebtn" - if test "x$cache" = xyes; then - echo "wxUSE_TOGGLEBTN=$wxUSE_TOGGLEBTN" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_TOGGLEBTN = yes; then - result=no - else - 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; + { 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_toolbar='wxUSE_TOOLBAR=yes' + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' else - wx_cv_use_toolbar='wxUSE_TOOLBAR=no' + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" fi - eval "$wx_cv_use_toolbar" - if test "x$cache" = xyes; then - echo "wxUSE_TOOLBAR=$wxUSE_TOOLBAR" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_tipwindow" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOOLBAR = yes; then + if test $wxUSE_TIPWINDOW = yes; then result=no else result=yes fi else - result=$wxUSE_TOOLBAR + result=$wxUSE_TIPWINDOW fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -13316,44 +11917,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 - cache=yes else - cache=no - LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - 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" - if test "x$cache" = xyes; then - echo "wxUSE_TOOLBAR_NATIVE=$wxUSE_TOOLBAR_NATIVE" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_togglebtn" if test x"$enablestring" = xdisable; then - if test $wxUSE_TOOLBAR_NATIVE = yes; then + if test $wxUSE_TOGGLEBTN = yes; then result=no else result=yes fi else - result=$wxUSE_TOOLBAR_NATIVE + result=$wxUSE_TOGGLEBTN fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -13370,44 +11961,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 - cache=yes else - cache=no - LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - 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" - if test "x$cache" = xyes; then - echo "wxUSE_TREEBOOK=$wxUSE_TREEBOOK" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_toolbar" if test x"$enablestring" = xdisable; then - if test $wxUSE_TREEBOOK = yes; then + if test $wxUSE_TOOLBAR = yes; then result=no else result=yes fi else - result=$wxUSE_TREEBOOK + result=$wxUSE_TOOLBAR fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -13434,25 +12015,15 @@ if test "${enable_toolbook+set}" = set; then else wx_cv_use_toolbook='wxUSE_TOOLBOOK=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}" fi eval "$wx_cv_use_toolbook" - if test "x$cache" = xyes; then - echo "wxUSE_TOOLBOOK=$wxUSE_TOOLBOOK" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOOLBOOK = yes; then @@ -13478,98 +12049,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; - if test "$enableval" = yes; then - wx_cv_use_treectrl='wxUSE_TREECTRL=yes' - else - wx_cv_use_treectrl='wxUSE_TREECTRL=no' - fi - cache=yes - -else - - cache=no - LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" - -fi - - - eval "$wx_cv_use_treectrl" - if test "x$cache" = xyes; then - echo "wxUSE_TREECTRL=$wxUSE_TREECTRL" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_TREECTRL = yes; then - result=no - else - 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; + { 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_tipwindow='wxUSE_TIPWINDOW=yes' + wx_cv_use_treebook='wxUSE_TREEBOOK=yes' else - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' + wx_cv_use_treebook='wxUSE_TREEBOOK=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" + wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" fi - eval "$wx_cv_use_tipwindow" - if test "x$cache" = xyes; then - echo "wxUSE_TIPWINDOW=$wxUSE_TIPWINDOW" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_treebook" if test x"$enablestring" = xdisable; then - if test $wxUSE_TIPWINDOW = yes; then + if test $wxUSE_TREEBOOK = yes; then result=no else result=yes fi else - result=$wxUSE_TIPWINDOW + result=$wxUSE_TREEBOOK fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -13586,44 +12093,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 - cache=yes else - cache=no - LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - 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" - if test "x$cache" = xyes; then - echo "wxUSE_POPUPWIN=$wxUSE_POPUPWIN" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_treectrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_POPUPWIN = yes; then + if test $wxUSE_TREECTRL = yes; then result=no else result=yes fi else - result=$wxUSE_POPUPWIN + result=$wxUSE_TREECTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -13652,25 +12149,15 @@ if test "${enable_commondlg+set}" = set; then else wx_cv_use_commondlg='wxUSE_COMMONDLGS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}" fi eval "$wx_cv_use_commondlg" - if test "x$cache" = xyes; then - echo "wxUSE_COMMONDLGS=$wxUSE_COMMONDLGS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COMMONDLGS = yes; then @@ -13706,25 +12193,15 @@ if test "${enable_aboutdlg+set}" = set; then else wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}" fi eval "$wx_cv_use_aboutdlg" - if test "x$cache" = xyes; then - echo "wxUSE_ABOUTDLG=$wxUSE_ABOUTDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ABOUTDLG = yes; then @@ -13760,25 +12237,15 @@ if test "${enable_choicedlg+set}" = set; then else wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}" fi eval "$wx_cv_use_choicedlg" - if test "x$cache" = xyes; then - echo "wxUSE_CHOICEDLG=$wxUSE_CHOICEDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHOICEDLG = yes; then @@ -13814,25 +12281,15 @@ if test "${enable_coldlg+set}" = set; then else wx_cv_use_coldlg='wxUSE_COLOURDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}" fi eval "$wx_cv_use_coldlg" - if test "x$cache" = xyes; then - echo "wxUSE_COLOURDLG=$wxUSE_COLOURDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COLOURDLG = yes; then @@ -13868,25 +12325,15 @@ if test "${enable_filedlg+set}" = set; then else wx_cv_use_filedlg='wxUSE_FILEDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}" fi eval "$wx_cv_use_filedlg" - if test "x$cache" = xyes; then - echo "wxUSE_FILEDLG=$wxUSE_FILEDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILEDLG = yes; then @@ -13922,25 +12369,15 @@ if test "${enable_finddlg+set}" = set; then else wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}" fi eval "$wx_cv_use_finddlg" - if test "x$cache" = xyes; then - echo "wxUSE_FINDREPLDLG=$wxUSE_FINDREPLDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FINDREPLDLG = yes; then @@ -13976,25 +12413,15 @@ if test "${enable_fontdlg+set}" = set; then else wx_cv_use_fontdlg='wxUSE_FONTDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}" fi eval "$wx_cv_use_fontdlg" - if test "x$cache" = xyes; then - echo "wxUSE_FONTDLG=$wxUSE_FONTDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTDLG = yes; then @@ -14030,25 +12457,15 @@ if test "${enable_dirdlg+set}" = set; then else wx_cv_use_dirdlg='wxUSE_DIRDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}" fi eval "$wx_cv_use_dirdlg" - if test "x$cache" = xyes; then - echo "wxUSE_DIRDLG=$wxUSE_DIRDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DIRDLG = yes; then @@ -14084,25 +12501,15 @@ if test "${enable_msgdlg+set}" = set; then else wx_cv_use_msgdlg='wxUSE_MSGDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}" fi eval "$wx_cv_use_msgdlg" - if test "x$cache" = xyes; then - echo "wxUSE_MSGDLG=$wxUSE_MSGDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MSGDLG = yes; then @@ -14138,25 +12545,15 @@ if test "${enable_numberdlg+set}" = set; then else wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}" fi eval "$wx_cv_use_numberdlg" - if test "x$cache" = xyes; then - echo "wxUSE_NUMBERDLG=$wxUSE_NUMBERDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NUMBERDLG = yes; then @@ -14192,25 +12589,15 @@ if test "${enable_splash+set}" = set; then else wx_cv_use_splash='wxUSE_SPLASH=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}" fi eval "$wx_cv_use_splash" - if test "x$cache" = xyes; then - echo "wxUSE_SPLASH=$wxUSE_SPLASH" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPLASH = yes; then @@ -14246,25 +12633,15 @@ if test "${enable_textdlg+set}" = set; then else wx_cv_use_textdlg='wxUSE_TEXTDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}" fi eval "$wx_cv_use_textdlg" - if test "x$cache" = xyes; then - echo "wxUSE_TEXTDLG=$wxUSE_TEXTDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTDLG = yes; then @@ -14300,25 +12677,15 @@ if test "${enable_tipdlg+set}" = set; then else wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}" fi eval "$wx_cv_use_tipdlg" - if test "x$cache" = xyes; then - echo "wxUSE_STARTUP_TIPS=$wxUSE_STARTUP_TIPS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STARTUP_TIPS = yes; then @@ -14354,25 +12721,15 @@ if test "${enable_progressdlg+set}" = set; then else wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}" fi eval "$wx_cv_use_progressdlg" - if test "x$cache" = xyes; then - echo "wxUSE_PROGRESSDLG=$wxUSE_PROGRESSDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROGRESSDLG = yes; then @@ -14408,25 +12765,15 @@ if test "${enable_wizarddlg+set}" = set; then else wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}" fi eval "$wx_cv_use_wizarddlg" - if test "x$cache" = xyes; then - echo "wxUSE_WIZARDDLG=$wxUSE_WIZARDDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_WIZARDDLG = yes; then @@ -14464,25 +12811,15 @@ if test "${enable_menus+set}" = set; then else wx_cv_use_menus='wxUSE_MENUS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}" fi eval "$wx_cv_use_menus" - if test "x$cache" = xyes; then - echo "wxUSE_MENUS=$wxUSE_MENUS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MENUS = yes; then @@ -14518,25 +12855,15 @@ if test "${enable_miniframe+set}" = set; then else wx_cv_use_miniframe='wxUSE_MINIFRAME=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}" fi eval "$wx_cv_use_miniframe" - if test "x$cache" = xyes; then - echo "wxUSE_MINIFRAME=$wxUSE_MINIFRAME" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MINIFRAME = yes; then @@ -14572,25 +12899,15 @@ if test "${enable_tooltips+set}" = set; then else wx_cv_use_tooltips='wxUSE_TOOLTIPS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}" fi eval "$wx_cv_use_tooltips" - if test "x$cache" = xyes; then - echo "wxUSE_TOOLTIPS=$wxUSE_TOOLTIPS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOOLTIPS = yes; then @@ -14626,25 +12943,15 @@ if test "${enable_splines+set}" = set; then else wx_cv_use_splines='wxUSE_SPLINES=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}" fi eval "$wx_cv_use_splines" - if test "x$cache" = xyes; then - echo "wxUSE_SPLINES=$wxUSE_SPLINES" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPLINES = yes; then @@ -14680,25 +12987,15 @@ if test "${enable_mousewheel+set}" = set; then else wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}" fi eval "$wx_cv_use_mousewheel" - if test "x$cache" = xyes; then - echo "wxUSE_MOUSEWHEEL=$wxUSE_MOUSEWHEEL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MOUSEWHEEL = yes; then @@ -14734,25 +13031,15 @@ if test "${enable_validators+set}" = set; then else wx_cv_use_validators='wxUSE_VALIDATORS=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}" fi eval "$wx_cv_use_validators" - if test "x$cache" = xyes; then - echo "wxUSE_VALIDATORS=$wxUSE_VALIDATORS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_VALIDATORS = yes; then @@ -14788,25 +13075,15 @@ if test "${enable_busyinfo+set}" = set; then else wx_cv_use_busyinfo='wxUSE_BUSYINFO=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}" fi eval "$wx_cv_use_busyinfo" - if test "x$cache" = xyes; then - echo "wxUSE_BUSYINFO=$wxUSE_BUSYINFO" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BUSYINFO = yes; then @@ -14842,25 +13119,15 @@ if test "${enable_joystick+set}" = set; then else wx_cv_use_joystick='wxUSE_JOYSTICK=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}" fi eval "$wx_cv_use_joystick" - if test "x$cache" = xyes; then - echo "wxUSE_JOYSTICK=$wxUSE_JOYSTICK" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_JOYSTICK = yes; then @@ -14896,25 +13163,15 @@ if test "${enable_metafile+set}" = set; then else wx_cv_use_metafile='wxUSE_METAFILE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" fi eval "$wx_cv_use_metafile" - if test "x$cache" = xyes; then - echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_METAFILE = yes; then @@ -14950,25 +13207,15 @@ if test "${enable_dragimage+set}" = set; then else wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}" fi eval "$wx_cv_use_dragimage" - if test "x$cache" = xyes; then - echo "wxUSE_DRAGIMAGE=$wxUSE_DRAGIMAGE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DRAGIMAGE = yes; then @@ -15004,25 +13251,15 @@ if test "${enable_accessibility+set}" = set; then else wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}" fi eval "$wx_cv_use_accessibility" - if test "x$cache" = xyes; then - echo "wxUSE_ACCESSIBILITY=$wxUSE_ACCESSIBILITY" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ACCESSIBILITY = yes; then @@ -15060,25 +13297,15 @@ if test "${enable_palette+set}" = set; then else wx_cv_use_palette='wxUSE_PALETTE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}" fi eval "$wx_cv_use_palette" - if test "x$cache" = xyes; then - echo "wxUSE_PALETTE=$wxUSE_PALETTE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PALETTE = yes; then @@ -15114,25 +13341,15 @@ if test "${enable_image+set}" = set; then else wx_cv_use_image='wxUSE_IMAGE=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}" fi eval "$wx_cv_use_image" - if test "x$cache" = xyes; then - echo "wxUSE_IMAGE=$wxUSE_IMAGE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_IMAGE = yes; then @@ -15168,25 +13385,15 @@ if test "${enable_gif+set}" = set; then else wx_cv_use_gif='wxUSE_GIF=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}" fi eval "$wx_cv_use_gif" - if test "x$cache" = xyes; then - echo "wxUSE_GIF=$wxUSE_GIF" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GIF = yes; then @@ -15222,25 +13429,15 @@ if test "${enable_pcx+set}" = set; then else wx_cv_use_pcx='wxUSE_PCX=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}" fi eval "$wx_cv_use_pcx" - if test "x$cache" = xyes; then - echo "wxUSE_PCX=$wxUSE_PCX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PCX = yes; then @@ -15276,25 +13473,15 @@ if test "${enable_tga+set}" = set; then else wx_cv_use_tga='wxUSE_TGA=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}" fi eval "$wx_cv_use_tga" - if test "x$cache" = xyes; then - echo "wxUSE_TGA=$wxUSE_TGA" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TGA = yes; then @@ -15330,25 +13517,15 @@ if test "${enable_iff+set}" = set; then else wx_cv_use_iff='wxUSE_IFF=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}" fi eval "$wx_cv_use_iff" - if test "x$cache" = xyes; then - echo "wxUSE_IFF=$wxUSE_IFF" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_IFF = yes; then @@ -15384,25 +13561,15 @@ if test "${enable_pnm+set}" = set; then else wx_cv_use_pnm='wxUSE_PNM=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}" fi eval "$wx_cv_use_pnm" - if test "x$cache" = xyes; then - echo "wxUSE_PNM=$wxUSE_PNM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PNM = yes; then @@ -15438,25 +13605,15 @@ if test "${enable_xpm+set}" = set; then else wx_cv_use_xpm='wxUSE_XPM=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}" fi eval "$wx_cv_use_xpm" - if test "x$cache" = xyes; then - echo "wxUSE_XPM=$wxUSE_XPM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_XPM = yes; then @@ -15492,25 +13649,15 @@ if test "${enable_ico_cur+set}" = set; then else wx_cv_use_ico_cur='wxUSE_ICO_CUR=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}" fi eval "$wx_cv_use_ico_cur" - if test "x$cache" = xyes; then - echo "wxUSE_ICO_CUR=$wxUSE_ICO_CUR" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ICO_CUR = yes; then @@ -15548,25 +13695,15 @@ if test "${enable_dccache+set}" = set; then else wx_cv_use_dccache='wxUSE_DC_CACHEING=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" fi eval "$wx_cv_use_dccache" - if test "x$cache" = xyes; then - echo "wxUSE_DC_CACHEING=$wxUSE_DC_CACHEING" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DC_CACHEING = yes; then @@ -15582,60 +13719,6 @@ fi echo "${ECHO_T}$result" >&6; } - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iniconf" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-iniconf... $ECHO_C" >&6; } - # Check whether --enable-iniconf was given. -if test "${enable_iniconf+set}" = set; then - enableval=$enable_iniconf; - if test "$enableval" = yes; then - wx_cv_use_iniconf='wxUSE_INICONF=yes' - else - wx_cv_use_iniconf='wxUSE_INICONF=no' - fi - cache=yes - -else - - cache=no - LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}" - -fi - - - eval "$wx_cv_use_iniconf" - if test "x$cache" = xyes; then - echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_INICONF = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_INICONF - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -15656,25 +13739,15 @@ if test "${enable_ps_in_msw+set}" = set; then else wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}" fi eval "$wx_cv_use_ps_in_msw" - if test "x$cache" = xyes; then - echo "wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then @@ -15710,25 +13783,15 @@ if test "${enable_ownerdrawn+set}" = set; then else wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}" fi eval "$wx_cv_use_ownerdrawn" - if test "x$cache" = xyes; then - echo "wxUSE_OWNER_DRAWN=$wxUSE_OWNER_DRAWN" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OWNER_DRAWN = yes; then @@ -15744,60 +13807,6 @@ 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}-regkey" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6; } - # Check whether --enable-regkey was given. -if test "${enable_regkey+set}" = set; then - enableval=$enable_regkey; - if test "$enableval" = yes; then - wx_cv_use_regkey='wxUSE_REGKEY=yes' - else - wx_cv_use_regkey='wxUSE_REGKEY=no' - fi - cache=yes - -else - - cache=no - LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - - wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}" - -fi - - - eval "$wx_cv_use_regkey" - if test "x$cache" = xyes; then - echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_REGKEY = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_REGKEY - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -15818,25 +13827,15 @@ if test "${enable_uxtheme+set}" = set; then else wx_cv_use_uxtheme='wxUSE_UXTHEME=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}" fi eval "$wx_cv_use_uxtheme" - if test "x$cache" = xyes; then - echo "wxUSE_UXTHEME=$wxUSE_UXTHEME" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UXTHEME = yes; then @@ -15872,25 +13871,15 @@ if test "${enable_wxdib+set}" = set; then else wx_cv_use_wxdib='wxUSE_DIB=no' fi - cache=yes else - cache=no - LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - fi - wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}" fi eval "$wx_cv_use_wxdib" - if test "x$cache" = xyes; then - echo "wxUSE_DIB=$wxUSE_DIB" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DIB = yes; then @@ -15906,124 +13895,55 @@ fi echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_MSW" != 1; then + DEFAULT_wxUSE_AUTOID_MANAGEMENT=no fi - echo "saving argument cache $wx_arg_cache_file" - mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-autoidman" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-autoidman... $ECHO_C" >&6; } + # Check whether --enable-autoidman was given. +if test "${enable_autoidman+set}" = set; then + enableval=$enable_autoidman; + if test "$enableval" = yes; then + wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=yes' + else + wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=no' + fi +else -{ echo "$as_me:$LINENO: checking for toolkit" >&5 -echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; } + wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=${'DEFAULT_wxUSE_AUTOID_MANAGEMENT":-$defaultval}" -# In Wine, we need to default to MSW, not GTK or MOTIF -if test "$wxUSE_WINE" = "yes"; then - DEFAULT_DEFAULT_wxUSE_GTK=0 - DEFAULT_DEFAULT_wxUSE_MOTIF=0 - DEFAULT_DEFAULT_wxUSE_MSW=1 - wxUSE_SHARED=no - CC=${CC:-winegcc} - CXX=${CXX:-wineg++} fi -if test "$wxUSE_GUI" = "yes"; then + eval "$wx_cv_use_autoidman" - if test "$USE_BEOS" = 1; then - { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5 -echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} - { (exit 1); exit 1; }; } - fi - - if test "$TOOLKIT_GIVEN" = 1; then - for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - if test "x$value" = "xno"; then - eval "$var=0" - elif test "x$value" != "x"; then - eval "$var=1" - fi - - if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then - eval "wx${toolkit}_VERSION=$value" - fi - done - else - for toolkit in `echo $ALL_TOOLKITS`; do - if test "$has_toolkit_in_cache" != 1; then - var=DEFAULT_DEFAULT_wxUSE_$toolkit - else - var=DEFAULT_wxUSE_$toolkit - - eval "version=\$DEFAULT_wx${toolkit}_VERSION" - if test "x$version" != "x"; then - eval "wx${toolkit}_VERSION=$version" + if test x"$enablestring" = xdisable; then + if test $wxUSE_AUTOID_MANAGEMENT = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_AUTOID_MANAGEMENT fi - fi - eval "wxUSE_$toolkit=\$${var}" - done - fi - - NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \ - + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \ - + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` - - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` - esac - case "$NUM_TOOLKITS" in - 1) - ;; - 0) - { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5 -echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;} - { (exit 1); exit 1; }; } - ;; - *) - { { echo "$as_me:$LINENO: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&5 -echo "$as_me: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&2;} - { (exit 1); exit 1; }; } - esac + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - # to be removed when --disable-gtk2 isn't needed - if test "x$wxUSE_GTK2" = "xyes"; then - wxGTK_VERSION=2 - elif test "x$wxUSE_GTK2" = "xno"; then - wxGTK_VERSION=1 - fi - for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - if test "x$value" != x; then - cache_var=CACHE_$toolkit - eval "cache=\$${cache_var}" - if test "$cache" = 1; then - echo "$var=$value" >> ${wx_arg_cache_file} - eval "version=\$wx${toolkit}_VERSION" - if test "x$version" != "x"; then - echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file} - fi - fi - if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"` - { echo "$as_me:$LINENO: result: $toolkit_echo" >&5 -echo "${ECHO_T}$toolkit_echo" >&6; } - fi - fi - done -else - if test "x$host_alias" != "x"; then - { echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5 -echo "${ECHO_T}base ($host_alias hosted) only" >&6; } - else - { echo "$as_me:$LINENO: result: base only" >&5 -echo "${ECHO_T}base only" >&6; } - fi fi @@ -17103,6 +15023,163 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$INTELCC" = "yes"; then + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { echo "$as_me:$LINENO: checking whether we are using Intel C compiler v8 or later" >&5 +echo $ECHO_N "checking whether we are using Intel C compiler v8 or later... $ECHO_C" >&6; } +if test "${bakefile_cv_c_compiler___INTEL_COMPILER_lt_800+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800 + choke me + #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 + bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&6; } + if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" = "xyes"; then + :; INTELCC8=yes + else + :; + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { echo "$as_me:$LINENO: checking whether we are using Intel C compiler v10 or later" >&5 +echo $ECHO_N "checking whether we are using Intel C compiler v10 or later... $ECHO_C" >&6; } +if test "${bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000 + choke me + #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 + bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&6; } + if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then + :; INTELCC10=yes + else + :; + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + fi + if test "x$GCC" != "xyes"; then if test "xCC" = "xC"; then { echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5 @@ -17481,6 +15558,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$MWCC" != "yes"; then ac_ext=c @@ -17558,6 +15636,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi ;; IRIX*) @@ -17641,6 +15720,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ;; Linux*) + if test "$INTELCC" != "yes"; then ac_ext=c @@ -17718,6 +15798,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi ;; HP-UX*) @@ -18855,6 +16936,163 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$INTELCXX" = "yes"; then + + + 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 whether we are using Intel C++ compiler v8 or later" >&5 +echo $ECHO_N "checking whether we are using Intel C++ compiler v8 or later... $ECHO_C" >&6; } +if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800 + choke me + #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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&6; } + if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" = "xyes"; then + :; INTELCXX8=yes + else + :; + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + ac_ext=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 whether we are using Intel C++ compiler v10 or later" >&5 +echo $ECHO_N "checking whether we are using Intel C++ compiler v10 or later... $ECHO_C" >&6; } +if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000 + choke me + #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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&6; } + if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then + :; INTELCXX10=yes + else + :; + fi + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + fi + if test "x$GCXX" != "xyes"; then if test "xCXX" = "xC"; then { echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5 @@ -19233,6 +17471,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$MWCXX" != "yes"; then ac_ext=cpp @@ -19310,6 +17549,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi ;; IRIX*) @@ -19393,6 +17633,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ;; Linux*) + if test "$INTELCXX" != "yes"; then ac_ext=cpp @@ -19470,6 +17711,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi ;; HP-UX*) @@ -19722,103 +17964,6 @@ echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;} { (exit 1); exit 1; }; } fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - - if test "x$SUNCXX" != xyes; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. @@ -19923,96 +18068,6 @@ echo "$as_me: error: ar is needed to build wxWidgets" >&2;} fi fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -case ${INSTALL} in - /* ) # Absolute - ;; - ?:* ) # Drive letter, considered as absolute. - ;; - *) - INSTALL=`pwd`/${INSTALL} ;; -esac - retest_macosx_linking=no #if test "$wxUSE_MAC" = 1; then @@ -20050,6 +18105,8 @@ echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_ 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" retest_macosx_linking=yes @@ -20096,6 +18153,13 @@ echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6; } MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` + # If that failed, try again with the new key + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then + + MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` + + fi + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN { echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5 @@ -20108,6 +18172,11 @@ echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.pl else 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 + fi fi if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then @@ -20257,674 +18326,185 @@ case "${host}" in ;; esac -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then + CXXFLAGS="-qunique $CXXFLAGS" fi +case "${host}" in + powerpc-*-darwin* ) + { echo "$as_me:$LINENO: checking if __POWERPC__ is already defined" >&5 +echo $ECHO_N "checking if __POWERPC__ is already defined... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -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_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +int +main () +{ +#ifndef __POWERPC__ + choke me for lack of PowerPC +#endif -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } + ; + 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 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } + cat >>confdefs.h <<\_ACEOF +#define __POWERPC__ 1 +_ACEOF + + fi - if test "x$ac_ct_STRIP" = x; then - STRIP="true" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi +case "${host}" in + *-*-darwin* ) + { echo "$as_me:$LINENO: checking if CoreFoundation/CFBase.h is usable" >&5 +echo $ECHO_N "checking if CoreFoundation/CFBase.h is usable... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include -if test "$wxUSE_WINE" = "yes"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}wrc", so it can be a program name with args. -set dummy ${ac_tool_prefix}wrc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # 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_WINDRES="${ac_tool_prefix}wrc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS +int +main () +{ -fi -fi -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - { echo "$as_me:$LINENO: result: $WINDRES" >&5 -echo "${ECHO_T}$WINDRES" >&6; } + ; + 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 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } -fi + { echo "$as_me:$LINENO: checking if __CF_USE_FRAMEWORK_INCLUDES__ is required" >&5 +echo $ECHO_N "checking if __CF_USE_FRAMEWORK_INCLUDES__ is required... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define __CF_USE_FRAMEWORK_INCLUDES__ +#include +int +main () +{ -fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "wrc", so it can be a program name with args. -set dummy wrc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. + ; + 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 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS" 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_ac_ct_WINDRES="wrc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { { echo "$as_me:$LINENO: error: no. CoreFoundation not available. +See \`config.log' for more details." >&5 +echo "$as_me: error: no. CoreFoundation not available. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi -fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -echo "${ECHO_T}$ac_ct_WINDRES" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi - if test "x$ac_ct_WINDRES" = x; then - WINDRES="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; esac - WINDRES=$ac_ct_WINDRES - fi -else - WINDRES="$ac_cv_prog_WINDRES" -fi - - RESCOMP="$WINDRES" -else - case "${host}" in - *-*-cygwin* | *-*-mingw32* ) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # 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_WINDRES="${ac_tool_prefix}windres" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - { echo "$as_me:$LINENO: result: $WINDRES" >&5 -echo "${ECHO_T}$WINDRES" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -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_ac_ct_WINDRES="windres" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -echo "${ECHO_T}$ac_ct_WINDRES" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_WINDRES" = x; then - WINDRES="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - WINDRES=$ac_ct_WINDRES - fi -else - WINDRES="$ac_cv_prog_WINDRES" -fi - - RESCOMP="$WINDRES" - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_DLLTOOL="${ac_tool_prefix}dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -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_ac_ct_DLLTOOL="dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - - ;; - esac -fi - -{ echo "$as_me:$LINENO: checking if make is GNU make" >&5 -echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6; } -if test "${wx_cv_prog_makeisgnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null | - $EGREP -s GNU > /dev/null); then - wx_cv_prog_makeisgnu="yes" - else - wx_cv_prog_makeisgnu="no" - fi - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_prog_makeisgnu" >&5 -echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6; } - -if test "x$wx_cv_prog_makeisgnu" = "xyes"; then - IF_GNU_MAKE="" -else - IF_GNU_MAKE="#" -fi - - - -if test "x$wx_cv_prog_makeisgnu" != "xyes"; then -{ echo "$as_me:$LINENO: checking if make supports VPATH" >&5 -echo $ECHO_N "checking if make supports VPATH... $ECHO_C" >&6; } -if test "${wx_cv_prog_makevpath+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cat - << EOF > confMake -check : file - cp \$? \$@ - cp \$? final_file -EOF - -if test ! -d sub ; then - mkdir sub -fi -echo dummy > sub/file -${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null -RESULT=$? -rm -f sub/file check final_file confMake -rmdir sub -if test "$RESULT" = 0; then - wx_cv_prog_makevpath="yes" -else - wx_cv_prog_makevpath="no" -fi - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_prog_makevpath" >&5 -echo "${ECHO_T}$wx_cv_prog_makevpath" >&6; } - -if test "x$wx_cv_prog_makevpath" != "xyes"; then -{ { echo "$as_me:$LINENO: error: -You need a make-utility that is able to use the variable -VPATH correctly. -If your version of make does not support VPATH correctly, -please install GNU-make (possibly as gmake), and start -configure with the following command: -export MAKE=gmake; ./configure for sh-type shells -setenv MAKE gmake; ./configure for csh-type shells -Also please do remember to use gmake in this case every time -you are trying to compile. -" >&5 -echo "$as_me: error: -You need a make-utility that is able to use the variable -VPATH correctly. -If your version of make does not support VPATH correctly, -please install GNU-make (possibly as gmake), and start -configure with the following command: -export MAKE=gmake; ./configure for sh-type shells -setenv MAKE gmake; ./configure for csh-type shells -Also please do remember to use gmake in this case every time -you are trying to compile. -" >&2;} - { (exit 1); exit 1; }; } -fi fi -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } -fi - - - - -if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then - CXXFLAGS="-qunique $CXXFLAGS" -fi - -case "${host}" in - powerpc-*-darwin* ) - { echo "$as_me:$LINENO: checking if __POWERPC__ is already defined" >&5 -echo $ECHO_N "checking if __POWERPC__ is already defined... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __POWERPC__ - choke me for lack of PowerPC -#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 - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - cat >>confdefs.h <<\_ACEOF -#define __POWERPC__ 1 -_ACEOF - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; -esac - -case "${host}" in - *-*-darwin* ) - { echo "$as_me:$LINENO: checking if CoreFoundation/CFBase.h is usable" >&5 -echo $ECHO_N "checking if CoreFoundation/CFBase.h is usable... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -int -main () -{ - - ; - 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 - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: checking if __CF_USE_FRAMEWORK_INCLUDES__ is required" >&5 -echo $ECHO_N "checking if __CF_USE_FRAMEWORK_INCLUDES__ is required... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#define __CF_USE_FRAMEWORK_INCLUDES__ -#include - -int -main () -{ - - ; - 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 - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - CPPFLAGS="-D__CF_USE_FRAMEWORK_INCLUDES__ $CPPFLAGS" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { { echo "$as_me:$LINENO: error: no. CoreFoundation not available. -See \`config.log' for more details." >&5 -echo "$as_me: error: no. CoreFoundation not available. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ;; -esac - -wants_win32=0 -doesnt_want_win32=0 -case "${host}" in - *-*-cygwin*) - if test "$wxUSE_MSW" = 1 ; then - wants_win32=1 - else - { echo "$as_me:$LINENO: checking if -mno-cygwin is in effect" >&5 -echo $ECHO_N "checking if -mno-cygwin is in effect... $ECHO_C" >&6; } -if test "${wx_cv_nocygwin+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +wants_win32=0 +doesnt_want_win32=0 +case "${host}" in + *-*-cygwin*) + if test "$wxUSE_MSW" = 1 ; then + wants_win32=1 + else + { echo "$as_me:$LINENO: checking if -mno-cygwin is in effect" >&5 +echo $ECHO_N "checking if -mno-cygwin is in effect... $ECHO_C" >&6; } +if test "${wx_cv_nocygwin+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -21587,11 +19167,7 @@ done - - - - -for ac_header in stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h +for ac_header in langinfo.h wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -24799,7 +22375,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF - if test "$ac_cv_sizeof_long_long" != "0"; then + if test "$ac_cv_sizeof_long_long" != 0; then CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS" fi ;; @@ -25735,7 +23311,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test "$ac_cv_sizeof_wchar_t" != "0"; then +if test "$ac_cv_sizeof_wchar_t" != 0; then wxUSE_WCHAR_T=yes else wxUSE_WCHAR_T=no @@ -25975,6 +23551,8 @@ _ACEOF fi fi + +LARGEFILE_CPPFLAGS= # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then enableval=$enable_largefile; @@ -26129,25 +23707,29 @@ _ACEOF echo "${ECHO_T}$wx_largefile" >&6; } fi +if test "$ac_cv_sys_file_offset_bits" = "64"; then + LARGEFILE_CPPFLAGS="-D_FILE_OFFSET_BITS=64" +elif test "$ac_cv_sys_large_files" = 1; then + LARGEFILE_CPPFLAGS="-D_LARGE_FILES" +fi -if test "x$wx_largefile" = "xyes"; then - if test "x$ac_cv_sys_file_offset_bits" = "x64"; then - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES" +if test -n "$LARGEFILE_CPPFLAGS"; then + WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $LARGEFILE_CPPFLAGS" - if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then - { echo "$as_me:$LINENO: checking if -D__STDC_EXT__ is required" >&5 + if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then + { echo "$as_me:$LINENO: checking if -D__STDC_EXT__ is required" >&5 echo $ECHO_N "checking if -D__STDC_EXT__ is required... $ECHO_C" >&6; } if test "${wx_cv_STDC_EXT_required+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 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -26158,9 +23740,9 @@ int main () { - #ifndef __STDC_EXT__ - choke me - #endif + #ifndef __STDC_EXT__ + choke me + #endif ; return 0; @@ -26193,7 +23775,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - 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' @@ -26204,14 +23786,21 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi { echo "$as_me:$LINENO: result: $wx_cv_STDC_EXT_required" >&5 echo "${ECHO_T}$wx_cv_STDC_EXT_required" >&6; } - if test "x$wx_cv_STDC_EXT_required" = "xyes"; then - WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__" - fi + if test "x$wx_cv_STDC_EXT_required" = "xyes"; then + WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__" fi - else - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGE_FILES" fi - { echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +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 + +old_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $LARGEFILE_CPPFLAGS" +{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26248,7 +23837,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -26294,7 +23883,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -26335,9 +23924,15 @@ _ACEOF fi - if test "$ac_cv_sys_largefile_source" != no; then - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source" - fi +CPPFLAGS="$old_CPPFLAGS" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if test "$ac_cv_sys_largefile_source" != no; then + WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source" fi { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 @@ -26593,9 +24188,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - { echo "$as_me:$LINENO: checking if C++ compiler supports bool" >&5 -echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6; } -if test "${wx_cv_cpp_bool+set}" = set; then + { echo "$as_me:$LINENO: checking if C++ compiler supports the explicit keyword" >&5 +echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6; } +if test "${wx_cv_explicit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26607,20 +24202,19 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - 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. */ + class Foo { public: explicit Foo(int) {} }; int main () { - bool b = true; - return 0; ; @@ -26645,15 +24239,60 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_cpp_bool=yes + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + class Foo { public: explicit Foo(int) {} }; + static void TakeFoo(const Foo& foo) { } + +int +main () +{ + TakeFoo(17); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_explicit=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + wx_cv_explicit=yes + +fi - wx_cv_cpp_bool=no +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_explicit=no fi @@ -26667,47 +24306,76 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $wx_cv_cpp_bool" >&5 -echo "${ECHO_T}$wx_cv_cpp_bool" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_explicit" >&5 +echo "${ECHO_T}$wx_cv_explicit" >&6; } - if test "$wx_cv_cpp_bool" = "yes"; then + if test "$wx_cv_explicit" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define HAVE_BOOL 1 +#define HAVE_EXPLICIT 1 _ACEOF fi +if test "x$SUNCXX" = xyes; then + CXXFLAGS="-features=tmplife $CXXFLAGS" +fi - { echo "$as_me:$LINENO: checking if C++ compiler supports the explicit keyword" >&5 -echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6; } -if test "${wx_cv_explicit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +if test "x$SUNCC" = xyes; then + CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS" +fi +if test "x$SGICC" = "xyes"; then + CFLAGS="-woff 3970 $CFLAGS" +fi +if test "x$SGICXX" = "xyes"; then + CXXFLAGS="-woff 3970 $CXXFLAGS" +fi - ac_ext=cpp +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 /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - - class Foo { public: explicit Foo(int) {} }; - +#include int main () { - - return 0; - +$std_string foo; ; return 0; } @@ -26729,24 +24397,137 @@ 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 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + 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. */ - class Foo { public: explicit Foo(int) {} }; - static void TakeFoo(const Foo& foo) { } + #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; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_class_stdbasicstring=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - TakeFoo(17); - return 0; + wx_cv_class_stdbasicstring=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_class_stdbasicstring" >&5 +echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6; } + + if test "$wx_cv_class_stdbasicstring" != yes; then + if test "$wxUSE_STL" = "yes"; then + { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5 +echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;} + { (exit 1); exit 1; }; } + elif test "$wxUSE_STD_STRING" = "yes"; then + { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5 +echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5 +echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;} + wxUSE_STD_STRING=no + fi + fi + fi +fi + +if test "$wxUSE_STD_IOSTREAM" = "yes"; then + { echo "$as_me:$LINENO: checking for std::istream" >&5 +echo $ECHO_N "checking for std::istream... $ECHO_C" >&6; } +if test "${ac_cv_type_std__istream+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +typedef std::istream ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } @@ -26768,69 +24549,49 @@ 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_explicit=no -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_explicit=yes - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - + ac_cv_type_std__istream=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_explicit=no - + ac_cv_type_std__istream=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_explicit" >&5 -echo "${ECHO_T}$wx_cv_explicit" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_type_std__istream" >&5 +echo "${ECHO_T}$ac_cv_type_std__istream" >&6; } +if test $ac_cv_type_std__istream = yes; then - if test "$wx_cv_explicit" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_EXPLICIT 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_STD__ISTREAM 1 _ACEOF - fi - -{ echo "$as_me:$LINENO: checking whether the compiler supports const_cast<>" >&5 -echo $ECHO_N "checking whether the compiler supports const_cast<>... $ECHO_C" >&6; } -if test "${ac_cv_cxx_const_cast+set}" = set; then +else + wxUSE_STD_IOSTREAM=no +fi +{ echo "$as_me:$LINENO: checking for std::ostream" >&5 +echo $ECHO_N "checking for std::ostream... $ECHO_C" >&6; } +if test "${ac_cv_type_std__ostream+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - 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 + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include +typedef std::ostream ac__type_new_; int main () { -int x = 0;const int& y = x;int& z = const_cast(y);return z; +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; ; return 0; } @@ -26852,61 +24613,67 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_cxx_const_cast=yes + ac_cv_type_std__ostream=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_cxx_const_cast=no + ac_cv_type_std__ostream=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: $ac_cv_type_std__ostream" >&5 +echo "${ECHO_T}$ac_cv_type_std__ostream" >&6; } +if test $ac_cv_type_std__ostream = yes; then +cat >>confdefs.h <<_ACEOF +#define HAVE_STD__OSTREAM 1 +_ACEOF + +else + wxUSE_STD_IOSTREAM=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_const_cast" >&5 -echo "${ECHO_T}$ac_cv_cxx_const_cast" >&6; } -if test "$ac_cv_cxx_const_cast" = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_CONST_CAST -_ACEOF + if test "$wxUSE_STD_IOSTREAM" != "yes"; then + if test "$wxUSE_STD_IOSTREAM" = "yes"; then + { { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5 +echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5 +echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;} + fi + fi fi -{ echo "$as_me:$LINENO: checking whether the compiler supports reinterpret_cast<>" >&5 -echo $ECHO_N "checking whether the compiler supports reinterpret_cast<>... $ECHO_C" >&6; } -if test "${ac_cv_cxx_reinterpret_cast+set}" = set; then +if test "$wxUSE_STL" = "yes"; then + { echo "$as_me:$LINENO: checking for basic STL functionality" >&5 +echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6; } +if test "${wx_cv_lib_stl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - 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 + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -class Base { public : Base () {} virtual void f () = 0;}; -class Derived : public Base { public : Derived () {} virtual void f () {} }; -class Unrelated { public : Unrelated () {} }; -int g (Unrelated&) { return 0; } +#include + #include + #include + #include + #include int main () { - -Derived d;Base& b=d;Unrelated& e=reinterpret_cast(b);return g(e); +std::vector moo; + std::list foo; + std::vector::iterator it = + std::find_if(moo.begin(), moo.end(), + std::bind2nd(std::less(), 3)); ; return 0; } @@ -26928,60 +24695,49 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_cxx_reinterpret_cast=yes + wx_cv_lib_stl=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_cxx_reinterpret_cast=no + wx_cv_lib_stl=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: $ac_cv_cxx_reinterpret_cast" >&5 -echo "${ECHO_T}$ac_cv_cxx_reinterpret_cast" >&6; } -if test "$ac_cv_cxx_reinterpret_cast" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_REINTERPRET_CAST -_ACEOF +{ echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5 +echo "${ECHO_T}$wx_cv_lib_stl" >&6; } -fi + if test "$wx_cv_lib_stl" != yes; then + { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5 +echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missing" >&2;} + { (exit 1); exit 1; }; } + fi -{ echo "$as_me:$LINENO: checking whether the compiler supports static_cast<>" >&5 -echo $ECHO_N "checking whether the compiler supports static_cast<>... $ECHO_C" >&6; } -if test "${ac_cv_cxx_static_cast+set}" = set; then + { echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5 +echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6; } +if test "${wx_cv_func_stdstring_compare+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 + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -class Base { public : Base () {} virtual void f () = 0; }; -class Derived : public Base { public : Derived () {} virtual void f () {} }; -int g (Derived&) { return 0; } +#include int main () { - -Derived d; Base& b = d; Derived& s = static_cast (b); return g (s); +std::string foo, bar; + foo.compare(bar); + foo.compare(1, 1, bar); + foo.compare(1, 1, bar, 1, 1); + foo.compare(""); + foo.compare(1, 1, ""); + foo.compare(1, 1, "", 2); ; return 0; } @@ -27003,96 +24759,54 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_cxx_static_cast=yes + wx_cv_func_stdstring_compare=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_cxx_static_cast=no + wx_cv_func_stdstring_compare=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: $ac_cv_cxx_static_cast" >&5 -echo "${ECHO_T}$ac_cv_cxx_static_cast" >&6; } -if test "$ac_cv_cxx_static_cast" = yes; then +{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5 +echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_STATIC_CAST + if test "$wx_cv_func_stdstring_compare" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_STRING_COMPARE 1 _ACEOF -fi - - -if test "x$SUNCXX" = xyes; then - CXXFLAGS="-features=tmplife $CXXFLAGS" -fi - -if test "x$SUNCC" = xyes; then - CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS" -fi - -if test "x$SGICC" = "xyes"; then - CFLAGS="-woff 3970 $CFLAGS" -fi -if test "x$SGICXX" = "xyes"; then - CXXFLAGS="-woff 3970 $CXXFLAGS" -fi - -if test "x$HPCC" = "xyes"; then - CFLAGS="+W 2011,2450 $CFLAGS" -fi -if test "x$HPCXX" = "xyes"; then - CXXFLAGS="+W 2340 $CXXFLAGS" -fi - -if test "x$COMPAQCXX" = "xyes"; then - CXXFLAGS="-w0 -msg_disable basclsnondto,unrimpret,intconlosbit" -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 + if test "$wx_cv_class_gnuhashmapset" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_EXT_HASH_MAP 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_GNU_CXX_HASH_MAP 1 +_ACEOF -if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then - if test "$wxUSE_UNICODE" = "yes"; then - std_string="std::wstring" - char_type="wchar_t" - else - std_string="std::string" - char_type="char" fi - { echo "$as_me:$LINENO: checking for $std_string in " >&5 -echo $ECHO_N "checking for $std_string in ... $ECHO_C" >&6; } -if test "${wx_cv_class_stdstring+set}" = set; then + { echo "$as_me:$LINENO: checking for unordered_map" >&5 +echo $ECHO_N "checking for unordered_map... $ECHO_C" >&6; } +if test "${ac_cv_header_unordered_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -int -main () -{ -$std_string foo; - ; - return 0; -} + + + +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -27111,60 +24825,37 @@ 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 + ac_cv_header_unordered_map=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_class_stdstring=no - + ac_cv_header_unordered_map=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 "$as_me:$LINENO: result: $ac_cv_header_unordered_map" >&5 +echo "${ECHO_T}$ac_cv_header_unordered_map" >&6; } +if test $ac_cv_header_unordered_map = yes; then + { echo "$as_me:$LINENO: checking for unordered_map and unordered_set in std" >&5 +echo $ECHO_N "checking for unordered_map and unordered_set in std... $ECHO_C" >&6; } +if test "${wx_cv_class_stdunorderedmapset+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 + #include int main () { -std::basic_string<$char_type> foo; - const $char_type* dummy = foo.c_str(); +std::unordered_map test1; + std::unordered_set test2; ; return 0; } @@ -27186,44 +24877,37 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_class_stdbasicstring=yes + wx_cv_class_stdunorderedmapset=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_class_stdbasicstring=no - + wx_cv_class_stdunorderedmapset=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wx_cv_class_stdbasicstring" >&5 -echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6; } - - if test "$wx_cv_class_stdbasicstring" != yes; then - if test "$wxUSE_STL" = "yes"; then - { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5 -echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;} - { (exit 1); exit 1; }; } - elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then - { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5 -echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5 -echo "$as_me: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&2;} - wxUSE_STD_STRING=no - fi - fi - fi +{ echo "$as_me:$LINENO: result: $wx_cv_class_stdunorderedmapset" >&5 +echo "${ECHO_T}$wx_cv_class_stdunorderedmapset" >&6; } fi -if test "$wxUSE_STD_IOSTREAM" = "yes"; then - { echo "$as_me:$LINENO: checking for std::istream" >&5 -echo $ECHO_N "checking for std::istream... $ECHO_C" >&6; } -if test "${ac_cv_type_std__istream+set}" = set; then + + + if test "$wx_cv_class_stdunorderedmapset" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_UNORDERED_MAP 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_UNORDERED_SET 1 +_ACEOF + + else + { echo "$as_me:$LINENO: checking for tr1/unordered_map" >&5 +echo $ECHO_N "checking for tr1/unordered_map... $ECHO_C" >&6; } +if test "${ac_cv_header_tr1_unordered_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27232,19 +24916,10 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -typedef std::istream ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} + + +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -27263,31 +24938,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_std__istream=yes + ac_cv_header_tr1_unordered_map=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_std__istream=no + ac_cv_header_tr1_unordered_map=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_std__istream" >&5 -echo "${ECHO_T}$ac_cv_type_std__istream" >&6; } -if test $ac_cv_type_std__istream = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STD__ISTREAM 1 -_ACEOF - - -else - wxUSE_STD_IOSTREAM=no -fi -{ echo "$as_me:$LINENO: checking for std::ostream" >&5 -echo $ECHO_N "checking for std::ostream... $ECHO_C" >&6; } -if test "${ac_cv_type_std__ostream+set}" = set; then +{ echo "$as_me:$LINENO: result: $ac_cv_header_tr1_unordered_map" >&5 +echo "${ECHO_T}$ac_cv_header_tr1_unordered_map" >&6; } +if test $ac_cv_header_tr1_unordered_map = yes; then + { echo "$as_me:$LINENO: checking for unordered_map and unordered_set in std::tr1" >&5 +echo $ECHO_N "checking for unordered_map and unordered_set in std::tr1... $ECHO_C" >&6; } +if test "${wx_cv_class_tr1unorderedmapset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27296,16 +24962,16 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - -typedef std::ostream ac__type_new_; +#include + #include int main () { -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; +std::tr1::unordered_map test1; + std::tr1::unordered_set test2; + #if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<2) + #error can't use unordered_{map,set} with gcc-4.[01]: http://gcc.gnu.org/PR24389 + #endif ; return 0; } @@ -27327,46 +24993,37 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_std__ostream=yes + wx_cv_class_tr1unorderedmapset=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_std__ostream=no + wx_cv_class_tr1unorderedmapset=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_class_tr1unorderedmapset" >&5 +echo "${ECHO_T}$wx_cv_class_tr1unorderedmapset" >&6; } fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_std__ostream" >&5 -echo "${ECHO_T}$ac_cv_type_std__ostream" >&6; } -if test $ac_cv_type_std__ostream = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_STD__OSTREAM 1 -_ACEOF -else - wxUSE_STD_IOSTREAM=no -fi + if test "$wx_cv_class_tr1unorderedmapset" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_TR1_UNORDERED_MAP 1 +_ACEOF + cat >>confdefs.h <<\_ACEOF +#define HAVE_TR1_UNORDERED_SET 1 +_ACEOF - if test "$wxUSE_STD_IOSTREAM" != "yes"; then - if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then - { { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5 -echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;} - { (exit 1); exit 1; }; } else - { echo "$as_me:$LINENO: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5 -echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;} - fi - fi -fi - -if test "$wxUSE_STL" = "yes"; then - { echo "$as_me:$LINENO: checking for basic STL functionality" >&5 -echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6; } -if test "${wx_cv_lib_stl+set}" = set; then + { echo "$as_me:$LINENO: checking for hash_map" >&5 +echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; } +if test "${ac_cv_header_hash_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27375,22 +25032,10 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - #include - #include - #include - #include -int -main () -{ -std::vector moo; - std::list foo; - std::vector::iterator it = - std::find_if(moo.begin(), moo.end(), - std::bind2nd(std::less(), 3)); - ; - return 0; -} + + + +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -27409,30 +25054,22 @@ 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_lib_stl=yes + ac_cv_header_hash_map=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_lib_stl=no - + ac_cv_header_hash_map=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -{ echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5 -echo "${ECHO_T}$wx_cv_lib_stl" >&6; } - - if test "$wx_cv_lib_stl" != yes; then - { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5 -echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missing" >&2;} - { (exit 1); exit 1; }; } - fi - - { echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5 -echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6; } -if test "${wx_cv_func_stdstring_compare+set}" = set; then +{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 +echo "${ECHO_T}$ac_cv_header_hash_map" >&6; } +if test $ac_cv_header_hash_map = yes; then + { echo "$as_me:$LINENO: checking for std::hash_map and hash_set" >&5 +echo $ECHO_N "checking for std::hash_map and hash_set... $ECHO_C" >&6; } +if test "${wx_cv_class_stdhashmapset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27441,17 +25078,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include + #include int main () { -std::string foo, bar; - foo.compare(bar); - foo.compare(1, 1, bar); - foo.compare(1, 1, bar, 1, 1); - foo.compare(""); - foo.compare(1, 1, ""); - foo.compare(1, 1, "", 2); +std::hash_map, std::equal_to > test1; + std::hash_set, std::equal_to > test2; ; return 0; } @@ -27473,31 +25106,38 @@ 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_func_stdstring_compare=yes + wx_cv_class_stdhashmapset=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_func_stdstring_compare=no - + wx_cv_class_stdhashmapset=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5 +echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; } fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5 -echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; } - if test "$wx_cv_func_stdstring_compare" = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STD_STRING_COMPARE 1 + + + if test "$wx_cv_class_stdhashmapset" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_HASH_MAP 1 _ACEOF - fi + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_HASH_MAP 1 +_ACEOF - { echo "$as_me:$LINENO: checking for hash_map" >&5 -echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_hash_map+set}" = set; then + fi + + { echo "$as_me:$LINENO: checking for ext/hash_map" >&5 +echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; } +if test "${ac_cv_header_ext_hash_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27509,7 +25149,7 @@ cat >>conftest.$ac_ext <<_ACEOF -#include +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -27528,22 +25168,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_hash_map=yes + ac_cv_header_ext_hash_map=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_hash_map=no + ac_cv_header_ext_hash_map=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_hash_map" >&6; } -if test $ac_cv_header_hash_map = yes; then - { echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5 -echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6; } -if test "${wx_cv_class_stdhashmapset+set}" = set; then +{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 +echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; } +if test $ac_cv_header_ext_hash_map = yes; then + { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5 +echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; } +if test "${wx_cv_class_gnuhashmapset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -27552,13 +25192,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - #include +#include + #include int main () { -std::hash_map, std::equal_to > test1; - std::hash_set, std::equal_to > test2; +__gnu_cxx::hash_map, std::equal_to > test1; + __gnu_cxx::hash_set, std::equal_to > test2; ; return 0; } @@ -27580,111 +25220,67 @@ 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_stdhashmapset=yes + wx_cv_class_gnuhashmapset=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_class_stdhashmapset=no + wx_cv_class_gnuhashmapset=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5 -echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5 +echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; } fi - if test "$wx_cv_class_stdhashmapset" = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_HASH_MAP 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define HAVE_STD_HASH_MAP 1 -_ACEOF - + fi fi +fi - { echo "$as_me:$LINENO: checking for ext/hash_map" >&5 -echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_ext_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - - -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_ext_hash_map=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_ext_hash_map=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; } -if test $ac_cv_header_ext_hash_map = yes; then - { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5 -echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; } -if test "${wx_cv_class_gnuhashmapset+set}" = set; then + if test -n "$GCC"; then + { echo "$as_me:$LINENO: checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins" >&5 +echo $ECHO_N "checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins... $ECHO_C" >&6; } + if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - #include + int main () { -__gnu_cxx::hash_map, std::equal_to > test1; - __gnu_cxx::hash_set, std::equal_to > test2; + + unsigned int value=0; + /* wxAtomicInc doesn't use return value here */ + __sync_fetch_and_add(&value, 2); + __sync_sub_and_fetch(&value, 1); + /* but wxAtomicDec does, so mimic that: */ + unsigned int r2 = __sync_sub_and_fetch(&value, 1); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +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_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -27693,36 +25289,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - wx_cv_class_gnuhashmapset=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + wx_cv_cc_gcc_atomic_builtins=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_class_gnuhashmapset=no + wx_cv_cc_gcc_atomic_builtins=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5 -echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; } -fi - - - if test "$wx_cv_class_gnuhashmapset" = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_EXT_HASH_MAP 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define HAVE_GNU_CXX_HASH_MAP 1 + { echo "$as_me:$LINENO: result: $wx_cv_cc_gcc_atomic_builtins" >&5 +echo "${ECHO_T}$wx_cv_cc_gcc_atomic_builtins" >&6; } + if test $wx_cv_cc_gcc_atomic_builtins = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_GCC_ATOMIC_BUILTINS 1 _ACEOF fi -fi + fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -27734,6 +25325,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu SEARCH_INCLUDE="\ /usr/local/include \ + /usr/local/X11/include \ + /usr/local/include/X11 \ + /usr/local/X11R6/include \ + /usr/local/include/X11R6 \ \ /usr/Motif-2.1/include \ /usr/Motif-1.2/include \ @@ -27746,29 +25341,25 @@ SEARCH_INCLUDE="\ \ /usr/X11R6/include \ /usr/X11R6.4/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ \ /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ \ /usr/X11/include \ /usr/include/X11 \ - /usr/local/X11/include \ - /usr/local/include/X11 \ \ /usr/XFree86/include/X11 \ /usr/pkg/include \ \ + /usr/local/X1R5/include \ + /usr/local/include/X11R5 \ + /usr/X11R5/include \ + /usr/include/X11R5 \ + \ + /usr/local/X11R4/include \ + /usr/local/include/X11R4 \ + /usr/X11R4/include \ + /usr/include/X11R4 \ + \ /usr/openwin/share/include" { echo "$as_me:$LINENO: checking for libraries directory" >&5 @@ -28538,7 +26129,7 @@ echo "${ECHO_T}$ac_res" >&6; } if eval test \$wx_cv_func_$wx_func = yes then cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 _ACEOF @@ -28620,7 +26211,7 @@ echo "${ECHO_T}$ac_res" >&6; } if eval test \$wx_cv_func_$wx_func = yes then cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 _ACEOF @@ -28647,8 +26238,8 @@ _ACEOF if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then - { echo "$as_me:$LINENO: WARNING: Defaulting to the the builtin regex library for Unicode build." >&5 -echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode build." >&2;} + { echo "$as_me:$LINENO: WARNING: Defaulting to the builtin regex library for Unicode build." >&5 +echo "$as_me: WARNING: Defaulting to the builtin regex library for Unicode build." >&2;} wxUSE_REGEX=builtin fi @@ -29250,8 +26841,6 @@ echo "$as_me: WARNING: system png library not found or too old, will use built-i fi fi fi - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" fi @@ -30071,6 +27660,13 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead" wxUSE_LIBTIFF=sys fi fi + if test "$wxUSE_LIBTIFF" = "builtin" ; then + if test "$wxUSE_LIBJPEG" = "no"; then + ac_configure_args="$ac_configure_args --disable-jpeg" + fi + subdirs="$subdirs src/tiff" + + fi fi @@ -30557,8 +28153,14 @@ 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" - + ;; + esac if test "$wxUSE_ACCESSIBILITY" = "yes" ; then LIBS="$LIBS -loleacc" fi @@ -30568,17 +28170,6 @@ fi LIBS="$LIBS -lkernel32 -luser32" esac - if test "$wxUSE_ODBC" = "sys" ; then - wxUSE_ODBC = "yes" - fi - if test "$wxUSE_ODBC" = "yes" ; then - LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS" - cat >>confdefs.h <<\_ACEOF -#define wxUSE_ODBC 1 -_ACEOF - - fi - RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" RESPROGRAMOBJ="\$(PROGRAM)_resources.o" @@ -30649,7 +28240,7 @@ if test "$wxUSE_GUI" = "yes"; then WXGTK12= WXGTK127= - WXGTK20= + WXGTK2= WXGPE= if test "$wxUSE_COCOA" = 1 ; then @@ -30782,7 +28373,7 @@ fi no_gtk=yes fi - min_gtk_version=2.0.0 + min_gtk_version=2.4.0 { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5 echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; } @@ -31700,7 +29291,7 @@ echo "${ECHO_T}$wx_cv_lib_gtk" >&6; } fi case "$wx_cv_lib_gtk" in - 2.0) WXGTK20=1 + 2.0) WXGTK2=1 TOOLKIT_VERSION=2 ;; 1.2.7) WXGTK127=1 @@ -31728,86 +29319,12 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config ;; esac - if test "$WXGTK20" = 1; then + if test "$WXGTK2" = 1; then save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" CFLAGS="$wx_cv_cflags_gtk $CFLAGS" LIBS="$LIBS $wx_cv_libs_gtk" - { echo "$as_me:$LINENO: checking whether gtk_icon_size_lookup is declared" >&5 -echo $ECHO_N "checking whether gtk_icon_size_lookup is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_gtk_icon_size_lookup+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 () -{ -#ifndef gtk_icon_size_lookup - (void) gtk_icon_size_lookup; -#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 - ac_cv_have_decl_gtk_icon_size_lookup=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_gtk_icon_size_lookup=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_icon_size_lookup" >&5 -echo "${ECHO_T}$ac_cv_have_decl_gtk_icon_size_lookup" >&6; } -if test $ac_cv_have_decl_gtk_icon_size_lookup = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 0 -_ACEOF - -cat >>confdefs.h <<\_ACEOF -#define NEED_GTK_ICON_SIZE_LOOKUP 1 -_ACEOF - -fi - - - - { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5 echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -31855,10 +29372,6 @@ _ACEOF cat >>confdefs.h <<\_ACEOF #define __WXGTK26__ 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define __WXGTK24__ 1 _ACEOF { echo "$as_me:$LINENO: result: yes" >&5 @@ -31921,79 +29434,12 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest.$ac_objext; then cat >>confdefs.h <<\_ACEOF -#define __WXGTK26__ 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define __WXGTK24__ 1 -_ACEOF - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - ac_wxgtk26=1 - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - ac_wxgtk26=0 - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - - if test "$ac_wxgtk26" = 0; then - { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.4" >&5 -echo $ECHO_N "checking if GTK+ is version >= 2.4... $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,4,0) - Not GTK+ 2.4 - #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 __WXGTK24__ 1 +#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 @@ -32002,6 +29448,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } + ac_wxgtk26=0 fi @@ -34591,9 +32038,9 @@ echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6; } libsm_ice_link="" libs_found=0 for libp in "" " -lXp"; do - if test "$libs_found" = "0"; then + if test "$libs_found" = 0; then for libsm_ice in "" " -lSM -lICE"; do - if test "$libs_found" = "0"; then + if test "$libs_found" = 0; then save_LIBS="$LIBS" LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11" save_CFLAGS=$CFLAGS @@ -34665,7 +32112,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi done - if test "$libs_found" = "0"; then + if test "$libs_found" = 0; then { echo "$as_me:$LINENO: result: can't find the right libraries" >&5 echo "${ECHO_T}can't find the right libraries" >&6; } { { echo "$as_me:$LINENO: error: can't link a simple motif program" >&5 @@ -35134,7 +32581,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi fi - if test "$wxUSE_MAC" = 1; then + if test "$wxUSE_OSX_CARBON" = 1; then { echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5 echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6; } if test "$GCC" = yes; then @@ -35156,11 +32603,16 @@ echo "${ECHO_T}none" >&6; } CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS" fi - TOOLKIT=MAC - GUIDIST=MACX_DIST + TOOLKIT=OSX_CARBON + GUIDIST=OSX_CARBON_DIST WXBASEPORT="_carbon" fi + if test "$wxUSE_OSX_COCOA" = 1; then + TOOLKIT=OSX_COCOA + GUIDIST=OSX_COCOA_DIST + fi + if test "$wxUSE_COCOA" = 1; then TOOLKIT=COCOA GUIDIST=COCOA_DIST @@ -35239,7 +32691,7 @@ _ACEOF if test "$TOOLKIT" = "PM" ; then TOOLKIT_DIR="os2" else - TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` + TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'` fi if test "$wxUSE_UNIVERSAL" = "yes"; then @@ -35265,11 +32717,9 @@ fi if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then - if test "$TOOLKIT" = "DFB" ; then - wxUSE_UNICODE_UTF8=yes - elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "1" ; then + if test "$USE_UNIX" = 1 -a "$wxUSE_DARWIN" != 1 ; then wxUSE_UNICODE_UTF8=yes - elif test "$USE_OS2" = "1" ; then + elif test "$USE_OS2" = 1 ; then wxUSE_UNICODE_UTF8=yes else wxUSE_UNICODE_UTF8=no @@ -35404,299 +32854,6 @@ fi -IODBC_C_SRC="" - - -if test "$TOOLKIT" != "MSW" ; then - - if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then - - { echo "$as_me:$LINENO: checking for sql.h" >&5 -echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sql_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -#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_sql_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_sql_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5 -echo "${ECHO_T}$ac_cv_header_sql_h" >&6; } -if test $ac_cv_header_sql_h = yes; then - found_sql_h=1 -fi - - - if test "x$found_sql_h" = "x1" ; then - { echo "$as_me:$LINENO: checking for SQLAllocEnv in -liodbc" >&5 -echo $ECHO_N "checking for SQLAllocEnv in -liodbc... $ECHO_C" >&6; } -if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-liodbc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any 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 SQLAllocEnv (); -int -main () -{ -return SQLAllocEnv (); - ; - 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_lib_iodbc_SQLAllocEnv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_iodbc_SQLAllocEnv=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_iodbc_SQLAllocEnv" >&5 -echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocEnv" >&6; } -if test $ac_cv_lib_iodbc_SQLAllocEnv = yes; then - ODBC_LINK=" -liodbc" -else - - { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lunixodbc" >&5 -echo $ECHO_N "checking for SQLAllocEnv in -lunixodbc... $ECHO_C" >&6; } -if test "${ac_cv_lib_unixodbc_SQLAllocEnv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lunixodbc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any 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 SQLAllocEnv (); -int -main () -{ -return SQLAllocEnv (); - ; - 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_lib_unixodbc_SQLAllocEnv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_unixodbc_SQLAllocEnv=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_unixodbc_SQLAllocEnv" >&5 -echo "${ECHO_T}$ac_cv_lib_unixodbc_SQLAllocEnv" >&6; } -if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then - ODBC_LINK=" -lunixodbc" -else - - { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lodbc" >&5 -echo $ECHO_N "checking for SQLAllocEnv in -lodbc... $ECHO_C" >&6; } -if test "${ac_cv_lib_odbc_SQLAllocEnv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lodbc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any 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 SQLAllocEnv (); -int -main () -{ -return SQLAllocEnv (); - ; - 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_lib_odbc_SQLAllocEnv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_odbc_SQLAllocEnv=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_odbc_SQLAllocEnv" >&5 -echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocEnv" >&6; } -if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then - ODBC_LINK=" -lodbc" -fi - - -fi - - -fi - - fi - if test "x$ODBC_LINK" = "x" ; then - if test "$wxUSE_ODBC" = "sys" ; then - { { echo "$as_me:$LINENO: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&5 -echo "$as_me: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: system ODBC library not found, will use built-in instead" >&5 -echo "$as_me: WARNING: system ODBC library not found, will use built-in instead" >&2;} - wxUSE_ODBC=builtin - fi - else - wxUSE_ODBC=sys - fi - fi - - if test "$wxUSE_ODBC" = "builtin" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_BUILTIN_IODBC 1 -_ACEOF - - fi -fi - -if test "$wxUSE_ODBC" != "no" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_ODBC 1 -_ACEOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" - - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_IODBC_" -fi - - if test "$wxUSE_DISPLAY" = "yes"; then if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then { echo "$as_me:$LINENO: checking for Xinerama" >&5 @@ -35928,16 +33085,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_MAC" = 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_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; } @@ -36195,10 +33351,23 @@ 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 + else + wxUSE_OPENGL=yes 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" = "yes"; then @@ -36353,6 +33522,11 @@ cat >>conftest.$ac_ext <<_ACEOF error this gcc is too old; #endif + /* visibility only makes sense for ELF shared libs: */ + #if !defined(__ELF__) && !defined(__APPLE__) + error this platform has no visibility; + #endif + extern __attribute__((__visibility__("hidden"))) int hiddenvar; extern __attribute__((__visibility__("default"))) int exportedvar; extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); @@ -36407,19 +33581,16 @@ fi { echo "$as_me:$LINENO: result: $wx_cv_cc_visibility" >&5 echo "${ECHO_T}$wx_cv_cc_visibility" >&6; } if test $wx_cv_cc_visibility = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_VISIBILITY 1 -_ACEOF - - - { echo "$as_me:$LINENO: checking for broken libstdc++ visibility" >&5 + { echo "$as_me:$LINENO: checking for broken libstdc++ visibility" >&5 echo $ECHO_N "checking for broken libstdc++ visibility... $ECHO_C" >&6; } if test "${wx_cv_cc_broken_libstdcxx_visibility+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else wx_save_CXXFLAGS="$CXXFLAGS" + wx_save_LDFLAGS="$LDFLAGS" CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" + LDFLAGS="$LDFLAGS -shared -fPIC" ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -36439,7 +33610,8 @@ int main () { - std::string x; + std::string s("hello"); + return s.length(); ; return 0; @@ -36480,17 +33652,104 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu CXXFLAGS="$wx_save_CXXFLAGS" + LDFLAGS="$wx_save_LDFLAGS" fi { echo "$as_me:$LINENO: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5 echo "${ECHO_T}$wx_cv_cc_broken_libstdcxx_visibility" >&6; } + + if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then + { echo "$as_me:$LINENO: checking whether we can work around it" >&5 +echo $ECHO_N "checking whether we can work around it... $ECHO_C" >&6; } + if test "${wx_cv_cc_visibility_workaround+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. */ + + #pragma GCC visibility push(default) + #include + #pragma GCC visibility pop + +int +main () +{ + + std::string s("hello"); + return s.length(); + + ; + 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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + wx_cv_cc_visibility_workaround=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_cc_visibility_workaround=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi + + { echo "$as_me:$LINENO: result: $wx_cv_cc_visibility_workaround" >&5 +echo "${ECHO_T}$wx_cv_cc_visibility_workaround" >&6; } + + if test $wx_cv_cc_visibility_workaround = no; then + wx_cv_cc_visibility=no + fi + fi + fi + + if test $wx_cv_cc_visibility = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_VISIBILITY 1 +_ACEOF + if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1 _ACEOF fi - else CFLAGS_VISIBILITY="" CXXFLAGS_VISIBILITY="" @@ -36628,24 +33887,27 @@ 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* ) - WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL" ;; *-*-hpux* ) @@ -36656,9 +33918,11 @@ EOF esac fi + WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL" + if test $wxUSE_RPATH = "no"; then SAMPLES_RPATH_FLAG='' - SAMPLES_RPATH_POSTLINK='' + DYLIB_PATH_POSTLINK='' WXCONFIG_RPATH='' fi @@ -36698,19 +33962,18 @@ 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}${lib_debug_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}${lib_debug_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}-${WX_DEBUGTYPE}${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_COCOA" = 1; then + WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" +else + WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_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}" else @@ -36840,157 +34103,9 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -fi - -if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then - WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r" - WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc" - - LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}" - - # Extract the first word of "Rez", so it can be a program name with args. -set dummy Rez; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_REZ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$REZ"; then - ac_cv_prog_REZ="$REZ" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_REZ="Rez" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez" -fi -fi -REZ=$ac_cv_prog_REZ -if test -n "$REZ"; then - { echo "$as_me:$LINENO: result: $REZ" >&5 -echo "${ECHO_T}$REZ" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - # Extract the first word of "DeRez", so it can be a program name with args. -set dummy DeRez; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DEREZ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DEREZ"; then - ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DEREZ="DeRez" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez" -fi -fi -DEREZ=$ac_cv_prog_DEREZ -if test -n "$DEREZ"; then - { echo "$as_me:$LINENO: result: $DEREZ" >&5 -echo "${ECHO_T}$DEREZ" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } fi - # Extract the first word of "SetFile", so it can be a program name with args. -set dummy SetFile; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_SETFILE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$SETFILE"; then - ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_SETFILE="SetFile" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile" -fi -fi -SETFILE=$ac_cv_prog_SETFILE -if test -n "$SETFILE"; then - { echo "$as_me:$LINENO: result: $SETFILE" >&5 -echo "${ECHO_T}$SETFILE" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - - MACSETFILE="\$(SETFILE)" - - if test "$wxUSE_MAC" = 1; then - POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o" - RESCOMP="$REZ" - WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o" - else - POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}" - RESCOMP="echo -n \| $REZ" - WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII" - fi - -else - MACSETFILE="@true" - - if test "$wxUSE_PM" = 1; then - RESCOMP="emxbind" - WXCONFIG_RESFLAGS="-ep" - - POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS" - else - POSTLINK_COMMAND="@true" - fi - -fi - - - { echo "$as_me:$LINENO: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; } if test "${ac_cv_type_mode_t+set}" = set; then @@ -37243,44 +34358,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes -else - ac_cv_type_uid_t=no -fi -rm -f conftest* - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } -if test $ac_cv_type_uid_t = no; then - -cat >>confdefs.h <<\_ACEOF -#define uid_t int -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define gid_t int -_ACEOF - -fi - { echo "$as_me:$LINENO: checking for ssize_t" >&5 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; } @@ -37882,7 +34959,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 @@ -38143,7 +35224,8 @@ fi -for ac_func in snprintf vsnprintf + +for ac_func in snprintf vsnprintf vsscanf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -38237,6 +35319,12 @@ fi done +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 "$ac_cv_func_vsnprintf" = "yes"; then { echo "$as_me:$LINENO: checking for vsnprintf declaration" >&5 echo $ECHO_N "checking for vsnprintf declaration... $ECHO_C" >&6; } @@ -38286,7 +35374,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then wx_cv_func_vsnprintf_decl=yes @@ -38360,7 +35448,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then wx_cv_func_broken_vsnprintf_decl=no @@ -38436,7 +35524,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then wx_cv_func_snprintf_decl=yes @@ -38460,80 +35548,6 @@ echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; } #define HAVE_SNPRINTF_DECL 1 _ACEOF - - { echo "$as_me:$LINENO: checking if snprintf declaration is broken" >&5 -echo $ECHO_N "checking if snprintf declaration is broken... $ECHO_C" >&6; } -if test "${wx_cv_func_broken_snprintf_decl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - #include - #ifdef __MSL__ - #if __MSL__ >= 0x6000 - namespace std {} - using namespace std; - #endif - #endif - -int -main () -{ - - char *buf; - const char *fmt = "%s"; - snprintf(buf, 10u, fmt, "wx"); - - ; - 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_func_broken_snprintf_decl=no -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_func_broken_snprintf_decl=yes - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_snprintf_decl" >&5 -echo "${ECHO_T}$wx_cv_func_broken_snprintf_decl" >&6; } - - if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_BROKEN_SNPRINTF_DECL 1 -_ACEOF - - fi fi if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then @@ -38621,128 +35635,36 @@ _ACEOF fi fi -if test "$wxUSE_UNICODE" = yes; then - - -for ac_func in swprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +if test "$ac_cv_func_vsscanf" = "yes"; then + { echo "$as_me:$LINENO: checking for vsscanf declaration" >&5 +echo $ECHO_N "checking for vsscanf declaration... $ECHO_C" >&6; } +if test "${wx_cv_func_vsscanf_decl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - if test "$ac_cv_func_swprintf" = "yes"; then - { echo "$as_me:$LINENO: checking if swprintf declaration is broken" >&5 -echo $ECHO_N "checking if swprintf declaration is broken... $ECHO_C" >&6; } -if test "${wx_cv_func_broken_swprintf_decl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include - #include + #include + #include + #ifdef __MSL__ + #if __MSL__ >= 0x6000 + namespace std {} + using namespace std; + #endif + #endif int main () { - wchar_t *buf; - const wchar_t *fmt = L"test"; - swprintf(buf, 10u, fmt); + char *buf; + va_list args; + vsscanf(buf, "%s", args); ; return 0; @@ -38762,15 +35684,15 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_func_broken_swprintf_decl=no + wx_cv_func_vsscanf_decl=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_func_broken_swprintf_decl=yes + wx_cv_func_vsscanf_decl=no fi @@ -38778,16 +35700,24 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_swprintf_decl" >&5 -echo "${ECHO_T}$wx_cv_func_broken_swprintf_decl" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_func_vsscanf_decl" >&5 +echo "${ECHO_T}$wx_cv_func_vsscanf_decl" >&6; } - if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_BROKEN_SWPRINTF_DECL 1 + if test "$wx_cv_func_vsscanf_decl" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_VSSCANF_DECL 1 _ACEOF - fi fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +if test "$wxUSE_UNICODE" = yes; then wchar_headers="#include #include " @@ -38858,7 +35788,7 @@ done esac - for wx_func in wputc wputchar putws fputws wprintf vswprintf + for wx_func in putws fputws wprintf vswprintf vswscanf do { echo "$as_me:$LINENO: checking for $wx_func" >&5 echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } @@ -38928,7 +35858,7 @@ echo "${ECHO_T}$ac_res" >&6; } if eval test \$wx_cv_func_$wx_func = yes then cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 _ACEOF @@ -38990,90 +35920,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext; fi -if test "x$ac_cv_header_fnmatch_h" = "xyes"; then - - for wx_func in fnmatch - do - { echo "$as_me:$LINENO: checking for $wx_func" >&5 -echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } -if { as_var=wx_cv_func_$wx_func; 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. */ - - #include - $ac_includes_default - -int -main () -{ - - #ifndef $wx_func - &$wx_func; - #endif - - - ; - return 0; -} - -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval wx_cv_func_$wx_func=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval wx_cv_func_$wx_func=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -ac_res=`eval echo '${'wx_cv_func_$wx_func'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - - if eval test \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 -_ACEOF - - - else - : - - fi - done - -fi - if test "$wxUSE_FILE" = "yes"; then for wx_func in fsync @@ -39146,7 +35992,7 @@ echo "${ECHO_T}$ac_res" >&6; } if eval test \$wx_cv_func_$wx_func = yes then cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 _ACEOF @@ -39235,7 +36081,7 @@ echo "${ECHO_T}$ac_res" >&6; } if eval test \$wx_cv_func_$wx_func = yes then cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 _ACEOF @@ -39254,7 +36100,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$TOOLKIT" != "MSW"; then - +if test "$wxUSE_LIBICONV" != "no" ; then @@ -39466,7 +36312,8 @@ _ACEOF fi -LIBS="$LIBICONV $LIBS" + LIBS="$LIBICONV $LIBS" +fi if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then @@ -39810,7 +36657,7 @@ _ACEOF fi fi -if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then +if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != 1 -a "$USE_UNIX" != 1; then { echo "$as_me:$LINENO: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5 echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;} wxUSE_STACKWALKER=no @@ -40376,7 +37223,8 @@ echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;} fi -for ac_func in timegm + +for ac_func in setenv putenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -40465,14 +37313,13 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - + break fi done +if test "$ac_cv_func_setenv" = "yes"; then - - -for ac_func in setenv putenv +for ac_func in unsetenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -40561,10 +37408,11 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - break + fi done +fi HAVE_SOME_SLEEP_FUNC=0 if test "$USE_BEOS" = 1; then @@ -40823,7 +37671,7 @@ echo "${ECHO_T}$ac_res" >&6; } if eval test \$wx_cv_func_$wx_func = yes then cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 _ACEOF @@ -40917,7 +37765,7 @@ echo "${ECHO_T}$ac_res" >&6; } if eval test \$wx_cv_func_$wx_func = yes then cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 _ACEOF @@ -40999,7 +37847,7 @@ echo "${ECHO_T}$ac_res" >&6; } if eval test \$wx_cv_func_$wx_func = yes then cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 _ACEOF @@ -41082,7 +37930,7 @@ echo "${ECHO_T}$ac_res" >&6; } if eval test \$wx_cv_func_$wx_func = yes then cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 _ACEOF @@ -41650,7 +38498,7 @@ echo "${ECHO_T}$ac_res" >&6; } if eval test \$wx_cv_func_$wx_func = yes then cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 _ACEOF @@ -41661,6 +38509,268 @@ _ACEOF done +if test "$wxUSE_TARSTREAM" = "yes"; then + + for wx_func in sysconf + do + { echo "$as_me:$LINENO: checking for $wx_func" >&5 +echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } +if { as_var=wx_cv_func_$wx_func; 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 + +int +main () +{ + + #ifndef $wx_func + &$wx_func; + #endif + + + ; + return 0; +} + +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval wx_cv_func_$wx_func=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval wx_cv_func_$wx_func=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +fi +ac_res=`eval echo '${'wx_cv_func_$wx_func'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + + if eval test \$wx_cv_func_$wx_func = yes + then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 +_ACEOF + + + else + : + + fi + done + + + + for wx_func in getpwuid_r + do + { echo "$as_me:$LINENO: checking for $wx_func" >&5 +echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } +if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF + + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #define _REENTRANT + #include + + $ac_includes_default + +int +main () +{ + + #ifndef $wx_func + &$wx_func; + #endif + + struct passwd pw, *ppw; + char buf[1024]; + getpwuid_r(0, &pw, buf, sizeof(buf), &ppw) + + + ; + return 0; +} + +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval wx_cv_func_$wx_func=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval wx_cv_func_$wx_func=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +fi +ac_res=`eval echo '${'wx_cv_func_$wx_func'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + + if eval test \$wx_cv_func_$wx_func = yes + then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 +_ACEOF + + + else + : + + fi + done + + + + for wx_func in getgrgid_r + do + { echo "$as_me:$LINENO: checking for $wx_func" >&5 +echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } +if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF + + /* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + #define _REENTRANT + #include + + $ac_includes_default + +int +main () +{ + + #ifndef $wx_func + &$wx_func; + #endif + + struct group grp, *pgrp; + char buf[1024]; + getgrgid_r(0, &grp, buf, sizeof(buf), &pgrp) + + + ; + return 0; +} + +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval wx_cv_func_$wx_func=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval wx_cv_func_$wx_func=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + +fi +ac_res=`eval echo '${'wx_cv_func_$wx_func'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + + if eval test \$wx_cv_func_$wx_func = yes + then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$wx_func" | $as_tr_cpp` 1 +_ACEOF + + + else + : + + fi + done + +fi + fi @@ -43127,12 +40237,195 @@ _ACEOF { echo "$as_me:$LINENO: WARNING: wxMutex won't be recursive on this platform" >&5 echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;} fi + fi + + { 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 +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + + static __thread int n = 0; + static __thread int *p = 0; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_cc___thread=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_cc___thread=no + +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 + + 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 else if test "$wxUSE_THREADS" = "yes" ; then case "${host}" in + x86_64-*-mingw32* ) + ;; *-*-mingw32* ) { echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5 echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6; } @@ -43381,94 +40674,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for readdir_r" >&5 -echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6; } -if test "${ac_cv_func_readdir_r+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 readdir_r to an innocuous variant, in case declares readdir_r. - For example, HP-UX 11i declares gettimeofday. */ -#define readdir_r innocuous_readdir_r - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char readdir_r (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef readdir_r - -/* 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 readdir_r (); -/* 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_readdir_r || defined __stub___readdir_r -choke me -#endif - -int -main () -{ -return readdir_r (); - ; - 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_readdir_r=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_readdir_r=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_readdir_r" >&5 -echo "${ECHO_T}$ac_cv_func_readdir_r" >&6; } -if test $ac_cv_func_readdir_r = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_READDIR_R 1 -_ACEOF - -fi - @@ -44180,9 +41385,9 @@ echo "${ECHO_T}no" >&6; } fi fi -if test "$WXGTK20" = 1 ; then +if test "$WXGTK2" = 1 ; then cat >>confdefs.h <<_ACEOF -#define __WXGTK20__ $WXGTK20 +#define __WXGTK20__ $WXGTK2 _ACEOF WXGTK12=1 @@ -44210,9 +41415,11 @@ _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" - wxUSE_OPTIMISE=no fi if test "$wxUSE_DEBUG_GDB" = "yes" ; then @@ -44283,22 +41490,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 @@ -44342,9 +41554,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then HAVE_DL_FUNCS=0 HAVE_SHL_FUNCS=0 if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then - if test "$USE_DARWIN" = 1; then - HAVE_DL_FUNCS=1 - elif test "$USE_DOS" = 1; then + if test "$USE_DOS" = 1; then HAVE_DL_FUNCS=0 else @@ -44697,7 +41907,7 @@ fi done - if test "$HAVE_DL_FUNCS" = 1; then + if test "$HAVE_DL_FUNCS" = 1; then for ac_func in dlerror do @@ -44794,7 +42004,7 @@ _ACEOF else - { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5 + { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5 echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -44867,7 +42077,11 @@ fi fi done + fi fi + + if test "$USE_DARWIN" = 1; then + HAVE_DL_FUNCS=1 fi if test "$HAVE_DL_FUNCS" = 0; then @@ -44954,7 +42168,7 @@ _ACEOF fi -if test "$USE_UNIX" = "1" ; then +if test "$USE_UNIX" = 1 ; then if test "$wxUSE_MGL" != 1; then { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6; } @@ -45082,7 +42296,7 @@ fi WITH_PLUGIN_SDL=0 if test "$wxUSE_SOUND" = "yes"; then - if test "$USE_UNIX" = "1" ; then + if test "$USE_UNIX" = 1 ; then if test "$wxUSE_LIBSDL" != "no"; then # Check whether --with-sdl-prefix was given. @@ -45419,7 +42633,7 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound" fi -if test "$WXGTK20" = 1; then +if test "$WXGTK2" = 1; then if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -45542,6 +42756,97 @@ echo "${ECHO_T}no" >&6; } fi if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then + + if test "$wxUSE_GTKPRINT" = "yes" ; then + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for GTKPRINT" >&5 +echo $ECHO_N "checking for GTKPRINT... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GTKPRINT_CFLAGS"; then + pkg_cv_GTKPRINT_CFLAGS="$GTKPRINT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTKPRINT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GTKPRINT_LIBS"; then + pkg_cv_GTKPRINT_LIBS="$GTKPRINT_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTKPRINT_LIBS=`$PKG_CONFIG --libs "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"` + else + GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKPRINT_PKG_ERRORS" >&5 + + + { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 +echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} + wxUSE_GTKPRINT="no" + + +elif test $pkg_failed = untried; then + + { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 +echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} + wxUSE_GTKPRINT="no" + + +else + GTKPRINT_CFLAGS=$pkg_cv_GTKPRINT_CFLAGS + GTKPRINT_LIBS=$pkg_cv_GTKPRINT_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + CFLAGS="$GTKPRINT_CFLAGS $CFLAGS" + CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS" + cat >>confdefs.h <<\_ACEOF +#define wxUSE_GTKPRINT 1 +_ACEOF + + +fi + fi + if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then @@ -45949,7 +43254,7 @@ _ACEOF fi if test "$wxUSE_DEBUGREPORT" = "yes"; then - if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then + if test "$USE_UNIX" != 1 -a "$USE_WIN32" != 1; then { echo "$as_me:$LINENO: WARNING: Creating debug reports not currently supported on this system, disabled" >&5 echo "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;} wxUSE_DEBUGREPORT=no @@ -46049,6 +43354,77 @@ _ACEOF fi fi +if test "$wxUSE_XLOCALE" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_XLOCALE 1 +_ACEOF + + { echo "$as_me:$LINENO: checking for locale_t" >&5 +echo $ECHO_N "checking for locale_t... $ECHO_C" >&6; } +if test "${ac_cv_type_locale_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + +typedef locale_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_locale_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_locale_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_locale_t" >&5 +echo "${ECHO_T}$ac_cv_type_locale_t" >&6; } +if test $ac_cv_type_locale_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_LOCALE_T 1 +_ACEOF + + +fi + +fi + if test "$wxUSE_LOG" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_LOG 1 @@ -46350,191 +43726,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_func_gettimeofday_has_2_args=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - #include - -int -main () -{ - - struct timeval tv; - gettimeofday(&tv); - - ; - 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_func_gettimeofday_has_2_args=no -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5 -echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;} - wx_cv_func_gettimeofday_has_2_args=unknown - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5 -echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; } - - if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then - cat >>confdefs.h <<\_ACEOF -#define WX_GETTIMEOFDAY_NO_TZ 1 -_ACEOF - - fi -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 + wx_cv_func_gettimeofday_has_2_args=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 + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include int main () { - struct tm t; - strptime("foo", "bar", &t); + struct timeval tv; + gettimeofday(&tv); ; return 0; @@ -46554,110 +43766,41 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_func_strptime_decl=yes + wx_cv_func_gettimeofday_has_2_args=no 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 + { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5 +echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;} + wx_cv_func_gettimeofday_has_2_args=unknown fi -{ 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 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -( 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 - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5 -echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5 +echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; } - if test "$wx_cv_func_strptime_ok" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STRPTIME 1 + if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then + cat >>confdefs.h <<\_ACEOF +#define WX_GETTIMEOFDAY_NO_TZ 1 _ACEOF - fi fi +fi +if test "$wxUSE_DATETIME" = "yes"; then { 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 @@ -47012,7 +44155,7 @@ fi if test "$wxUSE_SOCKETS" = "yes"; then - if test "$wxUSE_MGL" = "1"; then + if test "$wxUSE_MGL" = 1; then { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5 echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;} wxUSE_SOCKETS="no" @@ -47331,76 +44474,163 @@ 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_type_getsockname3=int + wx_cv_type_getsockname3=int +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_type_getsockname3=unknown + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS="$CFLAGS_OLD" + + +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_type_getsockname3" >&5 +echo "${ECHO_T}$wx_cv_type_getsockname3" >&6; } + + if test "$wx_cv_type_getsockname3" = "unknown"; then + wxUSE_SOCKETS=no + { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5 +echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} + else + cat >>confdefs.h <<_ACEOF +#define WX_SOCKLEN_T $wx_cv_type_getsockname3 +_ACEOF + + fi + { echo "$as_me:$LINENO: checking what is the type of the fifth argument of getsockopt" >&5 +echo $ECHO_N "checking what is the type of the fifth argument of getsockopt... $ECHO_C" >&6; } +if test "${wx_cv_type_getsockopt5+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 () +{ + + socklen_t len; + getsockopt(0, 0, 0, 0, &len); + + ; + 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_type_getsockopt5=socklen_t +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + size_t len; + getsockopt(0, 0, 0, 0, &len); + + ; + 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_type_getsockopt5=size_t else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_type_getsockname3=unknown - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CFLAGS="$CFLAGS_OLD" - - -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_type_getsockname3" >&5 -echo "${ECHO_T}$wx_cv_type_getsockname3" >&6; } - - if test "$wx_cv_type_getsockname3" = "unknown"; then - wxUSE_SOCKETS=no - { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5 -echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} - else - cat >>confdefs.h <<_ACEOF -#define WX_SOCKLEN_T $wx_cv_type_getsockname3 -_ACEOF - - fi - { echo "$as_me:$LINENO: checking what is the type of the fifth argument of getsockopt" >&5 -echo $ECHO_N "checking what is the type of the fifth argument of getsockopt... $ECHO_C" >&6; } -if test "${wx_cv_type_getsockopt5+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 + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include int main () { - socklen_t len; - getsockopt(0, 0, 0, 0, &len); + int len; + getsockopt(0, 0, 0, 0, &len); ; return 0; @@ -47423,71 +44653,73 @@ 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_type_getsockopt5=socklen_t + wx_cv_type_getsockopt5=int else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + wx_cv_type_getsockopt5=unknown - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +fi - #include - #include +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -int -main () -{ +fi - size_t len; - getsockopt(0, 0, 0, 0, &len); +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ; - return 0; -} + +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_type_getsockopt5" >&5 +echo "${ECHO_T}$wx_cv_type_getsockopt5" >&6; } + + if test "$wx_cv_type_getsockopt5" = "unknown"; then + wxUSE_SOCKETS=no + { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5 +echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} + else + cat >>confdefs.h <<_ACEOF +#define SOCKOPTLEN_T $wx_cv_type_getsockopt5 _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_type_getsockopt5=size_t + + fi + fi +fi + +if test "$wxUSE_SOCKETS" = "yes" ; then + if test "$wxUSE_IPV6" = "yes"; then + { echo "$as_me:$LINENO: checking whether we have sockaddr_in6" >&5 +echo $ECHO_N "checking whether we have sockaddr_in6... $ECHO_C" >&6; } +if test "${wx_cv_type_sockaddr_in6+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include + #include int main () { - int len; - getsockopt(0, 0, 0, 0, &len); + struct sockaddr_in6 sa6; ; return 0; @@ -47507,53 +44739,36 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_type_getsockopt5=int + wx_cv_type_sockaddr_in6=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_type_getsockopt5=unknown + wx_cv_type_sockaddr_in6=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -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_type_getsockopt5" >&5 -echo "${ECHO_T}$wx_cv_type_getsockopt5" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_type_sockaddr_in6" >&5 +echo "${ECHO_T}$wx_cv_type_sockaddr_in6" >&6; } - if test "$wx_cv_type_getsockopt5" = "unknown"; then - wxUSE_SOCKETS=no - { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5 -echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} - else - cat >>confdefs.h <<_ACEOF -#define SOCKOPTLEN_T $wx_cv_type_getsockopt5 + if test "$wx_cv_type_sockaddr_in6"="yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_IPV6 1 _ACEOF + else + { echo "$as_me:$LINENO: WARNING: IPv6 support not available... disabled" >&5 +echo "$as_me: WARNING: IPv6 support not available... disabled" >&2;} fi fi -fi -if test "$wxUSE_SOCKETS" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SOCKETS 1 _ACEOF @@ -47636,7 +44851,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then if test "$TOOLKIT" = "MSW"; then wxUSE_JOYSTICK=yes - elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then + elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then if test "$USE_DARWIN" = 1; then { echo "$as_me:$LINENO: checking headers have declarations needed for joystick support" >&5 echo $ECHO_N "checking headers have declarations needed for joystick support... $ECHO_C" >&6; } @@ -47701,7 +44916,7 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; } fi else - if test "$wxUSE_MGL" != "1"; then + if test "$wxUSE_MGL" != 1; then for ac_header in linux/joystick.h do @@ -47921,9 +45136,6 @@ if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview" - if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi" - fi fi if test "$wxUSE_HELP" = "yes"; then @@ -47957,15 +45169,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 @@ -48223,6 +45430,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 @@ -48349,7 +45560,6 @@ if test "$wxUSE_CHECKLST" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then @@ -48376,6 +45586,14 @@ _ACEOF USES_CONTROLS=1 fi +if test "$wxUSE_FILECTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FILECTRL 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_FILEPICKERCTRL" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_FILEPICKERCTRL 1 @@ -48402,7 +45620,7 @@ echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" > #define wxUSE_DISPLAY 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display" fi fi @@ -48430,6 +45648,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 @@ -48476,7 +45702,6 @@ if test "$wxUSE_LISTBOX" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox" fi if test "$wxUSE_LISTCTRL" = "yes"; then @@ -48499,7 +45724,6 @@ if test "$wxUSE_EDITABLELISTBOX" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox" fi if test "$wxUSE_NOTEBOOK" = "yes"; then @@ -48511,6 +45735,13 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" fi +if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_NOTIFICATION_MESSAGE 1 +_ACEOF + +fi + if test "$wxUSE_ODCOMBOBOX" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_ODCOMBOBOX 1 @@ -48536,6 +45767,13 @@ _ACEOF USES_CONTROLS=1 fi +if test "$wxUSE_REARRANGECTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_REARRANGECTRL 1 +_ACEOF + +fi + if test "$wxUSE_SASH" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SASH 1 @@ -48550,7 +45788,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 @@ -48639,13 +45877,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 @@ -48653,6 +45884,15 @@ _ACEOF USES_CONTROLS=1 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text" + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RICHEDIT 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RICHEDIT2 1 +_ACEOF + fi if test "$wxUSE_TOGGLEBTN" = "yes"; then @@ -48739,7 +45979,7 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit fi if test "$wxUSE_POPUPWIN" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then + if test "$wxUSE_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 @@ -48828,9 +46068,6 @@ _ACEOF USE_HTML=1 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox" - if test "$wxUSE_MAC" = 1; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl" - fi fi if test "$wxUSE_WEBKIT" = "yes"; then if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then @@ -48909,6 +46146,9 @@ _ACEOF else wxUSE_WEBKIT=no fi + if test "$wxUSE_WEBKIT" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl" + fi fi USE_XRC=0 @@ -48937,6 +46177,16 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui" fi +USE_PROPGRID=0 +if test "$wxUSE_PROPGRID" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_PROPGRID 1 +_ACEOF + + USE_PROPGRID=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid" +fi + USE_STC=0 if test "$wxUSE_STC" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -48945,6 +46195,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 @@ -48974,7 +46269,6 @@ if test "$wxUSE_MINIFRAME" = "yes"; then #define wxUSE_MINIFRAME 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" fi if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then @@ -49155,15 +46449,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 @@ -49175,15 +46464,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 @@ -49202,62 +46486,78 @@ _ACEOF fi +if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then + if test "$wxUSE_OWNER_DRAWN" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OWNER_DRAWN 1 +_ACEOF + + fi +fi + + if test "$wxUSE_MSW" = 1 ; then -if test "$wxUSE_DC_CACHEING" = "yes"; then - cat >>confdefs.h <<\_ACEOF + if test "$wxUSE_DC_CACHEING" = "yes"; then + cat >>confdefs.h <<\_ACEOF #define wxUSE_DC_CACHEING 1 _ACEOF -fi + fi -if test "$wxUSE_INICONF" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_INICONF 1 + if test "$wxUSE_DIB" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WXDIB 1 _ACEOF -fi + fi -if test "$wxUSE_DIB" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_WXDIB 1 + if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 _ACEOF -fi + fi -if test "$wxUSE_OWNER_DRAWN" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_OWNER_DRAWN 1 + if test "$wxUSE_UXTHEME" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UXTHEME 1 _ACEOF + fi + fi -if test "$wxUSE_REGKEY" = "yes"; then +if test "$wxUSE_AUTOID_MANAGEMENT" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define wxUSE_REGKEY 1 +#define wxUSE_AUTOID_MANAGEMENT 1 _ACEOF fi -if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 +if test "$USE_WIN32" = 1 ; then + if test "$wxUSE_INICONF" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_INICONF 1 _ACEOF -fi + fi -if test "$wxUSE_UXTHEME" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_UXTHEME 1 + if test "$wxUSE_REGKEY" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_REGKEY 1 _ACEOF + fi fi -fi +if test "$wxUSE_MAC" = 1; then + wxUSE_GRAPHICS_CONTEXT="yes" +fi if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then + if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then cat >>confdefs.h <<\_ACEOF #define wxUSE_GRAPHICS_CONTEXT 1 _ACEOF @@ -49350,7 +46650,7 @@ 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 @@ -49529,7 +46829,7 @@ fi if test "$wxUSE_GSTREAMER" = "yes"; then CPPFLAGS="$GST_CFLAGS $CPPFLAGS" - LIBS="$GST_LIBS $LIBS" + EXTRALIBS_MEDIA="$GST_LIBS" cat >>confdefs.h <<\_ACEOF #define wxUSE_GSTREAMER 1 @@ -49546,11 +46846,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` @@ -49579,15 +46888,12 @@ _ACEOF STD_BASE_LIBS="base" STD_GUI_LIBS="" BUILT_WX_LIBS="base" -ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base" +ALL_WX_LIBS="xrc stc gl media qa html adv core xml net base" if test "$wxUSE_SOCKETS" = "yes" ; then STD_BASE_LIBS="net $STD_BASE_LIBS" BUILT_WX_LIBS="net $BUILT_WX_LIBS" fi -if test "$wxUSE_ODBC" != "no" ; then - BUILT_WX_LIBS="odbc $BUILT_WX_LIBS" -fi if test "$wxUSE_XML" = "yes" ; then STD_BASE_LIBS="xml $STD_BASE_LIBS" BUILT_WX_LIBS="xml $BUILT_WX_LIBS" @@ -49601,9 +46907,6 @@ if test "$wxUSE_GUI" = "yes"; then STD_GUI_LIBS="qa $STD_GUI_LIBS" BUILT_WX_LIBS="qa $BUILT_WX_LIBS" fi - if test "$wxUSE_ODBC" != "no" ; then - BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS" - fi if test "$wxUSE_HTML" = "yes" ; then STD_GUI_LIBS="html $STD_GUI_LIBS" BUILT_WX_LIBS="html $BUILT_WX_LIBS" @@ -49617,6 +46920,12 @@ if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_AUI" = "yes" ; then BUILT_WX_LIBS="aui $BUILT_WX_LIBS" fi + if test "$wxUSE_PROPGRID" = "yes" ; then + BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS" + fi + if test "$wxUSE_RICHTEXT" = "yes" ; then + BUILT_WX_LIBS="richtext $BUILT_WX_LIBS" + fi if test "$wxUSE_STC" = "yes" ; then BUILT_WX_LIBS="stc $BUILT_WX_LIBS" fi @@ -49637,14 +46946,10 @@ 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" - else - LDFLAGS="$LDFLAGS -lQuickTimeLib" fi fi if test "$USE_DARWIN" = 1; then - LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System" - else - LDFLAGS="$LDFLAGS -lCarbonLib" + LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL" fi fi if test "$wxUSE_COCOA" = 1 ; then @@ -49663,9 +46968,8 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ - dynamic erase event exec font image minimal mobile \ - mobile/wxedit mobile/styles propsize render \ - rotate shaped 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" @@ -49681,19 +46985,114 @@ if test "$wxUSE_GUI" = "yes"; then fi else SAMPLES_SUBDIRS="console" + if test "$wxUSE_SOCKETS" = "yes" ; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" + fi + if test "$wxUSE_IPC" = "yes" ; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc" + fi fi if test "x$INTELCC" = "xyes" ; then - CWARNINGS="-Wall -wd810,869,981,1418,1572,1684" + CWARNINGS="-Wall -wd810,869,981,1418,1572,1684,2259" elif test "$GCC" = yes ; then CWARNINGS="-Wall -Wundef" fi if test "x$INTELCXX" = "xyes" ; then - CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419" + CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419,1881,2259" elif test "$GXX" = yes ; then - CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy" + CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy" + { echo "$as_me:$LINENO: checking CXXWARNINGS for gcc -Woverloaded-virtual" >&5 +echo $ECHO_N "checking CXXWARNINGS for gcc -Woverloaded-virtual... $ECHO_C" >&6; } +if test "${ac_cv_cxxflags_gcc_option__Woverloaded_virtual+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_cxxflags_gcc_option__Woverloaded_virtual="no, unknown" + + 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 + + ac_save_CXXFLAGS="$CXXFLAGS" +for ac_arg in "-pedantic -Werror % -Woverloaded-virtual" "-pedantic % -Woverloaded-virtual %% no, obsolete" # +do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_cxxflags_gcc_option__Woverloaded_virtual=`echo $ac_arg | sed -e 's,.*% *,,'` ; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done + CXXFLAGS="$ac_save_CXXFLAGS" + 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: $ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&5 +echo "${ECHO_T}$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&6; } +case ".$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" in + .ok|.ok,*) ;; + .|.no|.no,*) ;; + *) + if echo " $CXXWARNINGS " | grep " $ac_cv_cxxflags_gcc_option__Woverloaded_virtual " 2>&1 >/dev/null + then { (echo "$as_me:$LINENO: : CXXWARNINGS does contain \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual") >&5 + (: CXXWARNINGS does contain $ac_cv_cxxflags_gcc_option__Woverloaded_virtual) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + else { (echo "$as_me:$LINENO: : CXXWARNINGS=\"\$CXXWARNINGS \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual\"") >&5 + (: CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual" + fi + ;; +esac + fi @@ -49709,6 +47108,8 @@ CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \ C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS" CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS ` CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS ` +OBJCFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $OBJCFLAGS ` +OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS ` WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS` @@ -49724,7 +47125,7 @@ LIBS=`echo $LIBS` EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" -EXTRALIBS_ODBC="$ODBC_LINK" +EXTRALIBS_MEDIA="$GST_LIBS" EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" if test "$wxUSE_GUI" = "yes"; then EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT` @@ -49743,9 +47144,6 @@ fi if test "$wxUSE_EXPAT" = "builtin" ; then wxconfig_3rdparty="expat $wxconfig_3rdparty" fi -if test "$wxUSE_ODBC" = "builtin" ; then - wxconfig_3rdparty="odbc $wxconfig_3rdparty" -fi if test "$wxUSE_LIBTIFF" = "builtin" ; then wxconfig_3rdparty="tiff $wxconfig_3rdparty" fi @@ -49776,7 +47174,7 @@ _ACEOF ;; *) - for t in `echo $wxUNIV_THEMES | tr , ' ' | tr a-z A-Z`; do + for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[a-z]' '[A-Z]'`; do cat >>confdefs.h <<_ACEOF #define wxUSE_THEME_$t 1 _ACEOF @@ -49794,7 +47192,6 @@ fi - if test $wxUSE_MONOLITHIC = "yes" ; then MONOLITHIC=1 else @@ -49807,12 +47204,6 @@ else USE_PLUGINS=0 fi -if test $wxUSE_ODBC != "no" ; then - USE_ODBC=1 -else - USE_ODBC=0 -fi - if test "$wxUSE_DEBUGREPORT" = "yes" ; then USE_QA=1 else @@ -49850,7 +47241,23 @@ 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 + + @@ -49862,8 +47269,11 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"` case "$TOOLKIT" in GTK) TOOLKIT_DESC="GTK+" - if test "$WXGTK20" = 1; then + if test "$WXGTK2" = 1; then TOOLKIT_DESC="$TOOLKIT_DESC 2" + if test "$wxUSE_GTKPRINT" = "yes" ; then + TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing"; + fi if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint"; fi @@ -49943,6 +47353,9 @@ fi + + + if test "x$BAKEFILE_HOST" = "x"; then if test "x${host}" = "x" ; then { { echo "$as_me:$LINENO: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&5 @@ -50477,14 +47890,20 @@ else fi - case ${BAKEFILE_HOST} in - *-hp-hpux* ) - INSTALL_DIR="mkdir -p" - ;; - * ) - INSTALL_DIR='$(INSTALL) -d' - ;; - esac + { echo "$as_me:$LINENO: checking for command to install directories" >&5 +echo $ECHO_N "checking for command to install directories... $ECHO_C" >&6; } + INSTALL_TEST_DIR=acbftest$$ + $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1 + if test $? = 0 -a -d $INSTALL_TEST_DIR; then + rmdir $INSTALL_TEST_DIR + INSTALL_DIR='$(INSTALL) -d' + { echo "$as_me:$LINENO: result: $INSTALL -d" >&5 +echo "${ECHO_T}$INSTALL -d" >&6; } + else + INSTALL_DIR="mkdir -p" + { echo "$as_me:$LINENO: result: mkdir -p" >&5 +echo "${ECHO_T}mkdir -p" >&6; } + fi LDFLAGS_GUI= @@ -50640,6 +48059,8 @@ fi dlldir="$libdir" case "${BAKEFILE_HOST}" in + ia64-hp-hpux* ) + ;; *-hp-hpux* ) SO_SUFFIX="sl" SO_SUFFIX_MODULE="sl" @@ -50721,7 +48142,7 @@ fi ;; *-*-linux* ) - if test "$INTELCC" = "yes"; then + if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then PIC_FLAG="-KPIC" elif test "x$SUNCXX" = "xyes"; then SHARED_LD_CC="${CC} -G -o" @@ -50757,6 +48178,10 @@ objects="" linking_flag="-dynamiclib" ldargs="-r -keep_private_externs -nostdlib" +if test "x${D}CXX" = "x"; then + CXX="c++" +fi + while test ${D}# -gt 0; do case ${D}1 in @@ -50770,6 +48195,12 @@ while test ${D}# -gt 0; do shift ;; + -arch|-isysroot) + # collect these options and values + ldargs="${D}{ldargs} ${D}1 ${D}2" + shift + ;; + -s|-Wl,*) # collect these load args ldargs="${D}{ldargs} ${D}1" @@ -50809,9 +48240,9 @@ status=0 # Link one module containing all the others # if test ${D}{verbose} = 1; then - echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o" + echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o" fi -c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o +${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o status=${D}? # @@ -50820,9 +48251,9 @@ status=${D}? # if test ${D}{status} = 0; then if test ${D}{verbose} = 1; then - echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}" + echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}" fi - c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args} + ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args} status=${D}? fi @@ -50837,7 +48268,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="$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 @@ -51520,7 +48951,8 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;} SONAME_FLAG= case "${BAKEFILE_HOST}" in - *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) + *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ + *-*-k*bsd*-gnu | *-*-mirbsd* ) if test "x$SUNCXX" = "xyes"; then SONAME_FLAG="-h " else @@ -51625,24 +49057,20 @@ D='$' cat <bk-deps #!/bin/sh -# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf +# This script is part of Bakefile (http://www.bakefile.org) autoconf # script. It is used to track C/C++ files dependencies in portable way. # # Permission is given to use this file in any way. DEPSMODE=${DEPSMODE} -DEPSDIR=.deps DEPSFLAG="${DEPSFLAG}" - -mkdir -p ${D}DEPSDIR +DEPSDIRBASE=.deps if test ${D}DEPSMODE = gcc ; then ${D}* ${D}{DEPSFLAG} status=${D}? - if test ${D}{status} != 0 ; then - exit ${D}{status} - fi - # move created file to the location we want it in: + + # determine location of created files: while test ${D}# -gt 0; do case "${D}1" in -o ) @@ -51657,24 +49085,37 @@ if test ${D}DEPSMODE = gcc ; then esac shift done + objfilebase=\`basename ${D}objfile\` + builddir=\`dirname ${D}objfile\` depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\` depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\` + depsdir=${D}builddir/${D}DEPSDIRBASE + mkdir -p ${D}depsdir + + # if the compiler failed, we're done: + if test ${D}{status} != 0 ; then + rm -f ${D}depfile + exit ${D}{status} + fi + + # move created file to the location we want it in: if test -f ${D}depfile ; then - sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d + sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d rm -f ${D}depfile else # "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d - depfile=\`basename ${D}objfile | sed -e 's/\\..*${D}/.d/g'\` + depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\` if test ! -f ${D}depfile ; then # "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++) depfile="${D}objfile.d" fi if test -f ${D}depfile ; then - sed -e "/^${D}objfile/!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d + sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d rm -f ${D}depfile fi fi exit 0 + elif test ${D}DEPSMODE = mwcc ; then ${D}* || exit ${D}? # Run mwcc again with -MM and redirect into the dep file we want @@ -51694,8 +49135,15 @@ elif test ${D}DEPSMODE = mwcc ; then fi prevarg="${D}arg" done - ${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.d + + objfilebase=\`basename ${D}objfile\` + builddir=\`dirname ${D}objfile\` + depsdir=${D}builddir/${D}DEPSDIRBASE + mkdir -p ${D}depsdir + + ${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d exit 0 + elif test ${D}DEPSMODE = unixcc; then ${D}* || exit ${D}? # Run compiler again with deps flag and redirect into the dep file. @@ -51716,8 +49164,15 @@ elif test ${D}DEPSMODE = unixcc; then esac shift done - eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d + + objfilebase=\`basename ${D}objfile\` + builddir=\`dirname ${D}objfile\` + depsdir=${D}builddir/${D}DEPSDIRBASE + mkdir -p ${D}depsdir + + eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{depsdir}/${D}{objfilebase}.d exit 0 + else ${D}* exit ${D}? @@ -51918,10 +49373,13 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" + + BAKEFILE_BAKEFILE_M4_VERSION="0.2.6" + + +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6" @@ -52001,59 +49459,21 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - #if !defined(__INTEL_COMPILER) || \ - (__INTEL_COMPILER < 800) - There is no PCH support - #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 - - { echo "$as_me:$LINENO: result: yes" >&5 + if test "$INTELCXX8" = "yes"; then + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - ICC_PCH=1 - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - { echo "$as_me:$LINENO: result: no" >&5 + ICC_PCH=1 + if test "$INTELCXX10" = "yes"; then + ICC_PCH_CREATE_SWITCH="-pch-create" + ICC_PCH_USE_SWITCH="-pch-use" + else + ICC_PCH_CREATE_SWITCH="-create-pch" + ICC_PCH_USE_SWITCH="-use-pch" + fi + else + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi fi @@ -52065,7 +49485,7 @@ D='$' cat <bk-make-pch #!/bin/sh -# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf +# This script is part of Bakefile (http://www.bakefile.org) autoconf # script. It is used to generated precompiled headers. # # Permission is given to use this file in any way. @@ -52075,6 +49495,8 @@ header="${D}{2}" shift shift +builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\` + compiler="" headerfile="" @@ -52087,7 +49509,7 @@ while test ${D}{#} -gt 0; do headerfile="${D}{incdir}/${D}{header}" fi ;; - -use-pch|-use_pch ) + -use-pch|-use_pch|-pch-use ) shift add_to_cmdline=0 ;; @@ -52106,8 +49528,8 @@ else else mkdir -p \`dirname ${D}{outfile}\` fi - depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d" - mkdir -p .deps + depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d" + mkdir -p ${D}{builddir}/.deps if test "x${GCC_PCH}" = "x1" ; then # can do this because gcc is >= 3.4: ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}" @@ -52119,7 +49541,7 @@ else #include "${D}header" EOT # using -MF icc complains about differing command lines in creation/use - ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\ + ${D}compiler -c ${ICC_PCH_CREATE_SWITCH} ${D}outfile -MMD ${D}file && \\ sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\ rm -f ${D}file ${D}dfile ${D}{filename}.o fi @@ -52137,6 +49559,8 @@ EOF + + COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then COND_BUILD_DEBUG="" @@ -52182,6 +49606,51 @@ EOF COND_BUILD_RELEASE_UNICODE_1="" fi + COND_BUILD_debug="#" + if test "x$BUILD" = "xdebug" ; then + COND_BUILD_debug="" + fi + + COND_BUILD_debug_DEBUG_FLAG_default="#" + if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then + COND_BUILD_debug_DEBUG_FLAG_default="" + fi + + COND_BUILD_debug_DEBUG_INFO_default="#" + if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then + COND_BUILD_debug_DEBUG_INFO_default="" + fi + + COND_BUILD_debug_UNICODE_0="#" + if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then + COND_BUILD_debug_UNICODE_0="" + fi + + COND_BUILD_debug_UNICODE_1="#" + if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then + COND_BUILD_debug_UNICODE_1="" + fi + + COND_BUILD_release="#" + if test "x$BUILD" = "xrelease" ; then + COND_BUILD_release="" + fi + + COND_BUILD_release_DEBUG_INFO_default="#" + if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then + COND_BUILD_release_DEBUG_INFO_default="" + fi + + COND_BUILD_release_UNICODE_0="#" + if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then + COND_BUILD_release_UNICODE_0="" + fi + + COND_BUILD_release_UNICODE_1="#" + if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then + COND_BUILD_release_UNICODE_1="" + fi + COND_DEBUG_FLAG_1="#" if test "x$DEBUG_FLAG" = "x1" ; then COND_DEBUG_FLAG_1="" @@ -52247,19 +49716,14 @@ EOF COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1="" fi - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="" - fi - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="" fi - COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="" + COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="" fi COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#" @@ -52302,19 +49766,14 @@ EOF COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1="" fi - COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="" - fi - COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="" fi - COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="" + COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="" fi COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#" @@ -52347,11 +49806,6 @@ EOF COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1="" fi - COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="" - fi - COND_MONOLITHIC_0_USE_HTML_1="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then COND_MONOLITHIC_0_USE_HTML_1="" @@ -52362,9 +49816,9 @@ EOF COND_MONOLITHIC_0_USE_MEDIA_1="" fi - COND_MONOLITHIC_0_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_USE_ODBC_1="" + COND_MONOLITHIC_0_USE_PROPGRID_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_PROPGRID" = "x1" ; then + COND_MONOLITHIC_0_USE_PROPGRID_1="" fi COND_MONOLITHIC_0_USE_QA_1="#" @@ -52427,39 +49881,29 @@ EOF COND_PLATFORM_MACOSX_1="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_="" + COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_MSDOS" = "x0" ; then + COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="" + 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="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="" + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="" + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="" - fi - - COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="" - fi - - COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_X11="" + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="" fi COND_PLATFORM_MACOSX_1_USE_GUI_1="#" @@ -52467,6 +49911,11 @@ EOF COND_PLATFORM_MACOSX_1_USE_GUI_1="" fi + COND_PLATFORM_MACOSX_1_USE_OPENGL_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_PLATFORM_MACOSX_1_USE_OPENGL_1="" + fi + COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" @@ -52477,6 +49926,11 @@ EOF COND_PLATFORM_MACOS_1="" fi + COND_PLATFORM_MAC_0="#" + if test "x$PLATFORM_MAC" = "x0" ; then + COND_PLATFORM_MAC_0="" + fi + COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then COND_PLATFORM_MAC_1="" @@ -52562,19 +50016,19 @@ EOF COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" fi - COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then - COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="" fi - COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then - COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="" fi - COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then - COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" + COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="" fi COND_SHARED_0_USE_STC_1="#" @@ -52582,29 +50036,19 @@ EOF COND_SHARED_0_USE_STC_1="" fi - COND_SHARED_0_USE_XRC_1="#" - if test "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then - COND_SHARED_0_USE_XRC_1="" - fi - - COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#" + COND_SHARED_0_wxUSE_EXPAT_builtin="#" if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then - COND_SHARED_0_WXUSE_EXPAT_BUILTIN="" - fi - - COND_SHARED_0_WXUSE_ODBC_BUILTIN="#" - if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then - COND_SHARED_0_WXUSE_ODBC_BUILTIN="" + COND_SHARED_0_wxUSE_EXPAT_builtin="" fi - COND_SHARED_0_WXUSE_REGEX_BUILTIN="#" + COND_SHARED_0_wxUSE_REGEX_builtin="#" if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then - COND_SHARED_0_WXUSE_REGEX_BUILTIN="" + COND_SHARED_0_wxUSE_REGEX_builtin="" fi - COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#" + COND_SHARED_0_wxUSE_ZLIB_builtin="#" if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then - COND_SHARED_0_WXUSE_ZLIB_BUILTIN="" + COND_SHARED_0_wxUSE_ZLIB_builtin="" fi COND_SHARED_1="#" @@ -52617,11 +50061,6 @@ EOF COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" fi - COND_SHARED_1_USE_XRC_1="#" - if test "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then - COND_SHARED_1_USE_XRC_1="" - fi - COND_TOOLKIT_="#" if test "x$TOOLKIT" = "x" ; then COND_TOOLKIT_="" @@ -52697,16 +50136,6 @@ EOF COND_TOOLKIT_MAC="" fi - COND_TOOLKIT_MAC_USE_GUI_1="#" - if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then - COND_TOOLKIT_MAC_USE_GUI_1="" - fi - - COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="" - fi - COND_TOOLKIT_MGL="#" if test "x$TOOLKIT" = "xMGL" ; then COND_TOOLKIT_MGL="" @@ -52752,6 +50181,31 @@ EOF COND_TOOLKIT_MSW_WXUNIV_0="" fi + COND_TOOLKIT_OSX_CARBON="#" + if test "x$TOOLKIT" = "xOSX_CARBON" ; then + COND_TOOLKIT_OSX_CARBON="" + fi + + COND_TOOLKIT_OSX_CARBON_USE_GUI_1="#" + if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_OSX_CARBON_USE_GUI_1="" + fi + + COND_TOOLKIT_OSX_COCOA="#" + if test "x$TOOLKIT" = "xOSX_COCOA" ; then + COND_TOOLKIT_OSX_COCOA="" + fi + + COND_TOOLKIT_OSX_COCOA_USE_GUI_1="#" + if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_OSX_COCOA_USE_GUI_1="" + fi + + COND_TOOLKIT_OSX_IPHONE="#" + if test "x$TOOLKIT" = "xOSX_IPHONE" ; then + COND_TOOLKIT_OSX_IPHONE="" + fi + COND_TOOLKIT_PM="#" if test "x$TOOLKIT" = "xPM" ; then COND_TOOLKIT_PM="" @@ -52852,9 +50306,19 @@ EOF COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" fi - COND_USE_ODBC_1="#" - if test "x$USE_ODBC" = "x1" ; then - COND_USE_ODBC_1="" + COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then + COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="" + fi + + COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then + COND_USE_GUI_1_wxUSE_LIBPNG_builtin="" + fi + + COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then + COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="" fi COND_USE_OPENGL_1="#" @@ -52967,11 +50431,6 @@ EOF COND_WXUSE_LIBTIFF_BUILTIN="" fi - COND_WXUSE_ODBC_BUILTIN="#" - if test "x$wxUSE_ODBC" = "xbuiltin" ; then - COND_WXUSE_ODBC_BUILTIN="" - fi - COND_WXUSE_REGEX_BUILTIN="#" if test "x$wxUSE_REGEX" = "xbuiltin" ; then COND_WXUSE_REGEX_BUILTIN="" @@ -52982,6 +50441,36 @@ EOF COND_WXUSE_ZLIB_BUILTIN="" fi + COND_wxUSE_EXPAT_builtin="#" + if test "x$wxUSE_EXPAT" = "xbuiltin" ; then + COND_wxUSE_EXPAT_builtin="" + fi + + COND_wxUSE_LIBJPEG_builtin="#" + if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then + COND_wxUSE_LIBJPEG_builtin="" + fi + + COND_wxUSE_LIBPNG_builtin="#" + if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then + COND_wxUSE_LIBPNG_builtin="" + fi + + COND_wxUSE_LIBTIFF_builtin="#" + if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then + COND_wxUSE_LIBTIFF_builtin="" + fi + + COND_wxUSE_REGEX_builtin="#" + if test "x$wxUSE_REGEX" = "xbuiltin" ; then + COND_wxUSE_REGEX_builtin="" + fi + + COND_wxUSE_ZLIB_builtin="#" + if test "x$wxUSE_ZLIB" = "xbuiltin" ; then + COND_wxUSE_ZLIB_builtin="" + fi + if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then @@ -52997,6 +50486,100 @@ echo "$as_me: error: Versions of Bakefile used to generate makefiles ($BAKEFILE_ fi +case ${INSTALL} in + /* ) # Absolute + ;; + ?:* ) # Drive letter, considered as absolute. + ;; + *) + INSTALL=`pwd`/${INSTALL} ;; +esac + +if test "$wxUSE_GUI" = "yes"; then + +if test "$wxUSE_MSW" = 1 ; then + if test "x$WINDRES" = "x"; then + { { echo "$as_me:$LINENO: error: Required windres program not found" >&5 +echo "$as_me: error: Required windres program not found" >&2;} + { (exit 1); exit 1; }; } + fi + + RESCOMP="$WINDRES" +fi + +if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then + WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r" + WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc" + + LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}" + + # Extract the first word of "DeRez", so it can be a program name with args. +set dummy DeRez; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DEREZ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$DEREZ"; then + ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DEREZ="DeRez" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez" +fi +fi +DEREZ=$ac_cv_prog_DEREZ +if test -n "$DEREZ"; then + { echo "$as_me:$LINENO: result: $DEREZ" >&5 +echo "${ECHO_T}$DEREZ" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + + MACSETFILE="\$(SETFILE)" + + if test "$wxUSE_OSX_CARBON" = 1; then + POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o" + RESCOMP="$REZ" + WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o" + else + POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}" + RESCOMP="cat /dev/null \| $REZ" + WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII" + fi + +else + MACSETFILE="@true" + + if test "$wxUSE_PM" = 1; then + RESCOMP="emxbind" + WXCONFIG_RESFLAGS="-ep" + + POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS" + else + POSTLINK_COMMAND="@true" + fi +fi + +fi + + if test $GCC_PCH = 1 then if test "$wx_cv_gcc_pch_bug" = yes; then @@ -53008,7 +50591,11 @@ echo "$as_me: WARNING: *** --enable-precomp-headers is not recommended" >&2;} echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&2;} fi - CPPFLAGS="-DWX_PRECOMP $CPPFLAGS" + # Our WX_PRECOMP flag does not make sense for any language except C++ because + # the headers that benefit from precompilation are mostly C++ headers. + CXXFLAGS="-DWX_PRECOMP $CXXFLAGS" + # When Bakefile can do multi-language PCH (e.g. C++ and Objective-C++) enable this: + #OBJCXXFLAGS="-DWX_PRECOMP $CXXFLAGS" fi @@ -53021,10 +50608,6 @@ if test "$wxUSE_MAC" = 1 ; then fi if test "$wxUSE_SHARED" = "yes"; then - - sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'` - EXE_LINKER=`eval echo "$sanitised_bakefile_mess"` - case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" @@ -53033,10 +50616,6 @@ if test "$wxUSE_SHARED" = "yes"; then cp -p ${srcdir}/src/os2/dllar.sh . ;; esac -else - - EXE_LINKER="$CXX -o" - fi if test "$wxUSE_OMF" = "yes"; then case "${host}" in @@ -53053,7 +50632,7 @@ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS" case "${host}" in *-*-solaris2* ) - if "$GCC" = yes; then + if test "$GCC" = yes; then CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'` LIBS=`echo $LIBS | sed 's/-mt//'` EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'` @@ -53071,6 +50650,8 @@ esac CFLAGS="$CFLAGS $CFLAGS_VISIBILITY" CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" +OBJCFLAGS="$OBJCFLAGS $CFLAGS_VISIBILITY" +OBJCXXFLAGS="$OBJCXXFLAGS $CXXFLAGS_VISIBILITY" SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" @@ -53131,7 +50712,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 @@ -53170,9 +50750,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 @@ -53182,6 +50760,9 @@ ac_config_files="$ac_config_files lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config. ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" +ac_config_files="$ac_config_files utils/ifacecheck/rungccxml.sh" + + if test "$wx_cv_version_script" = "yes"; then ac_config_files="$ac_config_files version-script" @@ -53196,7 +50777,8 @@ ac_config_commands="$ac_config_commands wx-config" if test "$wxWITH_SUBDIRS" != "no"; then if test "$wxUSE_GUI" = "yes"; then SUBDIRS="samples demos utils" -else SUBDIRS="samples utils" +else + SUBDIRS="samples utils" fi @@ -53329,34 +50911,40 @@ echo "${ECHO_T}no" >&6; } -for subdir in `echo $SUBDIRS`; do +for subdir in $SUBDIRS; do if test -d ${srcdir}/${subdir} ; then if test "$wxUSE_GUI" = "yes"; then if test ${subdir} = "samples"; then makefiles="samples/Makefile.in $makefiles" - for sample in `echo $SAMPLES_SUBDIRS`; do + for sample in $SAMPLES_SUBDIRS; do if test -d $srcdir/samples/$sample; then makefiles="samples/$sample/Makefile.in $makefiles" fi done else - disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`; + disabled_var=DISABLED_`echo $subdir | tr '[a-z]' '[A-Z]'` eval "disabled=\$$disabled_var" disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"` fi - else if test ${subdir} = "samples"; then - makefiles="samples/Makefile.in samples/console/Makefile.in" + else + if test ${subdir} = "samples"; then + makefiles="samples/Makefile.in $makefiles" + for sample in `echo $SAMPLES_SUBDIRS`; do + if test -d $srcdir/samples/$sample; then + makefiles="samples/$sample/Makefile.in $makefiles" + fi + done elif test ${subdir} = "utils"; then makefiles="" - for util in HelpGen tex2rtf ; do + for util in ifacecheck ; do if test -d $srcdir/utils/$util ; then - makefiles="utils/$util/Makefile.in \ - utils/$util/src/Makefile.in \ + makefiles="utils/$util/src/Makefile.in \ $makefiles" fi done - else makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` + else + makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` fi fi @@ -53944,6 +51532,7 @@ do "rcdefs.h") CONFIG_COMMANDS="$CONFIG_COMMANDS rcdefs.h" ;; "lib/wx/config/${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in" ;; "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" ;; + "utils/ifacecheck/rungccxml.sh") CONFIG_FILES="$CONFIG_FILES utils/ifacecheck/rungccxml.sh" ;; "version-script") CONFIG_FILES="$CONFIG_FILES version-script" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "wx-config") CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;; @@ -54055,10 +51644,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 @@ -54073,16 +51658,7 @@ EGREP!$EGREP$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim ac_ct_CXX!$ac_ct_CXX$ac_delim -RANLIB!$RANLIB$ac_delim AR!$AR$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -STRIP!$STRIP$ac_delim -WINDRES!$WINDRES$ac_delim -DLLTOOL!$DLLTOOL$ac_delim -IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim -LN_S!$LN_S$ac_delim subdirs!$subdirs$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim GTK_CFLAGS!$GTK_CFLAGS$ac_delim @@ -54103,10 +51679,23 @@ PANGOXFT_CFLAGS!$PANGOXFT_CFLAGS$ac_delim PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim -REZ!$REZ$ac_delim -DEREZ!$DEREZ$ac_delim -SETFILE!$SETFILE$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 +GTKPRINT_CFLAGS!$GTKPRINT_CFLAGS$ac_delim +GTKPRINT_LIBS!$GTKPRINT_LIBS$ac_delim +LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim +LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim +GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim +GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim +HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim +HILDON_LIBS!$HILDON_LIBS$ac_delim +PYTHON!$PYTHON$ac_delim +COND_PYTHON!$COND_PYTHON$ac_delim +CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim +CAIRO_LIBS!$CAIRO_LIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -54148,17 +51737,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -SDL_CONFIG!$SDL_CONFIG$ac_delim -SDL_CFLAGS!$SDL_CFLAGS$ac_delim -SDL_LIBS!$SDL_LIBS$ac_delim -LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim -LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim -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 -CAIRO_LIBS!$CAIRO_LIBS$ac_delim GST_CFLAGS!$GST_CFLAGS$ac_delim GST_LIBS!$GST_LIBS$ac_delim ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim @@ -54168,7 +51746,6 @@ STD_GUI_LIBS!$STD_GUI_LIBS$ac_delim wxUSE_ZLIB!$wxUSE_ZLIB$ac_delim wxUSE_REGEX!$wxUSE_REGEX$ac_delim wxUSE_EXPAT!$wxUSE_EXPAT$ac_delim -wxUSE_ODBC!$wxUSE_ODBC$ac_delim wxUSE_LIBJPEG!$wxUSE_LIBJPEG$ac_delim wxUSE_LIBPNG!$wxUSE_LIBPNG$ac_delim wxUSE_LIBTIFF!$wxUSE_LIBTIFF$ac_delim @@ -54183,11 +51760,13 @@ CXXWARNINGS!$CXXWARNINGS$ac_delim EXTRALIBS!$EXTRALIBS$ac_delim EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim -EXTRALIBS_ODBC!$EXTRALIBS_ODBC$ac_delim +EXTRALIBS_MEDIA!$EXTRALIBS_MEDIA$ac_delim EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim +EXTRALIBS_STC!$EXTRALIBS_STC$ac_delim WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim +EXTRALIBS_GTKPRINT!$EXTRALIBS_GTKPRINT$ac_delim EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim @@ -54197,17 +51776,26 @@ 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 +RANLIB!$RANLIB$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +LN_S!$LN_S$ac_delim SET_MAKE!$SET_MAKE$ac_delim MAKE_SET!$MAKE_SET$ac_delim AROPTIONS!$AROPTIONS$ac_delim +STRIP!$STRIP$ac_delim NM!$NM$ac_delim INSTALL_DIR!$INSTALL_DIR$ac_delim LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim +IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim PLATFORM_UNIX!$PLATFORM_UNIX$ac_delim PLATFORM_WIN32!$PLATFORM_WIN32$ac_delim PLATFORM_MSDOS!$PLATFORM_MSDOS$ac_delim @@ -54240,11 +51828,12 @@ USE_SOSYMLINKS!$USE_SOSYMLINKS$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 -BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim -COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim -COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -54286,6 +51875,11 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 +COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim @@ -54293,6 +51887,15 @@ 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_BUILD_debug!$COND_BUILD_debug$ac_delim +COND_BUILD_debug_DEBUG_FLAG_default!$COND_BUILD_debug_DEBUG_FLAG_default$ac_delim +COND_BUILD_debug_DEBUG_INFO_default!$COND_BUILD_debug_DEBUG_INFO_default$ac_delim +COND_BUILD_debug_UNICODE_0!$COND_BUILD_debug_UNICODE_0$ac_delim +COND_BUILD_debug_UNICODE_1!$COND_BUILD_debug_UNICODE_1$ac_delim +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_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 @@ -54306,9 +51909,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_AUI_1$ac_de COND_MONOLITHIC_0_SHARED_0_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim 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_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_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_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_ODBC_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_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 @@ -54317,19 +51919,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_AUI_1$ac_de COND_MONOLITHIC_0_SHARED_1_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim 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_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_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_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_ODBC_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_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 COND_MONOLITHIC_0_USE_AUI_1!$COND_MONOLITHIC_0_USE_AUI_1$ac_delim COND_MONOLITHIC_0_USE_GUI_1!$COND_MONOLITHIC_0_USE_GUI_1$ac_delim COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim -COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1$ac_delim 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_ODBC_1!$COND_MONOLITHIC_0_USE_ODBC_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_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim @@ -54342,16 +51942,16 @@ COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1!$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1$a COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1$ac_delim 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_TOOLKIT_!$COND_PLATFORM_MACOSX_1_TOOLKIT_$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_GTK!$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_MAC!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF!$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim +COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_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_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 COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim +COND_PLATFORM_MAC_0!$COND_PLATFORM_MAC_0$ac_delim COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim COND_PLATFORM_MSDOS_0!$COND_PLATFORM_MSDOS_0$ac_delim COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim @@ -54369,20 +51969,9 @@ 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_USE_XRC_1!$COND_SHARED_0_USE_XRC_1$ac_delim -COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim -COND_SHARED_0_WXUSE_ODBC_BUILTIN!$COND_SHARED_0_WXUSE_ODBC_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 -COND_SHARED_1!$COND_SHARED_1$ac_delim -COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim -COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim -COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim -COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim +COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim +COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim +COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -54424,6 +52013,14 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 +COND_SHARED_1!$COND_SHARED_1$ac_delim +COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim +COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim +COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim @@ -54437,8 +52034,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__U COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim -COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim -COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim @@ -54448,6 +52043,11 @@ COND_TOOLKIT_MSW!$COND_TOOLKIT_MSW$ac_delim COND_TOOLKIT_MSW_USE_GUI_1!$COND_TOOLKIT_MSW_USE_GUI_1$ac_delim COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_delim 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_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim +COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim +COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim COND_TOOLKIT_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 @@ -54468,7 +52068,9 @@ COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim -COND_USE_ODBC_1!$COND_USE_ODBC_1$ac_delim +COND_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim +COND_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim +COND_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim @@ -54491,9 +52093,15 @@ 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_ODBC_BUILTIN!$COND_WXUSE_ODBC_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 @@ -54502,25 +52110,6 @@ AFMINSTALL!$AFMINSTALL$ac_delim WIN32INSTALL!$WIN32INSTALL$ac_delim TOOLKIT!$TOOLKIT$ac_delim TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim -TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim -TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim -cross_compiling!$cross_compiling$ac_delim -WIDGET_SET!$WIDGET_SET$ac_delim -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_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim -WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim -EXE_LINKER!$EXE_LINKER$ac_delim -GUIDIST!$GUIDIST$ac_delim -DISTDIR!$DISTDIR$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -54562,6 +52151,24 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim +TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim +cross_compiling!$cross_compiling$ac_delim +WIDGET_SET!$WIDGET_SET$ac_delim +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_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim +WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim +GUIDIST!$GUIDIST$ac_delim +DISTDIR!$DISTDIR$ac_delim SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim LDFLAGS_GL!$LDFLAGS_GL$ac_delim OPENGL_LIBS!$OPENGL_LIBS$ac_delim @@ -54576,12 +52183,13 @@ LIBWXMACRES!$LIBWXMACRES$ac_delim POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim MACSETFILE!$MACSETFILE$ac_delim GCC!$GCC$ac_delim +DLLTOOL!$DLLTOOL$ac_delim CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -54990,6 +52598,7 @@ echo "$as_me: executing $ac_file commands" >&6;} ;; "lib/wx/config/${TOOLCHAIN_FULLNAME}":F) chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME} ;; "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}":F) chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} ;; + "utils/ifacecheck/rungccxml.sh":F) chmod +x utils/ifacecheck/rungccxml.sh ;; "wx-config":C) rm -f wx-config ${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config ;; @@ -55214,7 +52823,7 @@ echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITH echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}" echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}" -echo -n " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}" +echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C" if test "$wxUSE_UNICODE" = "yes"; then if test "$wxUSE_UNICODE_UTF8" = "yes"; then echo " (using UTF-8)" @@ -55230,7 +52839,7 @@ echo " wxWidgets 2.6 ${WXWIN_COMPATIB echo " wxWidgets 2.8 ${WXWIN_COMPATIBILITY_2_8:-yes}" echo " Which libraries should wxWidgets use?" -echo " STL ${wxUSE_STL}" +echo " STL ${wxUSE_STL}" echo " jpeg ${wxUSE_LIBJPEG-none}" echo " png ${wxUSE_LIBPNG-none}" echo " regex ${wxUSE_REGEX}" @@ -55239,7 +52848,6 @@ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then echo " xpm ${wxUSE_LIBXPM-none}" fi echo " zlib ${wxUSE_ZLIB}" -echo " odbc ${wxUSE_ODBC}" echo " expat ${wxUSE_EXPAT}" echo " libmspack ${wxUSE_LIBMSPACK}" echo " sdl ${wxUSE_LIBSDL}"