X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d970f7d5cb36104e5da4760b1fb83c6ec55ef97c..914073189107fb2f0f4f78d7c98fbcc37c700d50:/configure diff --git a/configure b/configure index be92c66c98..2576e949e8 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 47439 2007-07-13 20:44:26Z VS . +# From configure.in Id: configure.in 57523 2008-12-24 01:28:55Z VZ . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -679,16 +679,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,13 +700,13 @@ 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 @@ -733,7 +724,6 @@ STD_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT -wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF @@ -748,11 +738,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 @@ -767,12 +759,19 @@ SAMPLES_RPATH_POSTLINK 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,13 @@ 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_CARBON_USE_GUI_1_WXUNIV_0 +COND_TOOLKIT_OSX_COCOA +COND_TOOLKIT_OSX_COCOA_USE_GUI_1 +COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0 +COND_TOOLKIT_OSX_IPHONE COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 @@ -951,7 +964,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 +989,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 +1022,6 @@ WXCONFIG_LIBS WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_RESFLAGS -EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS @@ -1018,6 +1038,7 @@ LIBWXMACRES POSTLINK_COMMAND MACSETFILE GCC +DLLTOOL CPPUNIT_CONFIG LIBOBJS LTLIBOBJS' @@ -1044,6 +1065,8 @@ PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS +GTKPRINT_CFLAGS +GTKPRINT_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS @@ -1054,7 +1077,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= @@ -1644,7 +1668,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 +1675,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,22 +1690,27 @@ 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[=SDK] 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-epollloop use wxEpollDispatcher class (Linux only) + --enable-selectloop use wxSelectDispatcher class --enable-apple_ieee use the Apple IEEE codec --enable-arcstream use wxArchive streams --enable-base64 use base64 encoding/decoding functions @@ -1697,6 +1726,7 @@ Optional Features: --enable-ffile use wxFFile class --enable-file use wxFile class --enable-filesystem use virtual file systems classes + --enable-fontenum use wxFontEnumerator class --enable-fontmap use font encodings conversion classes --enable-fs_archive use virtual archive filesystems --enable-fs_inet use virtual HTTP/FTP filesystems @@ -1705,7 +1735,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 @@ -1714,18 +1746,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) @@ -1733,18 +1763,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 @@ -1771,6 +1804,7 @@ Optional Features: --enable-detect_sm use code to detect X11 session manager --enable-editablebox use wxEditableListBox class --enable-filepicker use wxFilePickerCtrl class + --enable-filectrl use wxFileCtrl class --enable-fontpicker use wxFontPickerCtrl class --enable-gauge use wxGauge class --enable-grid use wxGrid class @@ -1781,6 +1815,7 @@ Optional Features: --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-radiobox use wxRadioBox class --enable-radiobtn use wxRadioButton class @@ -1796,7 +1831,7 @@ 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-textctrl use wxTextCtrl class --enable-togglebtn use wxToggleButton class --enable-toolbar use wxToolBar class @@ -1832,7 +1867,6 @@ Optional Features: --enable-metafiles use wxMetaFile (Win32 only) --enable-dragimage use wxDragImage --enable-accessibility enable accessibility support - --enable-dccache cache temporary wxDC objects (Win32 only) --enable-palette use wxPalette class --enable-image use wxImage class --enable-gif use gif images (GIF file format) @@ -1841,7 +1875,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-ps-in-msw use PS printing in wxMSW (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 @@ -1861,7 +1901,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 @@ -1874,7 +1916,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 @@ -1883,8 +1927,9 @@ 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 --with-gtk-prefix=PFX Prefix where GTK is installed (optional) --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) --with-x use the X Window System @@ -1922,6 +1967,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 @@ -2572,11 +2621,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 @@ -2587,7 +2637,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 @@ -2597,7 +2648,6 @@ DEFAULT_DEFAULT_wxUSE_X11=0 DEFAULT_DEFAULT_wxUSE_DFB=0 PROGRAM_EXT= -SO_SUFFIX=so SAMPLES_RPATH_FLAG= SAMPLES_RPATH_POSTLINK= @@ -2608,7 +2658,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 @@ -2780,7 +2829,6 @@ _ACEOF USE_AIX=1 USE_SYSV=1 USE_SVR4=1 - SO_SUFFIX=a cat >>confdefs.h <<\_ACEOF #define __AIX__ 1 _ACEOF @@ -2807,8 +2855,7 @@ _ACEOF ;; *-*-cygwin* | *-*-mingw32* ) - SO_SUFFIX=dll - PROGRAM_EXT=".exe" + PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_MSW=1 ;; @@ -2858,7 +2905,6 @@ _ACEOF *-*-darwin* ) USE_BSD=1 USE_DARWIN=1 - SO_SUFFIX=dylib cat >>confdefs.h <<\_ACEOF #define __BSD__ 1 _ACEOF @@ -2871,14 +2917,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 ;; @@ -2902,14 +2947,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 @@ -2920,18 +2957,20 @@ 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 + DEFAULT_wxUSE_OFFICIAL_BUILD=no DEFAULT_wxUSE_GTK2=yes @@ -2939,21 +2978,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 - - @@ -2969,7 +2993,6 @@ done { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gui" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-gui was given. if test "${enable_gui+set}" = set; then enableval=$enable_gui; @@ -2981,22 +3004,12 @@ if test "${enable_gui+set}" = set; then else - LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}" fi eval "$wx_cv_use_gui" - if test "$no_cache" != 1; then - echo $wx_cv_use_gui >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GUI = yes; then @@ -3024,7 +3037,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-monolithic" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-monolithic was given. if test "${enable_monolithic+set}" = set; then enableval=$enable_monolithic; @@ -3036,22 +3048,12 @@ if test "${enable_monolithic+set}" = set; then else - LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}" fi eval "$wx_cv_use_monolithic" - if test "$no_cache" != 1; then - echo $wx_cv_use_monolithic >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MONOLITHIC = yes; then @@ -3079,7 +3081,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-plugins" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-plugins was given. if test "${enable_plugins+set}" = set; then enableval=$enable_plugins; @@ -3091,22 +3092,12 @@ if test "${enable_plugins+set}" = set; then else - LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}" fi eval "$wx_cv_use_plugins" - if test "$no_cache" != 1; then - echo $wx_cv_use_plugins >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PLUGINS = yes; then @@ -3123,9 +3114,16 @@ 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}-subdirs" >&5 echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-subdirs was given. if test "${with_subdirs+set}" = set; then @@ -3138,22 +3136,12 @@ if test "${with_subdirs+set}" = set; then else - LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$wxUSE_ALL_FEATURES}" + wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}" fi eval "$wx_cv_use_subdirs" - if test "$no_cache" != 1; then - echo $wx_cv_use_subdirs >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxWITH_SUBDIRS = yes; then @@ -3187,7 +3175,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-official_build was given. if test "${enable_official_build+set}" = set; then enableval=$enable_official_build; @@ -3199,22 +3186,12 @@ if test "${enable_official_build+set}" = set; then else - LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}" fi eval "$wx_cv_use_official_build" - if test "$no_cache" != 1; then - echo $wx_cv_use_official_build >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OFFICIAL_BUILD = yes; then @@ -3251,7 +3228,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-all-features" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-all-features... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-all-features was given. if test "${enable_all_features+set}" = set; then enableval=$enable_all_features; @@ -3263,22 +3239,12 @@ if test "${enable_all_features+set}" = set; then else - LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}" fi eval "$wx_cv_use_all_features" - if test "$no_cache" != 1; then - echo $wx_cv_use_all_features >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ALL_FEATURES = yes; then @@ -3310,7 +3276,6 @@ if test "$wxUSE_GUI" = "yes"; then { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-universal was given. if test "${enable_universal+set}" = set; then enableval=$enable_universal; @@ -3322,22 +3287,12 @@ if test "${enable_universal+set}" = set; then else - LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}" fi eval "$wx_cv_use_universal" - if test "$no_cache" != 1; then - echo $wx_cv_use_universal >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNIVERSAL = yes; then @@ -3374,9 +3329,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 @@ -3440,7 +3407,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-nanox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-nanox was given. if test "${enable_nanox+set}" = set; then enableval=$enable_nanox; @@ -3452,22 +3418,12 @@ if test "${enable_nanox+set}" = set; then else - LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}" fi eval "$wx_cv_use_nanox" - if test "$no_cache" != 1; then - echo $wx_cv_use_nanox >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NANOX = yes; then @@ -3501,7 +3457,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-gpe was given. if test "${enable_gpe+set}" = set; then enableval=$enable_gpe; @@ -3513,22 +3468,12 @@ if test "${enable_gpe+set}" = set; then else - LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}" fi eval "$wx_cv_use_gpe" - if test "$no_cache" != 1; then - echo $wx_cv_use_gpe >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GPE = yes; then @@ -3545,10 +3490,109 @@ 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; } - no_cache=0 # Check whether --with-libpng was given. if test "${with_libpng+set}" = set; then @@ -3569,22 +3613,12 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or else - LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libpng" - if test "$no_cache" != 1; then - echo $wx_cv_use_libpng >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBPNG" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3607,7 +3641,6 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or { echo "$as_me:$LINENO: checking for --with-libjpeg" >&5 echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -3628,22 +3661,12 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o else - LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libjpeg" - if test "$no_cache" != 1; then - echo $wx_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBJPEG" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3666,7 +3689,6 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o { echo "$as_me:$LINENO: checking for --with-libtiff" >&5 echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -3687,22 +3709,12 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o else - LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libtiff" - if test "$no_cache" != 1; then - echo $wx_cv_use_libtiff >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBTIFF" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3725,7 +3737,6 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o { echo "$as_me:$LINENO: checking for --with-libxpm" >&5 echo $ECHO_N "checking for --with-libxpm... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-libxpm was given. if test "${with_libxpm+set}" = set; then @@ -3746,22 +3757,12 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or else - LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libxpm" - if test "$no_cache" != 1; then - echo $wx_cv_use_libxpm >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBXPM" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3783,9 +3784,60 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or 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 + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-libmspack" >&5 echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-libmspack was given. if test "${with_libmspack+set}" = set; then @@ -3798,22 +3850,12 @@ if test "${with_libmspack+set}" = set; then else - LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$wxUSE_ALL_FEATURES}" + wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}" fi eval "$wx_cv_use_libmspack" - if test "$no_cache" != 1; then - echo $wx_cv_use_libmspack >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBMSPACK = yes; then @@ -3830,9 +3872,60 @@ 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 + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5 echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-gnomeprint was given. if test "${with_gnomeprint+set}" = set; then @@ -3845,22 +3938,12 @@ if test "${with_gnomeprint+set}" = set; then else - LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$wxUSE_ALL_FEATURES}" + wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}" fi eval "$wx_cv_use_gnomeprint" - if test "$no_cache" != 1; then - echo $wx_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBGNOMEPRINT = yes; then @@ -3877,9 +3960,16 @@ echo "${ECHO_T}$result" >&6; } withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomevfs" >&5 echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-gnomevfs was given. if test "${with_gnomevfs+set}" = set; then @@ -3892,22 +3982,12 @@ if test "${with_gnomevfs+set}" = set; then else - LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$wxUSE_ALL_FEATURES}" + wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" fi eval "$wx_cv_use_gnomevfs" - if test "$no_cache" != 1; then - echo $wx_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBGNOMEVFS = yes; then @@ -3924,9 +4004,16 @@ echo "${ECHO_T}$result" >&6; } withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-hildon" >&5 echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-hildon was given. if test "${with_hildon+set}" = set; then @@ -3939,22 +4026,12 @@ if test "${with_hildon+set}" = set; then else - LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$wxUSE_ALL_FEATURES}" + wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}" fi eval "$wx_cv_use_hildon" - if test "$no_cache" != 1; then - echo $wx_cv_use_hildon >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBHILDON = yes; then @@ -3971,9 +4048,16 @@ echo "${ECHO_T}$result" >&6; } withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5 echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-opengl was given. if test "${with_opengl+set}" = set; then @@ -3986,22 +4070,12 @@ if test "${with_opengl+set}" = set; then else - LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$wxUSE_ALL_FEATURES}" + wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}" fi eval "$wx_cv_use_opengl" - if test "$no_cache" != 1; then - echo $wx_cv_use_opengl >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_OPENGL = yes; then @@ -4021,9 +4095,16 @@ 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}-dmalloc" >&5 echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -4036,22 +4117,12 @@ if test "${with_dmalloc+set}" = set; then else - LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$wxUSE_ALL_FEATURES}" + wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}" fi eval "$wx_cv_use_dmalloc" - if test "$no_cache" != 1; then - echo $wx_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_DMALLOC = yes; then @@ -4068,9 +4139,16 @@ echo "${ECHO_T}$result" >&6; } withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5 echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-sdl was given. if test "${with_sdl+set}" = set; then @@ -4083,22 +4161,12 @@ if test "${with_sdl+set}" = set; then else - LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$wxUSE_ALL_FEATURES}" + wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}" fi eval "$wx_cv_use_sdl" - if test "$no_cache" != 1; then - echo $wx_cv_use_sdl >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBSDL = yes; then @@ -4116,7 +4184,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --with-regex" >&5 echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-regex was given. if test "${with_regex+set}" = set; then @@ -4137,22 +4204,12 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or else - LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_regex" - if test "$no_cache" != 1; then - echo $wx_cv_use_regex >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_REGEX" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -4175,7 +4232,6 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or { echo "$as_me:$LINENO: checking for --with-zlib" >&5 echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-zlib was given. if test "${with_zlib+set}" = set; then @@ -4196,22 +4252,12 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b else - LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_zlib" - if test "$no_cache" != 1; then - echo $wx_cv_use_zlib >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_ZLIB" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -4232,68 +4278,8 @@ 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; } - no_cache=0 - -# 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 - -else - - LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}" - -fi - - - eval "$wx_cv_use_odbc" - if test "$no_cache" != 1; then - echo $wx_cv_use_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; } - no_cache=0 # Check whether --with-expat was given. if test "${with_expat+set}" = set; then @@ -4314,22 +4300,12 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or else - LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_expat" - if test "$no_cache" != 1; then - echo $wx_cv_use_expat >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_EXPAT" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -4350,6 +4326,34 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or fi +{ echo "$as_me:$LINENO: checking for --with-macosx-sdk" >&5 +echo $ECHO_N "checking for --with-macosx-sdk... $ECHO_C" >&6; } + +# Check whether --with-macosx-sdk was given. +if test "${with_macosx_sdk+set}" = set; then + withval=$with_macosx_sdk; + wxUSE_MACOSX_SDK=$withval + wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval" + +fi + +{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_SDK" >&5 +echo "${ECHO_T}$wxUSE_MACOSX_SDK" >&6; } + +{ echo "$as_me:$LINENO: checking for --with-macosx-version-min" >&5 +echo $ECHO_N "checking for --with-macosx-version-min... $ECHO_C" >&6; } + +# Check whether --with-macosx-version-min was given. +if test "${with_macosx_version_min+set}" = set; then + withval=$with_macosx_version_min; + wxUSE_MACOSX_VERSION_MIN=$withval + wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval" + +fi + +{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5 +echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; } + enablestring=disable @@ -4364,7 +4368,6 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then enableval=$enable_shared; @@ -4376,22 +4379,12 @@ if test "${enable_shared+set}" = set; then else - LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" fi eval "$wx_cv_use_shared" - if test "$no_cache" != 1; then - echo $wx_cv_use_shared >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SHARED = yes; then @@ -4407,61 +4400,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; } - no_cache=0 - # 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 - - LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" - -fi - - - eval "$wx_cv_use_optimise" - if test "$no_cache" != 1; then - echo $wx_cv_use_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 @@ -4474,7 +4412,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then enableval=$enable_debug; @@ -4486,22 +4423,12 @@ if test "${enable_debug+set}" = set; then else - LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}" fi eval "$wx_cv_use_debug" - if test "$no_cache" != 1; then - echo $wx_cv_use_debug >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG = yes; then @@ -4529,7 +4456,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-stl was given. if test "${enable_stl+set}" = set; then enableval=$enable_stl; @@ -4541,22 +4467,12 @@ if test "${enable_stl+set}" = set; then else - LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}" fi eval "$wx_cv_use_stl" - if test "$no_cache" != 1; then - echo $wx_cv_use_stl >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STL = yes; then @@ -4584,7 +4500,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-std_iostreams was given. if test "${enable_std_iostreams+set}" = set; then enableval=$enable_std_iostreams; @@ -4596,22 +4511,12 @@ if test "${enable_std_iostreams+set}" = set; then else - LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}" fi eval "$wx_cv_use_std_iostreams" - if test "$no_cache" != 1; then - echo $wx_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STD_IOSTREAM = yes; then @@ -4639,7 +4544,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-std_string was given. if test "${enable_std_string+set}" = set; then enableval=$enable_std_string; @@ -4651,22 +4555,12 @@ if test "${enable_std_string+set}" = set; then else - LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}" fi eval "$wx_cv_use_std_string" - if test "$no_cache" != 1; then - echo $wx_cv_use_std_string >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STD_STRING = yes; then @@ -4694,7 +4588,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-unicode was given. if test "${enable_unicode+set}" = set; then enableval=$enable_unicode; @@ -4706,22 +4599,12 @@ if test "${enable_unicode+set}" = set; then else - LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}" fi eval "$wx_cv_use_unicode" - if test "$no_cache" != 1; then - echo $wx_cv_use_unicode >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNICODE = yes; then @@ -4749,7 +4632,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mslu was given. if test "${enable_mslu+set}" = set; then enableval=$enable_mslu; @@ -4761,22 +4643,12 @@ if test "${enable_mslu+set}" = set; then else - LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}" fi eval "$wx_cv_use_mslu" - if test "$no_cache" != 1; then - echo $wx_cv_use_mslu >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNICODE_MSLU = yes; then @@ -4795,7 +4667,6 @@ echo "${ECHO_T}$result" >&6; } enablestring= { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-utf8 was given. if test "${enable_utf8+set}" = set; then enableval=$enable_utf8; @@ -4803,22 +4674,12 @@ if test "${enable_utf8+set}" = set; then else - LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8 fi eval "$wx_cv_use_utf8" - if test "$no_cache" != 1; then - echo $wx_cv_use_utf8 >> ${wx_arg_cache_file}.tmp - fi { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5 echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; } @@ -4836,7 +4697,6 @@ echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8only" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-utf8only was given. if test "${enable_utf8only+set}" = set; then enableval=$enable_utf8only; @@ -4848,22 +4708,12 @@ if test "${enable_utf8only+set}" = set; then else - LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}" fi eval "$wx_cv_use_utf8only" - if test "$no_cache" != 1; then - echo $wx_cv_use_utf8only >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then @@ -4891,7 +4741,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-extended_rtti" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-extended_rtti was given. if test "${enable_extended_rtti+set}" = set; then enableval=$enable_extended_rtti; @@ -4903,22 +4752,12 @@ if test "${enable_extended_rtti+set}" = set; then else - LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}" fi eval "$wx_cv_use_extended_rtti" - if test "$no_cache" != 1; then - echo $wx_cv_use_extended_rtti >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_EXTENDED_RTTI = yes; then @@ -4933,7 +4772,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= @@ -4948,7 +4787,6 @@ if test "$USE_OS2" = "1"; then { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-omf was given. if test "${enable_omf+set}" = set; then enableval=$enable_omf; @@ -4960,22 +4798,12 @@ if test "${enable_omf+set}" = set; then else - LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}" fi eval "$wx_cv_use_omf" - if test "$no_cache" != 1; then - echo $wx_cv_use_omf >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OMF = yes; then @@ -4993,13 +4821,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 @@ -5015,7 +4843,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debug_flag was given. if test "${enable_debug_flag+set}" = set; then enableval=$enable_debug_flag; @@ -5027,22 +4854,12 @@ if test "${enable_debug_flag+set}" = set; then else - LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" fi eval "$wx_cv_use_debug_flag" - if test "$no_cache" != 1; then - echo $wx_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_FLAG = yes; then @@ -5070,7 +4887,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debug_info was given. if test "${enable_debug_info+set}" = set; then enableval=$enable_debug_info; @@ -5082,22 +4898,12 @@ if test "${enable_debug_info+set}" = set; then else - LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" fi eval "$wx_cv_use_debug_info" - if test "$no_cache" != 1; then - echo $wx_cv_use_debug_info >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_INFO = yes; then @@ -5113,6 +4919,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 @@ -5125,7 +4986,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debug_gdb was given. if test "${enable_debug_gdb+set}" = set; then enableval=$enable_debug_gdb; @@ -5137,22 +4997,12 @@ if test "${enable_debug_gdb+set}" = set; then else - LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" fi eval "$wx_cv_use_debug_gdb" - if test "$no_cache" != 1; then - echo $wx_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_GDB = yes; then @@ -5180,7 +5030,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debug_cntxt was given. if test "${enable_debug_cntxt+set}" = set; then enableval=$enable_debug_cntxt; @@ -5192,22 +5041,12 @@ if test "${enable_debug_cntxt+set}" = set; then else - LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" fi eval "$wx_cv_use_debug_cntxt" - if test "$no_cache" != 1; then - echo $wx_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_CONTEXT = yes; then @@ -5235,7 +5074,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mem_tracing was given. if test "${enable_mem_tracing+set}" = set; then enableval=$enable_mem_tracing; @@ -5247,22 +5085,12 @@ if test "${enable_mem_tracing+set}" = set; then else - LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" fi eval "$wx_cv_use_mem_tracing" - if test "$no_cache" != 1; then - echo $wx_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MEM_TRACING = yes; then @@ -5290,7 +5118,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-profile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-profile was given. if test "${enable_profile+set}" = set; then enableval=$enable_profile; @@ -5302,22 +5129,12 @@ if test "${enable_profile+set}" = set; then else - LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}" fi eval "$wx_cv_use_profile" - if test "$no_cache" != 1; then - echo $wx_cv_use_profile >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROFILE = yes; then @@ -5345,7 +5162,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_rtti" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-no_rtti was given. if test "${enable_no_rtti+set}" = set; then enableval=$enable_no_rtti; @@ -5357,22 +5173,12 @@ if test "${enable_no_rtti+set}" = set; then else - LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}" fi eval "$wx_cv_use_no_rtti" - if test "$no_cache" != 1; then - echo $wx_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NO_RTTI = yes; then @@ -5400,7 +5206,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_exceptions" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-no_exceptions was given. if test "${enable_no_exceptions+set}" = set; then enableval=$enable_no_exceptions; @@ -5412,22 +5217,12 @@ if test "${enable_no_exceptions+set}" = set; then else - LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}" fi eval "$wx_cv_use_no_exceptions" - if test "$no_cache" != 1; then - echo $wx_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NO_EXCEPTIONS = yes; then @@ -5455,7 +5250,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-permissive" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-permissive was given. if test "${enable_permissive+set}" = set; then enableval=$enable_permissive; @@ -5467,22 +5261,12 @@ if test "${enable_permissive+set}" = set; then else - LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}" fi eval "$wx_cv_use_permissive" - if test "$no_cache" != 1; then - echo $wx_cv_use_permissive >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PERMISSIVE = yes; then @@ -5510,7 +5294,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_deps" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-no_deps was given. if test "${enable_no_deps+set}" = set; then enableval=$enable_no_deps; @@ -5522,22 +5305,12 @@ if test "${enable_no_deps+set}" = set; then else - LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}" fi eval "$wx_cv_use_no_deps" - if test "$no_cache" != 1; then - echo $wx_cv_use_no_deps >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NO_DEPS = yes; then @@ -5565,7 +5338,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-vararg_macros" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-vararg_macros was given. if test "${enable_vararg_macros+set}" = set; then enableval=$enable_vararg_macros; @@ -5577,22 +5349,12 @@ if test "${enable_vararg_macros+set}" = set; then else - LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}" fi eval "$wx_cv_use_vararg_macros" - if test "$no_cache" != 1; then - echo $wx_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_VARARG_MACROS = yes; then @@ -5611,7 +5373,6 @@ echo "${ECHO_T}$result" >&6; } enablestring= { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-universal_binary was given. if test "${enable_universal_binary+set}" = set; then enableval=$enable_universal_binary; @@ -5619,22 +5380,12 @@ if test "${enable_universal_binary+set}" = set; then else - LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY fi eval "$wx_cv_use_universal_binary" - if test "$no_cache" != 1; then - echo $wx_cv_use_universal_binary >> ${wx_arg_cache_file}.tmp - fi { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5 echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; } @@ -5653,7 +5404,6 @@ echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat26" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-compat26 was given. if test "${enable_compat26+set}" = set; then enableval=$enable_compat26; @@ -5665,22 +5415,12 @@ if test "${enable_compat26+set}" = set; then else - LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}" fi eval "$wx_cv_use_compat26" - if test "$no_cache" != 1; then - echo $wx_cv_use_compat26 >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $WXWIN_COMPATIBILITY_2_6 = yes; then @@ -5708,7 +5448,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat28" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-compat28 was given. if test "${enable_compat28+set}" = set; then enableval=$enable_compat28; @@ -5720,22 +5459,12 @@ if test "${enable_compat28+set}" = set; then else - LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" fi eval "$wx_cv_use_compat28" - if test "$no_cache" != 1; then - echo $wx_cv_use_compat28 >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $WXWIN_COMPATIBILITY_2_8 = yes; then @@ -5764,7 +5493,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then enableval=$enable_rpath; @@ -5776,22 +5504,12 @@ if test "${enable_rpath+set}" = set; then else - LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}" fi eval "$wx_cv_use_rpath" - if test "$no_cache" != 1; then - echo $wx_cv_use_rpath >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RPATH = yes; then @@ -5820,7 +5538,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-objc_uniquifying" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-objc_uniquifying was given. if test "${enable_objc_uniquifying+set}" = set; then enableval=$enable_objc_uniquifying; @@ -5832,22 +5549,12 @@ if test "${enable_objc_uniquifying+set}" = set; then else - LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}" fi eval "$wx_cv_use_objc_uniquifying" - if test "$no_cache" != 1; then - echo $wx_cv_use_objc_uniquifying >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OBJC_UNIQUIFYING = yes; then @@ -5876,7 +5583,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-visibility" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-visibility was given. if test "${enable_visibility+set}" = set; then enableval=$enable_visibility; @@ -5888,22 +5594,12 @@ if test "${enable_visibility+set}" = set; then else - LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}" fi eval "$wx_cv_use_visibility" - if test "$no_cache" != 1; then - echo $wx_cv_use_visibility >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_VISIBILITY = yes; then @@ -5933,7 +5629,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-intl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-intl was given. if test "${enable_intl+set}" = set; then enableval=$enable_intl; @@ -5945,22 +5640,12 @@ if test "${enable_intl+set}" = set; then else - LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}" fi eval "$wx_cv_use_intl" - if test "$no_cache" != 1; then - echo $wx_cv_use_intl >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_INTL = yes; then @@ -5976,6 +5661,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 @@ -5988,7 +5717,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-config" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-config was given. if test "${enable_config+set}" = set; then enableval=$enable_config; @@ -6000,22 +5728,12 @@ if test "${enable_config+set}" = set; then else - LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}" fi eval "$wx_cv_use_config" - if test "$no_cache" != 1; then - echo $wx_cv_use_config >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONFIG = yes; then @@ -6044,7 +5762,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocols" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-protocols was given. if test "${enable_protocols+set}" = set; then enableval=$enable_protocols; @@ -6056,22 +5773,12 @@ if test "${enable_protocols+set}" = set; then else - LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi eval "$wx_cv_use_protocols" - if test "$no_cache" != 1; then - echo $wx_cv_use_protocols >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL = yes; then @@ -6099,7 +5806,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ftp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-ftp was given. if test "${enable_ftp+set}" = set; then enableval=$enable_ftp; @@ -6111,22 +5817,12 @@ if test "${enable_ftp+set}" = set; then else - LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi eval "$wx_cv_use_ftp" - if test "$no_cache" != 1; then - echo $wx_cv_use_ftp >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FTP = yes; then @@ -6154,7 +5850,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-http" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-http was given. if test "${enable_http+set}" = set; then enableval=$enable_http; @@ -6166,22 +5861,12 @@ if test "${enable_http+set}" = set; then else - LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi eval "$wx_cv_use_http" - if test "$no_cache" != 1; then - echo $wx_cv_use_http >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_HTTP = yes; then @@ -6209,7 +5894,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fileproto" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fileproto was given. if test "${enable_fileproto+set}" = set; then enableval=$enable_fileproto; @@ -6221,22 +5905,12 @@ if test "${enable_fileproto+set}" = set; then else - LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi eval "$wx_cv_use_fileproto" - if test "$no_cache" != 1; then - echo $wx_cv_use_fileproto >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FILE = yes; then @@ -6264,7 +5938,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sockets" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-sockets was given. if test "${enable_sockets+set}" = set; then enableval=$enable_sockets; @@ -6276,22 +5949,12 @@ if test "${enable_sockets+set}" = set; then else - LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}" fi eval "$wx_cv_use_sockets" - if test "$no_cache" != 1; then - echo $wx_cv_use_sockets >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SOCKETS = yes; then @@ -6307,6 +5970,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 @@ -6319,7 +6026,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ole" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-ole was given. if test "${enable_ole+set}" = set; then enableval=$enable_ole; @@ -6331,22 +6037,12 @@ if test "${enable_ole+set}" = set; then else - LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}" fi eval "$wx_cv_use_ole" - if test "$no_cache" != 1; then - echo $wx_cv_use_ole >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OLE = yes; then @@ -6374,7 +6070,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataobj" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dataobj was given. if test "${enable_dataobj+set}" = set; then enableval=$enable_dataobj; @@ -6386,22 +6081,12 @@ if test "${enable_dataobj+set}" = set; then else - LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}" fi eval "$wx_cv_use_dataobj" - if test "$no_cache" != 1; then - echo $wx_cv_use_dataobj >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATAOBJ = yes; then @@ -6430,7 +6115,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-ipc was given. if test "${enable_ipc+set}" = set; then enableval=$enable_ipc; @@ -6442,22 +6126,12 @@ if test "${enable_ipc+set}" = set; then else - LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}" fi eval "$wx_cv_use_ipc" - if test "$no_cache" != 1; then - echo $wx_cv_use_ipc >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_IPC = yes; then @@ -6474,6 +6148,139 @@ 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}-baseevtloop" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-baseevtloop... $ECHO_C" >&6; } + # Check whether --enable-baseevtloop was given. +if test "${enable_baseevtloop+set}" = set; then + enableval=$enable_baseevtloop; + if test "$enableval" = yes; then + wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes' + else + wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no' + fi + +else + + wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}" + +fi + + + eval "$wx_cv_use_baseevtloop" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_CONSOLE_EVENTLOOP = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_CONSOLE_EVENTLOOP + 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}-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_epollloop='wxUSE_EPOLL_DISPATCHER=yes' + else + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no' + fi + +else + + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" + +fi + + + eval "$wx_cv_use_epollloop" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_EPOLL_DISPATCHER = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_EPOLL_DISPATCHER + 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}-selectloop" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-selectloop... $ECHO_C" >&6; } + # Check whether --enable-selectloop was given. +if test "${enable_selectloop+set}" = set; then + enableval=$enable_selectloop; + if test "$enableval" = yes; then + wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes' + else + wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no' + fi + +else + + wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}" + +fi + + + eval "$wx_cv_use_selectloop" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_SELECT_DISPATCHER = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_SELECT_DISPATCHER + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -6486,7 +6293,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-apple_ieee was given. if test "${enable_apple_ieee+set}" = set; then enableval=$enable_apple_ieee; @@ -6498,22 +6304,12 @@ if test "${enable_apple_ieee+set}" = set; then else - LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}" fi eval "$wx_cv_use_apple_ieee" - if test "$no_cache" != 1; then - echo $wx_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_APPLE_IEEE = yes; then @@ -6541,7 +6337,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arcstream" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-arcstream was given. if test "${enable_arcstream+set}" = set; then enableval=$enable_arcstream; @@ -6553,22 +6348,12 @@ if test "${enable_arcstream+set}" = set; then else - LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}" fi eval "$wx_cv_use_arcstream" - if test "$no_cache" != 1; then - echo $wx_cv_use_arcstream >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ARCHIVE_STREAMS = yes; then @@ -6596,7 +6381,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-base64" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-base64... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-base64 was given. if test "${enable_base64+set}" = set; then enableval=$enable_base64; @@ -6608,22 +6392,12 @@ if test "${enable_base64+set}" = set; then else - LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}" fi eval "$wx_cv_use_base64" - if test "$no_cache" != 1; then - echo $wx_cv_use_base64 >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BASE64 = yes; then @@ -6651,7 +6425,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-backtrace was given. if test "${enable_backtrace+set}" = set; then enableval=$enable_backtrace; @@ -6663,22 +6436,12 @@ if test "${enable_backtrace+set}" = set; then else - LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}" fi eval "$wx_cv_use_backtrace" - if test "$no_cache" != 1; then - echo $wx_cv_use_backtrace >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STACKWALKER = yes; then @@ -6706,7 +6469,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-catch_segvs was given. if test "${enable_catch_segvs+set}" = set; then enableval=$enable_catch_segvs; @@ -6718,22 +6480,12 @@ if test "${enable_catch_segvs+set}" = set; then else - LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}" fi eval "$wx_cv_use_catch_segvs" - if test "$no_cache" != 1; then - echo $wx_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ON_FATAL_EXCEPTION = yes; then @@ -6761,7 +6513,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-cmdline was given. if test "${enable_cmdline+set}" = set; then enableval=$enable_cmdline; @@ -6773,22 +6524,12 @@ if test "${enable_cmdline+set}" = set; then else - LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}" fi eval "$wx_cv_use_cmdline" - if test "$no_cache" != 1; then - echo $wx_cv_use_cmdline >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CMDLINE_PARSER = yes; then @@ -6816,7 +6557,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-datetime was given. if test "${enable_datetime+set}" = set; then enableval=$enable_datetime; @@ -6828,22 +6568,12 @@ if test "${enable_datetime+set}" = set; then else - LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}" fi eval "$wx_cv_use_datetime" - if test "$no_cache" != 1; then - echo $wx_cv_use_datetime >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATETIME = yes; then @@ -6871,7 +6601,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debugreport" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debugreport was given. if test "${enable_debugreport+set}" = set; then enableval=$enable_debugreport; @@ -6883,22 +6612,12 @@ if test "${enable_debugreport+set}" = set; then else - LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}" fi eval "$wx_cv_use_debugreport" - if test "$no_cache" != 1; then - echo $wx_cv_use_debugreport >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUGREPORT = yes; then @@ -6926,7 +6645,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dialupman was given. if test "${enable_dialupman+set}" = set; then enableval=$enable_dialupman; @@ -6938,22 +6656,12 @@ if test "${enable_dialupman+set}" = set; then else - LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}" fi eval "$wx_cv_use_dialupman" - if test "$no_cache" != 1; then - echo $wx_cv_use_dialupman >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DIALUP_MANAGER = yes; then @@ -6981,7 +6689,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynlib" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dynlib was given. if test "${enable_dynlib+set}" = set; then enableval=$enable_dynlib; @@ -6993,22 +6700,12 @@ if test "${enable_dynlib+set}" = set; then else - LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}" fi eval "$wx_cv_use_dynlib" - if test "$no_cache" != 1; then - echo $wx_cv_use_dynlib >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DYNLIB_CLASS = yes; then @@ -7036,7 +6733,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynamicloader" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dynamicloader was given. if test "${enable_dynamicloader+set}" = set; then enableval=$enable_dynamicloader; @@ -7048,22 +6744,12 @@ if test "${enable_dynamicloader+set}" = set; then else - LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}" fi eval "$wx_cv_use_dynamicloader" - if test "$no_cache" != 1; then - echo $wx_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DYNAMIC_LOADER = yes; then @@ -7091,7 +6777,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-exceptions" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-exceptions was given. if test "${enable_exceptions+set}" = set; then enableval=$enable_exceptions; @@ -7103,22 +6788,12 @@ if test "${enable_exceptions+set}" = set; then else - LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}" fi eval "$wx_cv_use_exceptions" - if test "$no_cache" != 1; then - echo $wx_cv_use_exceptions >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_EXCEPTIONS = yes; then @@ -7146,7 +6821,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-ffile was given. if test "${enable_ffile+set}" = set; then enableval=$enable_ffile; @@ -7158,22 +6832,12 @@ if test "${enable_ffile+set}" = set; then else - LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}" fi eval "$wx_cv_use_ffile" - if test "$no_cache" != 1; then - echo $wx_cv_use_ffile >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FFILE = yes; then @@ -7201,7 +6865,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-file was given. if test "${enable_file+set}" = set; then enableval=$enable_file; @@ -7213,22 +6876,12 @@ if test "${enable_file+set}" = set; then else - LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}" fi eval "$wx_cv_use_file" - if test "$no_cache" != 1; then - echo $wx_cv_use_file >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILE = yes; then @@ -7256,7 +6909,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-filesystem was given. if test "${enable_filesystem+set}" = set; then enableval=$enable_filesystem; @@ -7268,22 +6920,12 @@ if test "${enable_filesystem+set}" = set; then else - LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}" fi eval "$wx_cv_use_filesystem" - if test "$no_cache" != 1; then - echo $wx_cv_use_filesystem >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILESYSTEM = yes; then @@ -7299,6 +6941,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}-fontenum" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fontenum... $ECHO_C" >&6; } + # Check whether --enable-fontenum was given. +if test "${enable_fontenum+set}" = set; then + enableval=$enable_fontenum; + if test "$enableval" = yes; then + wx_cv_use_fontenum='wxUSE_FONTENUM=yes' + else + wx_cv_use_fontenum='wxUSE_FONTENUM=no' + fi + +else + + wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}" + +fi + + + eval "$wx_cv_use_fontenum" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_FONTENUM = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_FONTENUM + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -7311,7 +6997,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fontmap was given. if test "${enable_fontmap+set}" = set; then enableval=$enable_fontmap; @@ -7323,22 +7008,12 @@ if test "${enable_fontmap+set}" = set; then else - LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}" fi eval "$wx_cv_use_fontmap" - if test "$no_cache" != 1; then - echo $wx_cv_use_fontmap >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTMAP = yes; then @@ -7366,7 +7041,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_archive" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fs_archive was given. if test "${enable_fs_archive+set}" = set; then enableval=$enable_fs_archive; @@ -7378,22 +7052,12 @@ if test "${enable_fs_archive+set}" = set; then else - LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}" fi eval "$wx_cv_use_fs_archive" - if test "$no_cache" != 1; then - echo $wx_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FS_ARCHIVE = yes; then @@ -7421,7 +7085,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fs_inet was given. if test "${enable_fs_inet+set}" = set; then enableval=$enable_fs_inet; @@ -7433,22 +7096,12 @@ if test "${enable_fs_inet+set}" = set; then else - LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}" fi eval "$wx_cv_use_fs_inet" - if test "$no_cache" != 1; then - echo $wx_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FS_INET = yes; then @@ -7476,7 +7129,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fs_zip was given. if test "${enable_fs_zip+set}" = set; then enableval=$enable_fs_zip; @@ -7488,22 +7140,12 @@ if test "${enable_fs_zip+set}" = set; then else - LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}" fi eval "$wx_cv_use_fs_zip" - if test "$no_cache" != 1; then - echo $wx_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FS_ZIP = yes; then @@ -7531,7 +7173,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-geometry was given. if test "${enable_geometry+set}" = set; then enableval=$enable_geometry; @@ -7543,22 +7184,12 @@ if test "${enable_geometry+set}" = set; then else - LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}" fi eval "$wx_cv_use_geometry" - if test "$no_cache" != 1; then - echo $wx_cv_use_geometry >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GEOMETRY = yes; then @@ -7586,7 +7217,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-log was given. if test "${enable_log+set}" = set; then enableval=$enable_log; @@ -7598,22 +7228,12 @@ if test "${enable_log+set}" = set; then else - LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}" fi eval "$wx_cv_use_log" - if test "$no_cache" != 1; then - echo $wx_cv_use_log >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LOG = yes; then @@ -7641,7 +7261,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-longlong was given. if test "${enable_longlong+set}" = set; then enableval=$enable_longlong; @@ -7653,22 +7272,12 @@ if test "${enable_longlong+set}" = set; then else - LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}" fi eval "$wx_cv_use_longlong" - if test "$no_cache" != 1; then - echo $wx_cv_use_longlong >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LONGLONG = yes; then @@ -7696,7 +7305,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mimetype was given. if test "${enable_mimetype+set}" = set; then enableval=$enable_mimetype; @@ -7708,22 +7316,12 @@ if test "${enable_mimetype+set}" = set; then else - LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}" fi eval "$wx_cv_use_mimetype" - if test "$no_cache" != 1; then - echo $wx_cv_use_mimetype >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MIMETYPE = yes; then @@ -7739,6 +7337,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 @@ -7751,7 +7393,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-snglinst was given. if test "${enable_snglinst+set}" = set; then enableval=$enable_snglinst; @@ -7763,22 +7404,12 @@ if test "${enable_snglinst+set}" = set; then else - LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}" fi eval "$wx_cv_use_snglinst" - if test "$no_cache" != 1; then - echo $wx_cv_use_snglinst >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SNGLINST_CHECKER = yes; then @@ -7794,6 +7425,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 @@ -7806,7 +7481,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-stdpaths was given. if test "${enable_stdpaths+set}" = set; then enableval=$enable_stdpaths; @@ -7818,22 +7492,12 @@ if test "${enable_stdpaths+set}" = set; then else - LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}" fi eval "$wx_cv_use_stdpaths" - if test "$no_cache" != 1; then - echo $wx_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STDPATHS = yes; then @@ -7861,7 +7525,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then enableval=$enable_stopwatch; @@ -7873,22 +7536,12 @@ if test "${enable_stopwatch+set}" = set; then else - LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}" fi eval "$wx_cv_use_stopwatch" - if test "$no_cache" != 1; then - echo $wx_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STOPWATCH = yes; then @@ -7916,7 +7569,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-streams was given. if test "${enable_streams+set}" = set; then enableval=$enable_streams; @@ -7928,22 +7580,12 @@ if test "${enable_streams+set}" = set; then else - LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}" fi eval "$wx_cv_use_streams" - if test "$no_cache" != 1; then - echo $wx_cv_use_streams >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STREAMS = yes; then @@ -7971,7 +7613,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-system_options was given. if test "${enable_system_options+set}" = set; then enableval=$enable_system_options; @@ -7983,22 +7624,12 @@ if test "${enable_system_options+set}" = set; then else - LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" fi eval "$wx_cv_use_system_options" - if test "$no_cache" != 1; then - echo $wx_cv_use_system_options >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SYSTEM_OPTIONS = yes; then @@ -8026,7 +7657,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tarstream" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tarstream was given. if test "${enable_tarstream+set}" = set; then enableval=$enable_tarstream; @@ -8038,22 +7668,12 @@ if test "${enable_tarstream+set}" = set; then else - LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}" fi eval "$wx_cv_use_tarstream" - if test "$no_cache" != 1; then - echo $wx_cv_use_tarstream >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TARSTREAM = yes; then @@ -8081,7 +7701,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-textbuf was given. if test "${enable_textbuf+set}" = set; then enableval=$enable_textbuf; @@ -8093,22 +7712,12 @@ if test "${enable_textbuf+set}" = set; then else - LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}" fi eval "$wx_cv_use_textbuf" - if test "$no_cache" != 1; then - echo $wx_cv_use_textbuf >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTBUFFER = yes; then @@ -8136,7 +7745,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-textfile was given. if test "${enable_textfile+set}" = set; then enableval=$enable_textfile; @@ -8148,22 +7756,12 @@ if test "${enable_textfile+set}" = set; then else - LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}" fi eval "$wx_cv_use_textfile" - if test "$no_cache" != 1; then - echo $wx_cv_use_textfile >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTFILE = yes; then @@ -8191,7 +7789,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-timer was given. if test "${enable_timer+set}" = set; then enableval=$enable_timer; @@ -8203,22 +7800,12 @@ if test "${enable_timer+set}" = set; then else - LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}" fi eval "$wx_cv_use_timer" - if test "$no_cache" != 1; then - echo $wx_cv_use_timer >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TIMER = yes; then @@ -8244,210 +7831,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; } - no_cache=0 - # 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 - - LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" - -fi - - - eval "$wx_cv_use_sound" - if test "$no_cache" != 1; then - echo $wx_cv_use_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; } - no_cache=0 - # 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 - -else - - LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" - -fi - - - eval "$wx_cv_use_mediactrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_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; } - no_cache=0 - # 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 - -else - - LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" - -fi - - - eval "$wx_cv_use_gstreamer8" - if test "$no_cache" != 1; then - echo $wx_cv_use_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; } - no_cache=0 - # 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 else - LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - 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 "$no_cache" != 1; then - echo $wx_cv_use_printfposparam >> ${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 @@ -8466,7 +7877,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-zipstream" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-zipstream was given. if test "${enable_zipstream+set}" = set; then enableval=$enable_zipstream; @@ -8478,22 +7888,12 @@ if test "${enable_zipstream+set}" = set; then else - LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}" fi eval "$wx_cv_use_zipstream" - if test "$no_cache" != 1; then - echo $wx_cv_use_zipstream >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ZIPSTREAM = yes; then @@ -8522,7 +7922,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-url" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-url was given. if test "${enable_url+set}" = set; then enableval=$enable_url; @@ -8534,22 +7933,12 @@ if test "${enable_url+set}" = set; then else - LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}" fi eval "$wx_cv_use_url" - if test "$no_cache" != 1; then - echo $wx_cv_use_url >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_URL = yes; then @@ -8565,61 +7954,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; } - no_cache=0 - # 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 - -else - - LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" - -fi - - - eval "$wx_cv_use_variant" - if test "$no_cache" != 1; then - echo $wx_cv_use_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 @@ -8632,7 +7966,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-protocol was given. if test "${enable_protocol+set}" = set; then enableval=$enable_protocol; @@ -8644,22 +7977,12 @@ if test "${enable_protocol+set}" = set; then else - LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi eval "$wx_cv_use_protocol" - if test "$no_cache" != 1; then - echo $wx_cv_use_protocol >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL = yes; then @@ -8687,7 +8010,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_http" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-protocol_http was given. if test "${enable_protocol_http+set}" = set; then enableval=$enable_protocol_http; @@ -8699,22 +8021,12 @@ if test "${enable_protocol_http+set}" = set; then else - LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi eval "$wx_cv_use_protocol_http" - if test "$no_cache" != 1; then - echo $wx_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_HTTP = yes; then @@ -8742,7 +8054,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_ftp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-protocol_ftp was given. if test "${enable_protocol_ftp+set}" = set; then enableval=$enable_protocol_ftp; @@ -8754,22 +8065,12 @@ if test "${enable_protocol_ftp+set}" = set; then else - LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi eval "$wx_cv_use_protocol_ftp" - if test "$no_cache" != 1; then - echo $wx_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FTP = yes; then @@ -8797,7 +8098,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_file" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-protocol_file was given. if test "${enable_protocol_file+set}" = set; then enableval=$enable_protocol_file; @@ -8809,22 +8109,12 @@ if test "${enable_protocol_file+set}" = set; then else - LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi eval "$wx_cv_use_protocol_file" - if test "$no_cache" != 1; then - echo $wx_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FILE = yes; then @@ -8853,7 +8143,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-threads" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-threads was given. if test "${enable_threads+set}" = set; then enableval=$enable_threads; @@ -8865,22 +8154,12 @@ if test "${enable_threads+set}" = set; then else - LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}" fi eval "$wx_cv_use_threads" - if test "$no_cache" != 1; then - echo $wx_cv_use_threads >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_THREADS = yes; then @@ -8896,6 +8175,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 @@ -8912,7 +8280,6 @@ if test "$wxUSE_GUI" = "yes"; then { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-docview" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-docview was given. if test "${enable_docview+set}" = set; then enableval=$enable_docview; @@ -8924,22 +8291,12 @@ if test "${enable_docview+set}" = set; then else - LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}" fi eval "$wx_cv_use_docview" - if test "$no_cache" != 1; then - echo $wx_cv_use_docview >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then @@ -8967,7 +8324,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-help" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-help was given. if test "${enable_help+set}" = set; then enableval=$enable_help; @@ -8979,22 +8335,12 @@ if test "${enable_help+set}" = set; then else - LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}" fi eval "$wx_cv_use_help" - if test "$no_cache" != 1; then - echo $wx_cv_use_help >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_HELP = yes; then @@ -9022,7 +8368,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mshtmlhelp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mshtmlhelp was given. if test "${enable_mshtmlhelp+set}" = set; then enableval=$enable_mshtmlhelp; @@ -9034,22 +8379,12 @@ if test "${enable_mshtmlhelp+set}" = set; then else - LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}" fi eval "$wx_cv_use_mshtmlhelp" - if test "$no_cache" != 1; then - echo $wx_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MS_HTML_HELP = yes; then @@ -9077,7 +8412,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-html was given. if test "${enable_html+set}" = set; then enableval=$enable_html; @@ -9089,22 +8423,12 @@ if test "${enable_html+set}" = set; then else - LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}" fi eval "$wx_cv_use_html" - if test "$no_cache" != 1; then - echo $wx_cv_use_html >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_HTML = yes; then @@ -9132,7 +8456,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-htmlhelp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-htmlhelp was given. if test "${enable_htmlhelp+set}" = set; then enableval=$enable_htmlhelp; @@ -9144,22 +8467,12 @@ if test "${enable_htmlhelp+set}" = set; then else - LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}" fi eval "$wx_cv_use_htmlhelp" - if test "$no_cache" != 1; then - echo $wx_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_WXHTML_HELP = yes; then @@ -9187,7 +8500,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xrc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-xrc was given. if test "${enable_xrc+set}" = set; then enableval=$enable_xrc; @@ -9199,22 +8511,12 @@ if test "${enable_xrc+set}" = set; then else - LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}" fi eval "$wx_cv_use_xrc" - if test "$no_cache" != 1; then - echo $wx_cv_use_xrc >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_XRC = yes; then @@ -9242,7 +8544,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aui" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-aui was given. if test "${enable_aui+set}" = set; then enableval=$enable_aui; @@ -9254,22 +8555,12 @@ if test "${enable_aui+set}" = set; then else - LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}" fi eval "$wx_cv_use_aui" - if test "$no_cache" != 1; then - echo $wx_cv_use_aui >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_AUI = yes; then @@ -9285,6 +8576,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 @@ -9297,7 +8632,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-stc was given. if test "${enable_stc+set}" = set; then enableval=$enable_stc; @@ -9309,22 +8643,12 @@ if test "${enable_stc+set}" = set; then else - LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}" fi eval "$wx_cv_use_stc" - if test "$no_cache" != 1; then - echo $wx_cv_use_stc >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STC = yes; then @@ -9352,7 +8676,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-constraints was given. if test "${enable_constraints+set}" = set; then enableval=$enable_constraints; @@ -9364,22 +8687,12 @@ if test "${enable_constraints+set}" = set; then else - LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}" fi eval "$wx_cv_use_constraints" - if test "$no_cache" != 1; then - echo $wx_cv_use_constraints >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONSTRAINTS = yes; then @@ -9405,45 +8718,122 @@ 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; } - no_cache=0 - # 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 else - LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" + +fi + + + eval "$wx_cv_use_loggui" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_LOGGUI = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_LOGGUI + 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}-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_logwin='wxUSE_LOGWINDOW=yes' else - no_cache=1 + wx_cv_use_logwin='wxUSE_LOGWINDOW=no' fi - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" +else + + wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" fi - eval "$wx_cv_use_printarch" - if test "$no_cache" != 1; then - echo $wx_cv_use_printarch >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_logwin" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_LOGWINDOW = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_LOGWINDOW + 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}-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_logdialog='wxUSE_LOGDIALOG=yes' + else + wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' + fi + +else + + wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" + +fi + + + eval "$wx_cv_use_logdialog" + if test x"$enablestring" = xdisable; then - if test $wxUSE_PRINTING_ARCHITECTURE = yes; then + if test $wxUSE_LOGDIALOG = yes; then result=no else result=yes fi else - result=$wxUSE_PRINTING_ARCHITECTURE + result=$wxUSE_LOGDIALOG fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9462,7 +8852,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mdi was given. if test "${enable_mdi+set}" = set; then enableval=$enable_mdi; @@ -9474,22 +8863,12 @@ if test "${enable_mdi+set}" = set; then else - LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" fi eval "$wx_cv_use_mdi" - if test "$no_cache" != 1; then - echo $wx_cv_use_mdi >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MDI = yes; then @@ -9517,7 +8896,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mdidoc was given. if test "${enable_mdidoc+set}" = set; then enableval=$enable_mdidoc; @@ -9529,22 +8907,12 @@ if test "${enable_mdidoc+set}" = set; then else - LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" fi eval "$wx_cv_use_mdidoc" - if test "$no_cache" != 1; then - echo $wx_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MDI_ARCHITECTURE = yes; then @@ -9570,100 +8938,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; } - no_cache=0 - # Check whether --enable-loggui was given. -if test "${enable_loggui+set}" = set; then - enableval=$enable_loggui; - if test "$enableval" = yes; then - wx_cv_use_loggui='wxUSE_LOGGUI=yes' - else - wx_cv_use_loggui='wxUSE_LOGGUI=no' - fi - -else - - LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" - -fi - - - eval "$wx_cv_use_loggui" - if test "$no_cache" != 1; then - echo $wx_cv_use_loggui >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGGUI = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_LOGGUI - 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}-logwin" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-logwin was given. -if test "${enable_logwin+set}" = set; then - enableval=$enable_logwin; + { 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_logwin='wxUSE_LOGWINDOW=yes' + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' else - wx_cv_use_logwin='wxUSE_LOGWINDOW=no' + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no' fi else - LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" fi - eval "$wx_cv_use_logwin" - if test "$no_cache" != 1; then - echo $wx_cv_use_logwin >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_mediactrl" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGWINDOW = yes; then + if test $wxUSE_MEDIACTRL = yes; then result=no else result=yes fi else - result=$wxUSE_LOGWINDOW + result=$wxUSE_MEDIACTRL fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -9680,45 +8982,34 @@ 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; } - no_cache=0 - # Check whether --enable-logdialog was given. -if test "${enable_logdialog+set}" = set; then - enableval=$enable_logdialog; + { 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_logdialog='wxUSE_LOGDIALOG=yes' + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes' else - wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no' fi else - LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" fi - eval "$wx_cv_use_logdialog" - if test "$no_cache" != 1; then - echo $wx_cv_use_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 @@ -9737,7 +9028,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-webkit was given. if test "${enable_webkit+set}" = set; then enableval=$enable_webkit; @@ -9749,22 +9039,12 @@ if test "${enable_webkit+set}" = set; then else - LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" fi eval "$wx_cv_use_webkit" - if test "$no_cache" != 1; then - echo $wx_cv_use_webkit >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_WEBKIT = yes; then @@ -9792,7 +9072,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richtext" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-richtext was given. if test "${enable_richtext+set}" = set; then enableval=$enable_richtext; @@ -9804,22 +9083,12 @@ if test "${enable_richtext+set}" = set; then else - LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}" fi eval "$wx_cv_use_richtext" - if test "$no_cache" != 1; then - echo $wx_cv_use_richtext >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RICHTEXT = yes; then @@ -9847,7 +9116,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-graphics_ctx was given. if test "${enable_graphics_ctx+set}" = set; then enableval=$enable_graphics_ctx; @@ -9859,22 +9127,12 @@ if test "${enable_graphics_ctx+set}" = set; then else - LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" fi eval "$wx_cv_use_graphics_ctx" - if test "$no_cache" != 1; then - echo $wx_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GRAPHICS_CONTEXT = yes; then @@ -9902,7 +9160,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-postscript was given. if test "${enable_postscript+set}" = set; then enableval=$enable_postscript; @@ -9914,22 +9171,12 @@ if test "${enable_postscript+set}" = set; then else - LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" fi eval "$wx_cv_use_postscript" - if test "$no_cache" != 1; then - echo $wx_cv_use_postscript >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_POSTSCRIPT = yes; then @@ -9945,6 +9192,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 @@ -9957,7 +9248,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-svg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-svg was given. if test "${enable_svg+set}" = set; then enableval=$enable_svg; @@ -9969,22 +9259,12 @@ if test "${enable_svg+set}" = set; then else - LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" fi eval "$wx_cv_use_svg" - if test "$no_cache" != 1; then - echo $wx_cv_use_svg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SVG = yes; then @@ -10014,7 +9294,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-clipboard" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-clipboard was given. if test "${enable_clipboard+set}" = set; then enableval=$enable_clipboard; @@ -10026,22 +9305,12 @@ if test "${enable_clipboard+set}" = set; then else - LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}" fi eval "$wx_cv_use_clipboard" - if test "$no_cache" != 1; then - echo $wx_cv_use_clipboard >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CLIPBOARD = yes; then @@ -10069,7 +9338,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dnd" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dnd was given. if test "${enable_dnd+set}" = set; then enableval=$enable_dnd; @@ -10081,22 +9349,12 @@ if test "${enable_dnd+set}" = set; then else - LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}" fi eval "$wx_cv_use_dnd" - if test "$no_cache" != 1; then - echo $wx_cv_use_dnd >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DRAG_AND_DROP = yes; then @@ -10124,7 +9382,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-metafile was given. if test "${enable_metafile+set}" = set; then enableval=$enable_metafile; @@ -10136,22 +9393,12 @@ if test "${enable_metafile+set}" = set; then else - LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" fi eval "$wx_cv_use_metafile" - if test "$no_cache" != 1; then - echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_METAFILE = yes; then @@ -10182,7 +9429,6 @@ DEFAULT_wxUSE_CONTROLS=none { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-controls" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-controls was given. if test "${enable_controls+set}" = set; then enableval=$enable_controls; @@ -10194,22 +9440,12 @@ if test "${enable_controls+set}" = set; then else - LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}" fi eval "$wx_cv_use_controls" - if test "$no_cache" != 1; then - echo $wx_cv_use_controls >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONTROLS = yes; then @@ -10244,12 +9480,13 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_DETECT_SM=yes DEFAULT_wxUSE_DIRPICKERCTRL=yes + DEFAULT_wxUSE_FILECTRL=yes DEFAULT_wxUSE_FILEPICKERCTRL=yes DEFAULT_wxUSE_FONTPICKERCTRL=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_HYPERLINKCTRL=yes - DEFAULT_wxUSE_DATAVIEWCTRL=no + DEFAULT_wxUSE_DATAVIEWCTRL=yes DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOOK=yes DEFAULT_wxUSE_LISTBOX=yes @@ -10268,7 +9505,6 @@ if test "$wxUSE_CONTROLS" = "yes"; then 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 @@ -10297,6 +9533,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_DETECT_SM=no DEFAULT_wxUSE_DIRPICKERCTRL=no + DEFAULT_wxUSE_FILECTRL=no DEFAULT_wxUSE_FILEPICKERCTRL=no DEFAULT_wxUSE_FONTPICKERCTRL=no DEFAULT_wxUSE_GAUGE=no @@ -10321,7 +9558,6 @@ elif test "$wxUSE_CONTROLS" = "no"; then 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 @@ -10346,7 +9582,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accel" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-accel was given. if test "${enable_accel+set}" = set; then enableval=$enable_accel; @@ -10358,22 +9593,12 @@ if test "${enable_accel+set}" = set; then else - LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}" fi eval "$wx_cv_use_accel" - if test "$no_cache" != 1; then - echo $wx_cv_use_accel >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ACCEL = yes; then @@ -10401,7 +9626,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-animatectrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-animatectrl was given. if test "${enable_animatectrl+set}" = set; then enableval=$enable_animatectrl; @@ -10413,22 +9637,12 @@ if test "${enable_animatectrl+set}" = set; then else - LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}" fi eval "$wx_cv_use_animatectrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ANIMATIONCTRL = yes; then @@ -10456,7 +9670,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-button was given. if test "${enable_button+set}" = set; then enableval=$enable_button; @@ -10468,22 +9681,12 @@ if test "${enable_button+set}" = set; then else - LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" fi eval "$wx_cv_use_button" - if test "$no_cache" != 1; then - echo $wx_cv_use_button >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BUTTON = yes; then @@ -10511,7 +9714,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then enableval=$enable_bmpbutton; @@ -10523,22 +9725,12 @@ if test "${enable_bmpbutton+set}" = set; then else - LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" fi eval "$wx_cv_use_bmpbutton" - if test "$no_cache" != 1; then - echo $wx_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BMPBUTTON = yes; then @@ -10566,7 +9758,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-bmpcombobox was given. if test "${enable_bmpcombobox+set}" = set; then enableval=$enable_bmpcombobox; @@ -10578,22 +9769,12 @@ if test "${enable_bmpcombobox+set}" = set; then else - LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" fi eval "$wx_cv_use_bmpcombobox" - if test "$no_cache" != 1; then - echo $wx_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BITMAPCOMBOBOX = yes; then @@ -10621,7 +9802,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-calendar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-calendar was given. if test "${enable_calendar+set}" = set; then enableval=$enable_calendar; @@ -10633,22 +9813,12 @@ if test "${enable_calendar+set}" = set; then else - LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}" fi eval "$wx_cv_use_calendar" - if test "$no_cache" != 1; then - echo $wx_cv_use_calendar >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CALCTRL = yes; then @@ -10676,7 +9846,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-caret" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-caret was given. if test "${enable_caret+set}" = set; then enableval=$enable_caret; @@ -10688,22 +9857,12 @@ if test "${enable_caret+set}" = set; then else - LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}" fi eval "$wx_cv_use_caret" - if test "$no_cache" != 1; then - echo $wx_cv_use_caret >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CARET = yes; then @@ -10731,7 +9890,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checkbox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-checkbox was given. if test "${enable_checkbox+set}" = set; then enableval=$enable_checkbox; @@ -10743,22 +9901,12 @@ if test "${enable_checkbox+set}" = set; then else - LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}" fi eval "$wx_cv_use_checkbox" - if test "$no_cache" != 1; then - echo $wx_cv_use_checkbox >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHECKBOX = yes; then @@ -10786,7 +9934,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checklst" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-checklst was given. if test "${enable_checklst+set}" = set; then enableval=$enable_checklst; @@ -10798,22 +9945,12 @@ if test "${enable_checklst+set}" = set; then else - LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}" fi eval "$wx_cv_use_checklst" - if test "$no_cache" != 1; then - echo $wx_cv_use_checklst >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHECKLST = yes; then @@ -10841,7 +9978,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choice" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-choice was given. if test "${enable_choice+set}" = set; then enableval=$enable_choice; @@ -10853,22 +9989,12 @@ if test "${enable_choice+set}" = set; then else - LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}" fi eval "$wx_cv_use_choice" - if test "$no_cache" != 1; then - echo $wx_cv_use_choice >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHOICE = yes; then @@ -10896,7 +10022,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicebook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-choicebook was given. if test "${enable_choicebook+set}" = set; then enableval=$enable_choicebook; @@ -10908,22 +10033,12 @@ if test "${enable_choicebook+set}" = set; then else - LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}" fi eval "$wx_cv_use_choicebook" - if test "$no_cache" != 1; then - echo $wx_cv_use_choicebook >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHOICEBOOK = yes; then @@ -10951,7 +10066,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-collpane" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-collpane was given. if test "${enable_collpane+set}" = set; then enableval=$enable_collpane; @@ -10963,22 +10077,12 @@ if test "${enable_collpane+set}" = set; then else - LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}" fi eval "$wx_cv_use_collpane" - if test "$no_cache" != 1; then - echo $wx_cv_use_collpane >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COLLPANE = yes; then @@ -11006,7 +10110,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-colourpicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-colourpicker was given. if test "${enable_colourpicker+set}" = set; then enableval=$enable_colourpicker; @@ -11018,22 +10121,12 @@ if test "${enable_colourpicker+set}" = set; then else - LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_colourpicker" - if test "$no_cache" != 1; then - echo $wx_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COLOURPICKERCTRL = yes; then @@ -11061,7 +10154,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-combobox was given. if test "${enable_combobox+set}" = set; then enableval=$enable_combobox; @@ -11073,22 +10165,12 @@ if test "${enable_combobox+set}" = set; then else - LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}" fi eval "$wx_cv_use_combobox" - if test "$no_cache" != 1; then - echo $wx_cv_use_combobox >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COMBOBOX = yes; then @@ -11116,7 +10198,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-comboctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-comboctrl was given. if test "${enable_comboctrl+set}" = set; then enableval=$enable_comboctrl; @@ -11128,22 +10209,12 @@ if test "${enable_comboctrl+set}" = set; then else - LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}" fi eval "$wx_cv_use_comboctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COMBOCTRL = yes; then @@ -11171,7 +10242,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-datepick was given. if test "${enable_datepick+set}" = set; then enableval=$enable_datepick; @@ -11183,22 +10253,12 @@ if test "${enable_datepick+set}" = set; then else - LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" fi eval "$wx_cv_use_datepick" - if test "$no_cache" != 1; then - echo $wx_cv_use_datepick >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATEPICKCTRL = yes; then @@ -11226,7 +10286,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dirpicker was given. if test "${enable_dirpicker+set}" = set; then enableval=$enable_dirpicker; @@ -11238,22 +10297,12 @@ if test "${enable_dirpicker+set}" = set; then else - LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_dirpicker" - if test "$no_cache" != 1; then - echo $wx_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DIRPICKERCTRL = yes; then @@ -11281,7 +10330,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-display was given. if test "${enable_display+set}" = set; then enableval=$enable_display; @@ -11293,22 +10341,12 @@ if test "${enable_display+set}" = set; then else - LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" fi eval "$wx_cv_use_display" - if test "$no_cache" != 1; then - echo $wx_cv_use_display >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DISPLAY = yes; then @@ -11336,7 +10374,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-detect_sm was given. if test "${enable_detect_sm+set}" = set; then enableval=$enable_detect_sm; @@ -11348,22 +10385,12 @@ if test "${enable_detect_sm+set}" = set; then else - LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" fi eval "$wx_cv_use_detect_sm" - if test "$no_cache" != 1; then - echo $wx_cv_use_detect_sm >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DETECT_SM = yes; then @@ -11391,7 +10418,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-editablebox was given. if test "${enable_editablebox+set}" = set; then enableval=$enable_editablebox; @@ -11403,22 +10429,12 @@ if test "${enable_editablebox+set}" = set; then else - LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" fi eval "$wx_cv_use_editablebox" - if test "$no_cache" != 1; then - echo $wx_cv_use_editablebox >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_EDITABLELISTBOX = yes; then @@ -11446,7 +10462,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-filepicker was given. if test "${enable_filepicker+set}" = set; then enableval=$enable_filepicker; @@ -11458,22 +10473,12 @@ if test "${enable_filepicker+set}" = set; then else - LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_filepicker" - if test "$no_cache" != 1; then - echo $wx_cv_use_filepicker >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILEPICKERCTRL = yes; then @@ -11489,6 +10494,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}-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_filectrl='wxUSE_FILECTRL=yes' + else + wx_cv_use_filectrl='wxUSE_FILECTRL=no' + fi + +else + + wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_filectrl" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILECTRL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_FILECTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11501,7 +10550,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontpicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fontpicker was given. if test "${enable_fontpicker+set}" = set; then enableval=$enable_fontpicker; @@ -11513,22 +10561,12 @@ if test "${enable_fontpicker+set}" = set; then else - LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_fontpicker" - if test "$no_cache" != 1; then - echo $wx_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTPICKERCTRL = yes; then @@ -11556,7 +10594,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gauge" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-gauge was given. if test "${enable_gauge+set}" = set; then enableval=$enable_gauge; @@ -11568,22 +10605,12 @@ if test "${enable_gauge+set}" = set; then else - LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}" fi eval "$wx_cv_use_gauge" - if test "$no_cache" != 1; then - echo $wx_cv_use_gauge >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GAUGE = yes; then @@ -11611,7 +10638,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-grid" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-grid was given. if test "${enable_grid+set}" = set; then enableval=$enable_grid; @@ -11623,22 +10649,12 @@ if test "${enable_grid+set}" = set; then else - LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}" fi eval "$wx_cv_use_grid" - if test "$no_cache" != 1; then - echo $wx_cv_use_grid >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GRID = yes; then @@ -11666,7 +10682,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dataviewctrl was given. if test "${enable_dataviewctrl+set}" = set; then enableval=$enable_dataviewctrl; @@ -11678,22 +10693,12 @@ if test "${enable_dataviewctrl+set}" = set; then else - LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" fi eval "$wx_cv_use_dataviewctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATAVIEWCTRL = yes; then @@ -11721,7 +10726,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hyperlink" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-hyperlink was given. if test "${enable_hyperlink+set}" = set; then enableval=$enable_hyperlink; @@ -11733,22 +10737,12 @@ if test "${enable_hyperlink+set}" = set; then else - LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}" fi eval "$wx_cv_use_hyperlink" - if test "$no_cache" != 1; then - echo $wx_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_HYPERLINKCTRL = yes; then @@ -11776,7 +10770,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-imaglist was given. if test "${enable_imaglist+set}" = set; then enableval=$enable_imaglist; @@ -11788,22 +10781,12 @@ if test "${enable_imaglist+set}" = set; then else - LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}" fi eval "$wx_cv_use_imaglist" - if test "$no_cache" != 1; then - echo $wx_cv_use_imaglist >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_IMAGLIST = yes; then @@ -11831,7 +10814,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-listbook was given. if test "${enable_listbook+set}" = set; then enableval=$enable_listbook; @@ -11843,22 +10825,12 @@ if test "${enable_listbook+set}" = set; then else - LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}" fi eval "$wx_cv_use_listbook" - if test "$no_cache" != 1; then - echo $wx_cv_use_listbook >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LISTBOOK = yes; then @@ -11886,7 +10858,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-listbox was given. if test "${enable_listbox+set}" = set; then enableval=$enable_listbox; @@ -11898,22 +10869,12 @@ if test "${enable_listbox+set}" = set; then else - LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}" fi eval "$wx_cv_use_listbox" - if test "$no_cache" != 1; then - echo $wx_cv_use_listbox >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LISTBOX = yes; then @@ -11941,7 +10902,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-listctrl was given. if test "${enable_listctrl+set}" = set; then enableval=$enable_listctrl; @@ -11953,22 +10913,12 @@ if test "${enable_listctrl+set}" = set; then else - LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}" fi eval "$wx_cv_use_listctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_listctrl >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LISTCTRL = yes; then @@ -11996,7 +10946,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notebook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-notebook was given. if test "${enable_notebook+set}" = set; then enableval=$enable_notebook; @@ -12008,22 +10957,12 @@ if test "${enable_notebook+set}" = set; then else - LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}" fi eval "$wx_cv_use_notebook" - if test "$no_cache" != 1; then - echo $wx_cv_use_notebook >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NOTEBOOK = yes; then @@ -12039,6 +10978,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 @@ -12051,7 +11034,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-odcombobox was given. if test "${enable_odcombobox+set}" = set; then enableval=$enable_odcombobox; @@ -12063,22 +11045,12 @@ if test "${enable_odcombobox+set}" = set; then else - LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}" fi eval "$wx_cv_use_odcombobox" - if test "$no_cache" != 1; then - echo $wx_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ODCOMBOBOX = yes; then @@ -12106,7 +11078,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-radiobox was given. if test "${enable_radiobox+set}" = set; then enableval=$enable_radiobox; @@ -12118,22 +11089,12 @@ if test "${enable_radiobox+set}" = set; then else - LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}" fi eval "$wx_cv_use_radiobox" - if test "$no_cache" != 1; then - echo $wx_cv_use_radiobox >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RADIOBOX = yes; then @@ -12161,7 +11122,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobtn" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then enableval=$enable_radiobtn; @@ -12173,22 +11133,12 @@ if test "${enable_radiobtn+set}" = set; then else - LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}" fi eval "$wx_cv_use_radiobtn" - if test "$no_cache" != 1; then - echo $wx_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RADIOBTN = yes; then @@ -12216,7 +11166,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sash" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-sash was given. if test "${enable_sash+set}" = set; then enableval=$enable_sash; @@ -12228,22 +11177,12 @@ if test "${enable_sash+set}" = set; then else - LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}" fi eval "$wx_cv_use_sash" - if test "$no_cache" != 1; then - echo $wx_cv_use_sash >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SASH = yes; then @@ -12271,7 +11210,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-scrollbar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then enableval=$enable_scrollbar; @@ -12283,22 +11221,12 @@ if test "${enable_scrollbar+set}" = set; then else - LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}" fi eval "$wx_cv_use_scrollbar" - if test "$no_cache" != 1; then - echo $wx_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SCROLLBAR = yes; then @@ -12326,7 +11254,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-searchctrl was given. if test "${enable_searchctrl+set}" = set; then enableval=$enable_searchctrl; @@ -12338,22 +11265,12 @@ if test "${enable_searchctrl+set}" = set; then else - LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}" fi eval "$wx_cv_use_searchctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SEARCHCTRL = yes; then @@ -12381,7 +11298,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-slider was given. if test "${enable_slider+set}" = set; then enableval=$enable_slider; @@ -12393,22 +11309,12 @@ if test "${enable_slider+set}" = set; then else - LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}" fi eval "$wx_cv_use_slider" - if test "$no_cache" != 1; then - echo $wx_cv_use_slider >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SLIDER = yes; then @@ -12436,7 +11342,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinbtn" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then enableval=$enable_spinbtn; @@ -12448,22 +11353,12 @@ if test "${enable_spinbtn+set}" = set; then else - LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}" fi eval "$wx_cv_use_spinbtn" - if test "$no_cache" != 1; then - echo $wx_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPINBTN = yes; then @@ -12491,7 +11386,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then enableval=$enable_spinctrl; @@ -12503,22 +11397,12 @@ if test "${enable_spinctrl+set}" = set; then else - LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}" fi eval "$wx_cv_use_spinctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPINCTRL = yes; then @@ -12546,7 +11430,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splitter" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-splitter was given. if test "${enable_splitter+set}" = set; then enableval=$enable_splitter; @@ -12558,22 +11441,12 @@ if test "${enable_splitter+set}" = set; then else - LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}" fi eval "$wx_cv_use_splitter" - if test "$no_cache" != 1; then - echo $wx_cv_use_splitter >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPLITTER = yes; then @@ -12601,7 +11474,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbmp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-statbmp was given. if test "${enable_statbmp+set}" = set; then enableval=$enable_statbmp; @@ -12613,22 +11485,12 @@ if test "${enable_statbmp+set}" = set; then else - LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}" fi eval "$wx_cv_use_statbmp" - if test "$no_cache" != 1; then - echo $wx_cv_use_statbmp >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATBMP = yes; then @@ -12656,7 +11518,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-statbox was given. if test "${enable_statbox+set}" = set; then enableval=$enable_statbox; @@ -12668,22 +11529,12 @@ if test "${enable_statbox+set}" = set; then else - LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}" fi eval "$wx_cv_use_statbox" - if test "$no_cache" != 1; then - echo $wx_cv_use_statbox >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATBOX = yes; then @@ -12711,7 +11562,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statline" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-statline was given. if test "${enable_statline+set}" = set; then enableval=$enable_statline; @@ -12723,22 +11573,12 @@ if test "${enable_statline+set}" = set; then else - LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}" fi eval "$wx_cv_use_statline" - if test "$no_cache" != 1; then - echo $wx_cv_use_statline >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATLINE = yes; then @@ -12766,7 +11606,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stattext" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-stattext was given. if test "${enable_stattext+set}" = set; then enableval=$enable_stattext; @@ -12778,22 +11617,12 @@ if test "${enable_stattext+set}" = set; then else - LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}" fi eval "$wx_cv_use_stattext" - if test "$no_cache" != 1; then - echo $wx_cv_use_stattext >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATTEXT = yes; then @@ -12821,7 +11650,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statusbar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-statusbar was given. if test "${enable_statusbar+set}" = set; then enableval=$enable_statusbar; @@ -12833,22 +11661,12 @@ if test "${enable_statusbar+set}" = set; then else - LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}" fi eval "$wx_cv_use_statusbar" - if test "$no_cache" != 1; then - echo $wx_cv_use_statusbar >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATUSBAR = yes; then @@ -12874,45 +11692,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; } - no_cache=0 - # Check whether --enable-tabdialog was given. -if test "${enable_tabdialog+set}" = set; then - enableval=$enable_tabdialog; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-taskbaricon" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6; } + # Check whether --enable-taskbaricon was given. +if test "${enable_taskbaricon+set}" = set; then + enableval=$enable_taskbaricon; if test "$enableval" = yes; then - wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes' + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes' else - wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no' + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no' fi else - LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - 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 "$no_cache" != 1; then - echo $wx_cv_use_tabdialog >> ${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 @@ -12931,7 +11738,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-textctrl was given. if test "${enable_textctrl+set}" = set; then enableval=$enable_textctrl; @@ -12943,22 +11749,12 @@ if test "${enable_textctrl+set}" = set; then else - LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" fi eval "$wx_cv_use_textctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_textctrl >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTCTRL = yes; then @@ -12986,7 +11782,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then enableval=$enable_togglebtn; @@ -12998,22 +11793,12 @@ if test "${enable_togglebtn+set}" = set; then else - LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" fi eval "$wx_cv_use_togglebtn" - if test "$no_cache" != 1; then - echo $wx_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOGGLEBTN = yes; then @@ -13041,7 +11826,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-toolbar was given. if test "${enable_toolbar+set}" = set; then enableval=$enable_toolbar; @@ -13053,22 +11837,12 @@ if test "${enable_toolbar+set}" = set; then else - LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" fi eval "$wx_cv_use_toolbar" - if test "$no_cache" != 1; then - echo $wx_cv_use_toolbar >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOOLBAR = yes; then @@ -13096,7 +11870,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then enableval=$enable_tbarnative; @@ -13108,22 +11881,12 @@ if test "${enable_tbarnative+set}" = set; then else - LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" fi eval "$wx_cv_use_tbarnative" - if test "$no_cache" != 1; then - echo $wx_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOOLBAR_NATIVE = yes; then @@ -13151,7 +11914,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-treebook was given. if test "${enable_treebook+set}" = set; then enableval=$enable_treebook; @@ -13163,22 +11925,12 @@ if test "${enable_treebook+set}" = set; then else - LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" fi eval "$wx_cv_use_treebook" - if test "$no_cache" != 1; then - echo $wx_cv_use_treebook >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TREEBOOK = yes; then @@ -13206,7 +11958,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-toolbook was given. if test "${enable_toolbook+set}" = set; then enableval=$enable_toolbook; @@ -13218,22 +11969,12 @@ if test "${enable_toolbook+set}" = set; then else - LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}" fi eval "$wx_cv_use_toolbook" - if test "$no_cache" != 1; then - echo $wx_cv_use_toolbook >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOOLBOOK = yes; then @@ -13261,7 +12002,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-treectrl was given. if test "${enable_treectrl+set}" = set; then enableval=$enable_treectrl; @@ -13273,22 +12013,12 @@ if test "${enable_treectrl+set}" = set; then else - LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" fi eval "$wx_cv_use_treectrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_treectrl >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TREECTRL = yes; then @@ -13316,7 +12046,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tipwindow was given. if test "${enable_tipwindow+set}" = set; then enableval=$enable_tipwindow; @@ -13328,22 +12057,12 @@ if test "${enable_tipwindow+set}" = set; then else - LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" fi eval "$wx_cv_use_tipwindow" - if test "$no_cache" != 1; then - echo $wx_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TIPWINDOW = yes; then @@ -13371,7 +12090,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-popupwin was given. if test "${enable_popupwin+set}" = set; then enableval=$enable_popupwin; @@ -13383,22 +12101,12 @@ if test "${enable_popupwin+set}" = set; then else - LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" fi eval "$wx_cv_use_popupwin" - if test "$no_cache" != 1; then - echo $wx_cv_use_popupwin >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_POPUPWIN = yes; then @@ -13428,7 +12136,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commondlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-commondlg was given. if test "${enable_commondlg+set}" = set; then enableval=$enable_commondlg; @@ -13440,22 +12147,12 @@ if test "${enable_commondlg+set}" = set; then else - LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}" fi eval "$wx_cv_use_commondlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_commondlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COMMONDLGS = yes; then @@ -13483,7 +12180,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aboutdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-aboutdlg was given. if test "${enable_aboutdlg+set}" = set; then enableval=$enable_aboutdlg; @@ -13495,22 +12191,12 @@ if test "${enable_aboutdlg+set}" = set; then else - LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}" fi eval "$wx_cv_use_aboutdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ABOUTDLG = yes; then @@ -13538,7 +12224,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicedlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then enableval=$enable_choicedlg; @@ -13550,22 +12235,12 @@ if test "${enable_choicedlg+set}" = set; then else - LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}" fi eval "$wx_cv_use_choicedlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHOICEDLG = yes; then @@ -13593,7 +12268,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-coldlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-coldlg was given. if test "${enable_coldlg+set}" = set; then enableval=$enable_coldlg; @@ -13605,22 +12279,12 @@ if test "${enable_coldlg+set}" = set; then else - LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}" fi eval "$wx_cv_use_coldlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_coldlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COLOURDLG = yes; then @@ -13648,7 +12312,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filedlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-filedlg was given. if test "${enable_filedlg+set}" = set; then enableval=$enable_filedlg; @@ -13660,22 +12323,12 @@ if test "${enable_filedlg+set}" = set; then else - LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}" fi eval "$wx_cv_use_filedlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_filedlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILEDLG = yes; then @@ -13703,7 +12356,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-finddlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-finddlg was given. if test "${enable_finddlg+set}" = set; then enableval=$enable_finddlg; @@ -13715,22 +12367,12 @@ if test "${enable_finddlg+set}" = set; then else - LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}" fi eval "$wx_cv_use_finddlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_finddlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FINDREPLDLG = yes; then @@ -13758,7 +12400,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then enableval=$enable_fontdlg; @@ -13770,22 +12411,12 @@ if test "${enable_fontdlg+set}" = set; then else - LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}" fi eval "$wx_cv_use_fontdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTDLG = yes; then @@ -13813,7 +12444,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then enableval=$enable_dirdlg; @@ -13825,22 +12455,12 @@ if test "${enable_dirdlg+set}" = set; then else - LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}" fi eval "$wx_cv_use_dirdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DIRDLG = yes; then @@ -13868,7 +12488,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-msgdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then enableval=$enable_msgdlg; @@ -13880,22 +12499,12 @@ if test "${enable_msgdlg+set}" = set; then else - LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}" fi eval "$wx_cv_use_msgdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MSGDLG = yes; then @@ -13923,7 +12532,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-numberdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then enableval=$enable_numberdlg; @@ -13935,22 +12543,12 @@ if test "${enable_numberdlg+set}" = set; then else - LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}" fi eval "$wx_cv_use_numberdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NUMBERDLG = yes; then @@ -13978,7 +12576,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splash" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-splash was given. if test "${enable_splash+set}" = set; then enableval=$enable_splash; @@ -13990,22 +12587,12 @@ if test "${enable_splash+set}" = set; then else - LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}" fi eval "$wx_cv_use_splash" - if test "$no_cache" != 1; then - echo $wx_cv_use_splash >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPLASH = yes; then @@ -14033,7 +12620,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-textdlg was given. if test "${enable_textdlg+set}" = set; then enableval=$enable_textdlg; @@ -14045,22 +12631,12 @@ if test "${enable_textdlg+set}" = set; then else - LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}" fi eval "$wx_cv_use_textdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_textdlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTDLG = yes; then @@ -14088,7 +12664,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then enableval=$enable_tipdlg; @@ -14100,22 +12675,12 @@ if test "${enable_tipdlg+set}" = set; then else - LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}" fi eval "$wx_cv_use_tipdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STARTUP_TIPS = yes; then @@ -14143,7 +12708,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-progressdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then enableval=$enable_progressdlg; @@ -14155,22 +12719,12 @@ if test "${enable_progressdlg+set}" = set; then else - LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}" fi eval "$wx_cv_use_progressdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROGRESSDLG = yes; then @@ -14198,7 +12752,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wizarddlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-wizarddlg was given. if test "${enable_wizarddlg+set}" = set; then enableval=$enable_wizarddlg; @@ -14210,22 +12763,12 @@ if test "${enable_wizarddlg+set}" = set; then else - LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}" fi eval "$wx_cv_use_wizarddlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_WIZARDDLG = yes; then @@ -14255,7 +12798,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-menus" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-menus was given. if test "${enable_menus+set}" = set; then enableval=$enable_menus; @@ -14267,22 +12809,12 @@ if test "${enable_menus+set}" = set; then else - LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}" fi eval "$wx_cv_use_menus" - if test "$no_cache" != 1; then - echo $wx_cv_use_menus >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MENUS = yes; then @@ -14310,7 +12842,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-miniframe" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-miniframe was given. if test "${enable_miniframe+set}" = set; then enableval=$enable_miniframe; @@ -14322,22 +12853,12 @@ if test "${enable_miniframe+set}" = set; then else - LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}" fi eval "$wx_cv_use_miniframe" - if test "$no_cache" != 1; then - echo $wx_cv_use_miniframe >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MINIFRAME = yes; then @@ -14365,7 +12886,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tooltips" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tooltips was given. if test "${enable_tooltips+set}" = set; then enableval=$enable_tooltips; @@ -14377,22 +12897,12 @@ if test "${enable_tooltips+set}" = set; then else - LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}" fi eval "$wx_cv_use_tooltips" - if test "$no_cache" != 1; then - echo $wx_cv_use_tooltips >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOOLTIPS = yes; then @@ -14420,7 +12930,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splines" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-splines was given. if test "${enable_splines+set}" = set; then enableval=$enable_splines; @@ -14432,22 +12941,12 @@ if test "${enable_splines+set}" = set; then else - LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}" fi eval "$wx_cv_use_splines" - if test "$no_cache" != 1; then - echo $wx_cv_use_splines >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPLINES = yes; then @@ -14475,7 +12974,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mousewheel was given. if test "${enable_mousewheel+set}" = set; then enableval=$enable_mousewheel; @@ -14487,22 +12985,12 @@ if test "${enable_mousewheel+set}" = set; then else - LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}" fi eval "$wx_cv_use_mousewheel" - if test "$no_cache" != 1; then - echo $wx_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MOUSEWHEEL = yes; then @@ -14530,7 +13018,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-validators was given. if test "${enable_validators+set}" = set; then enableval=$enable_validators; @@ -14542,22 +13029,12 @@ if test "${enable_validators+set}" = set; then else - LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}" fi eval "$wx_cv_use_validators" - if test "$no_cache" != 1; then - echo $wx_cv_use_validators >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_VALIDATORS = yes; then @@ -14585,7 +13062,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-busyinfo" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then enableval=$enable_busyinfo; @@ -14597,22 +13073,12 @@ if test "${enable_busyinfo+set}" = set; then else - LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}" fi eval "$wx_cv_use_busyinfo" - if test "$no_cache" != 1; then - echo $wx_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BUSYINFO = yes; then @@ -14640,7 +13106,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-joystick" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-joystick was given. if test "${enable_joystick+set}" = set; then enableval=$enable_joystick; @@ -14652,22 +13117,12 @@ if test "${enable_joystick+set}" = set; then else - LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}" fi eval "$wx_cv_use_joystick" - if test "$no_cache" != 1; then - echo $wx_cv_use_joystick >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_JOYSTICK = yes; then @@ -14695,7 +13150,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-metafile was given. if test "${enable_metafile+set}" = set; then enableval=$enable_metafile; @@ -14707,22 +13161,12 @@ if test "${enable_metafile+set}" = set; then else - LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" fi eval "$wx_cv_use_metafile" - if test "$no_cache" != 1; then - echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_METAFILE = yes; then @@ -14750,7 +13194,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dragimage" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dragimage was given. if test "${enable_dragimage+set}" = set; then enableval=$enable_dragimage; @@ -14762,22 +13205,12 @@ if test "${enable_dragimage+set}" = set; then else - LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}" fi eval "$wx_cv_use_dragimage" - if test "$no_cache" != 1; then - echo $wx_cv_use_dragimage >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DRAGIMAGE = yes; then @@ -14805,7 +13238,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accessibility" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-accessibility was given. if test "${enable_accessibility+set}" = set; then enableval=$enable_accessibility; @@ -14817,22 +13249,12 @@ if test "${enable_accessibility+set}" = set; then else - LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}" fi eval "$wx_cv_use_accessibility" - if test "$no_cache" != 1; then - echo $wx_cv_use_accessibility >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ACCESSIBILITY = yes; then @@ -14848,64 +13270,6 @@ fi echo "${ECHO_T}$result" >&6; } -if test "$wxUSE_MSW" = "1"; then - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dccache" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-dccache was given. -if test "${enable_dccache+set}" = set; then - enableval=$enable_dccache; - if test "$enableval" = yes; then - wx_cv_use_dccache='wxUSE_DC_CACHEING=yes' - else - wx_cv_use_dccache='wxUSE_DC_CACHEING=no' - fi - -else - - LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" - -fi - - - eval "$wx_cv_use_dccache" - if test "$no_cache" != 1; then - echo $wx_cv_use_dccache >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_DC_CACHEING = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_DC_CACHEING - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - -fi - enablestring= @@ -14920,7 +13284,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-palette was given. if test "${enable_palette+set}" = set; then enableval=$enable_palette; @@ -14932,22 +13295,12 @@ if test "${enable_palette+set}" = set; then else - LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}" fi eval "$wx_cv_use_palette" - if test "$no_cache" != 1; then - echo $wx_cv_use_palette >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PALETTE = yes; then @@ -14975,7 +13328,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-image" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-image was given. if test "${enable_image+set}" = set; then enableval=$enable_image; @@ -14987,22 +13339,12 @@ if test "${enable_image+set}" = set; then else - LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}" fi eval "$wx_cv_use_image" - if test "$no_cache" != 1; then - echo $wx_cv_use_image >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_IMAGE = yes; then @@ -15030,7 +13372,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gif" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-gif was given. if test "${enable_gif+set}" = set; then enableval=$enable_gif; @@ -15042,22 +13383,12 @@ if test "${enable_gif+set}" = set; then else - LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}" fi eval "$wx_cv_use_gif" - if test "$no_cache" != 1; then - echo $wx_cv_use_gif >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GIF = yes; then @@ -15085,7 +13416,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pcx" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-pcx was given. if test "${enable_pcx+set}" = set; then enableval=$enable_pcx; @@ -15097,22 +13427,12 @@ if test "${enable_pcx+set}" = set; then else - LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}" fi eval "$wx_cv_use_pcx" - if test "$no_cache" != 1; then - echo $wx_cv_use_pcx >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PCX = yes; then @@ -15140,7 +13460,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tga" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tga was given. if test "${enable_tga+set}" = set; then enableval=$enable_tga; @@ -15152,22 +13471,12 @@ if test "${enable_tga+set}" = set; then else - LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}" fi eval "$wx_cv_use_tga" - if test "$no_cache" != 1; then - echo $wx_cv_use_tga >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TGA = yes; then @@ -15195,7 +13504,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iff" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-iff was given. if test "${enable_iff+set}" = set; then enableval=$enable_iff; @@ -15207,22 +13515,12 @@ if test "${enable_iff+set}" = set; then else - LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}" fi eval "$wx_cv_use_iff" - if test "$no_cache" != 1; then - echo $wx_cv_use_iff >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_IFF = yes; then @@ -15250,7 +13548,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pnm" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-pnm was given. if test "${enable_pnm+set}" = set; then enableval=$enable_pnm; @@ -15262,22 +13559,12 @@ if test "${enable_pnm+set}" = set; then else - LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}" fi eval "$wx_cv_use_pnm" - if test "$no_cache" != 1; then - echo $wx_cv_use_pnm >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PNM = yes; then @@ -15305,7 +13592,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xpm" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-xpm was given. if test "${enable_xpm+set}" = set; then enableval=$enable_xpm; @@ -15317,22 +13603,12 @@ if test "${enable_xpm+set}" = set; then else - LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}" fi eval "$wx_cv_use_xpm" - if test "$no_cache" != 1; then - echo $wx_cv_use_xpm >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_XPM = yes; then @@ -15360,7 +13636,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ico_cur" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-ico_cur was given. if test "${enable_ico_cur+set}" = set; then enableval=$enable_ico_cur; @@ -15372,22 +13647,12 @@ if test "${enable_ico_cur+set}" = set; then else - LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}" fi eval "$wx_cv_use_ico_cur" - if test "$no_cache" != 1; then - echo $wx_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ICO_CUR = yes; then @@ -15403,124 +13668,277 @@ 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}-dccache" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; } + # Check whether --enable-dccache was given. +if test "${enable_dccache+set}" = set; then + enableval=$enable_dccache; + if test "$enableval" = yes; then + wx_cv_use_dccache='wxUSE_DC_CACHEING=yes' + else + wx_cv_use_dccache='wxUSE_DC_CACHEING=no' + fi + +else + + wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" + fi - echo "saving argument cache $wx_arg_cache_file" - mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} + eval "$wx_cv_use_dccache" + if test x"$enablestring" = xdisable; then + if test $wxUSE_DC_CACHEING = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DC_CACHEING + fi + { echo "$as_me:$LINENO: result: $result" >&5 +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++} + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ps-in-msw" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ps-in-msw... $ECHO_C" >&6; } + # Check whether --enable-ps-in-msw was given. +if test "${enable_ps_in_msw+set}" = set; then + enableval=$enable_ps_in_msw; + if test "$enableval" = yes; then + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes' + else + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no' + fi + +else + + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}" + fi -if test "$wxUSE_GUI" = "yes"; then + eval "$wx_cv_use_ps_in_msw" - 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 x"$enablestring" = xdisable; then + if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW + fi - 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 + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then - eval "wx${toolkit}_VERSION=$value" - fi - done - else - for toolkit in `echo $ALL_TOOLKITS`; do - if test "$has_toolkit_in_cache" != 1; then - var=DEFAULT_DEFAULT_wxUSE_$toolkit - else - var=DEFAULT_wxUSE_$toolkit - eval "version=\$DEFAULT_wx${toolkit}_VERSION" - if test "x$version" != "x"; then - eval "wx${toolkit}_VERSION=$version" + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi fi - fi - eval "wxUSE_$toolkit=\$${var}" - done - fi - NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \ - + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \ - + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ownerdrawn" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ownerdrawn... $ECHO_C" >&6; } + # Check whether --enable-ownerdrawn was given. +if test "${enable_ownerdrawn+set}" = set; then + enableval=$enable_ownerdrawn; + if test "$enableval" = yes; then + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes' + else + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no' + fi - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` - esac +else - 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 + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}" + +fi - # 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} + eval "$wx_cv_use_ownerdrawn" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_OWNER_DRAWN = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_OWNER_DRAWN fi - 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 + + { 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}-uxtheme" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-uxtheme... $ECHO_C" >&6; } + # Check whether --enable-uxtheme was given. +if test "${enable_uxtheme+set}" = set; then + enableval=$enable_uxtheme; + if test "$enableval" = yes; then + wx_cv_use_uxtheme='wxUSE_UXTHEME=yes' + else + wx_cv_use_uxtheme='wxUSE_UXTHEME=no' + fi + 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 + + wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}" + +fi + + + eval "$wx_cv_use_uxtheme" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_UXTHEME = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_UXTHEME + fi + + { echo "$as_me:$LINENO: 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}-wxdib" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-wxdib... $ECHO_C" >&6; } + # Check whether --enable-wxdib was given. +if test "${enable_wxdib+set}" = set; then + enableval=$enable_wxdib; + if test "$enableval" = yes; then + wx_cv_use_wxdib='wxUSE_DIB=yes' + else + wx_cv_use_wxdib='wxUSE_DIB=no' + fi + +else + + wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}" + +fi + + + eval "$wx_cv_use_wxdib" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DIB = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DIB + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + +if test "$wxUSE_MSW" != 1; then + DEFAULT_wxUSE_AUTOID_MANAGEMENT=no +fi + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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 + + wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=${'DEFAULT_wxUSE_AUTOID_MANAGEMENT":-$defaultval}" + +fi + + + eval "$wx_cv_use_autoidman" + + 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 + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + fi @@ -16600,6 +15018,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 @@ -16978,6 +15553,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$MWCC" != "yes"; then ac_ext=c @@ -17055,6 +15631,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi ;; IRIX*) @@ -17138,6 +15715,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ;; Linux*) + if test "$INTELCC" != "yes"; then ac_ext=c @@ -17215,6 +15793,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi ;; HP-UX*) @@ -18352,6 +16931,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 @@ -18730,6 +17466,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test "$MWCXX" != "yes"; then ac_ext=cpp @@ -18807,6 +17544,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi ;; IRIX*) @@ -18890,6 +17628,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ;; Linux*) + if test "$INTELCXX" != "yes"; then ac_ext=cpp @@ -18967,6 +17706,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi ;; HP-UX*) @@ -19219,103 +17959,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. @@ -19420,595 +18063,263 @@ 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 - - -case "${host}" in - - *-*-darwin* ) - INSTALL_PROGRAM="cp -fp" - INSTALL_DATA="cp -fp" - ;; - *) - ;; -esac - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { 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; } -fi +retest_macosx_linking=no +#if test "$wxUSE_MAC" = 1; then + if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then + if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then + # Implicitly turn on the new --with-macosx-sdk using the default + # SDK which provides the behavior this option has always had. + if test "x$wxUSE_MACOSX_SDK" = "x"; then + { echo "$as_me:$LINENO: WARNING: Enabling default SDK due to --enable-universal_binary." >&5 +echo "$as_me: WARNING: Enabling default SDK due to --enable-universal_binary." >&2;} + { echo "$as_me:$LINENO: WARNING: If you don't want this, specify --without-macosx-sdk" >&5 +echo "$as_me: WARNING: If you don't want this, specify --without-macosx-sdk" >&2;} + wxUSE_MACOSX_SDK=yes + fi + else + # Complain to user if he specified an argument to --enable-universal_binary + # and also 1) specified --with-macosx-sdk using the default (yes) or + # 2) specified --with-macosx-sdk using a path or 3) specified + # --without-macosx-sdk (no). + if test "x$wxUSE_MACOSX_SDK" != "x" ; then + { { echo "$as_me:$LINENO: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary +See \`config.log' for more details." >&5 +echo "$as_me: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else + # Put the SDK path into the wxUSE_MACOSX_SDK. We don't have to + # special-case the empty string because the below test simply + # converts "no" to the empty string anyway. + wxUSE_MACOSX_SDK="$wxUSE_UNIVERSAL_BINARY" + { echo "$as_me:$LINENO: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&5 +echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;} + fi + fi + OSX_UNIV_OPTS="-arch ppc -arch i386" + CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS" + CFLAGS="$OSX_UNIV_OPTS $CFLAGS" + OBJCXXFLAGS="$OSX_UNIV_OPTS $OBJCXXFLAGS" + OBJCFLAGS="$OSX_UNIV_OPTS $OBJCFLAGS" + LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS" + retest_macosx_linking=yes -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 + { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5 +echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} + bk_use_pch=no + fi +#fi -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +if test "x$wxUSE_MACOSX_SDK" = "xno"; then + wxUSE_MACOSX_SDK= +elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then + # TODO: Search for most recent SDK and use it. + wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk" fi - 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 ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi +if test "x$wxUSE_MACOSX_SDK" != "x"; then + { echo "$as_me:$LINENO: checking for SDK directory $wxUSE_MACOSX_SDK" >&5 +echo $ECHO_N "checking for SDK directory $wxUSE_MACOSX_SDK... $ECHO_C" >&6; } + if ! test -d "$wxUSE_MACOSX_SDK"; then + { { echo "$as_me:$LINENO: error: not found +See \`config.log' for more details." >&5 +echo "$as_me: error: not found +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: result: exists" >&5 +echo "${ECHO_T}exists" >&6; } + fi + MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" + eval "CC=\"$CC $MACOSX_SDK_OPTS\"" + eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" + eval "LD=\"$LD $MACOSX_SDK_OPTS\"" + retest_macosx_linking=yes + fi -if test "$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 +if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then + wxUSE_MACOSX_VERSION_MIN= +elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then + if test "x$wxUSE_MACOSX_SDK" != "x"; then + { echo "$as_me:$LINENO: checking SDK deployment version" >&5 +echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6; } -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 + 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 -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. -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 + 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 -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 + 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" + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then + wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN + { echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5 +echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; } + else + { echo "$as_me:$LINENO: WARNING: Could not determine deployment target from SDKSettings.plist" >&5 +echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;} + wxUSE_MACOSX_VERSION_MIN= + fi + else + wxUSE_MACOSX_VERSION_MIN= + fi +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 - 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; } +if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then + MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" + eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\"" + eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\"" + eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\"" + retest_macosx_linking=yes fi +if test "x$retest_macosx_linking" = "xyes"; then + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -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 + { echo "$as_me:$LINENO: checking if C compiler works with SDK/version options" >&5 +echo $ECHO_N "checking if C compiler works with SDK/version options... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -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 +int +main () +{ - 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 ;; + ; + 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 - 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. +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 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&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=. - 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 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -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; } + { { echo "$as_me:$LINENO: error: no. Try a different SDK +See \`config.log' for more details." >&5 +echo "$as_me: error: no. Try a different SDK +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; exit 1 fi +rm -f 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 -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 + 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 "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 + { echo "$as_me:$LINENO: checking if C++ compiler works with SDK/version options" >&5 +echo $ECHO_N "checking if C++ compiler works with SDK/version options... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - ;; - esac -fi +int +main () +{ -{ 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 + ; + 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 + { 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 - 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="#" + { { echo "$as_me:$LINENO: error: no. Try a different SDK +See \`config.log' for more details." >&5 +echo "$as_me: error: no. Try a different SDK +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; exit 1 fi +rm -f 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 - -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 +case "${host}" in + *-*-darwin* ) + INSTALL_PROGRAM="cp -fp" + INSTALL_DATA="cp -fp" + ;; + *) + ;; +esac if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then @@ -20851,11 +19162,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 @@ -20914,9 +19221,13 @@ done if test "$ac_cv_header_wchar_h" != "yes"; then - { echo "$as_me:$LINENO: checking for wcstr.h" >&5 -echo $ECHO_N "checking for wcstr.h... $ECHO_C" >&6; } -if test "${ac_cv_header_wcstr_h+set}" = set; then + +for ac_header in wcstr.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -20927,7 +19238,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -20946,19 +19257,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 - ac_cv_header_wcstr_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_wcstr_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_wcstr_h" >&5 -echo "${ECHO_T}$ac_cv_header_wcstr_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi +done fi @@ -20974,78 +19293,23 @@ case "${host}" in esac if test "$USE_UNIX" = 1 ; then - { echo "$as_me:$LINENO: checking for sys/select.h" >&5 -echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_select_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. */ -$ac_includes_default -#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_sys_select_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_sys_select_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_select_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; } - - -fi - - -for ac_header in sys/epoll.h +for ac_header in sys/select.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -21065,99 +19329,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi ac_res=`eval echo '${'$as_ac_Header'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } - -fi if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -21167,6 +19351,7 @@ fi done +fi { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 @@ -24185,7 +22370,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 ;; @@ -25121,7 +23306,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 @@ -25361,6 +23546,8 @@ _ACEOF fi fi + +LARGEFILE_CPPFLAGS= # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then enableval=$enable_largefile; @@ -25515,25 +23702,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 @@ -25544,9 +23735,9 @@ int main () { - #ifndef __STDC_EXT__ - choke me - #endif + #ifndef __STDC_EXT__ + choke me + #endif ; return 0; @@ -25579,7 +23770,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' @@ -25590,14 +23781,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 @@ -25634,7 +23832,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 @@ -25680,7 +23878,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 @@ -25721,9 +23919,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 @@ -25902,9 +24106,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { echo "$as_me:$LINENO: checking for iostream" >&5 -echo $ECHO_N "checking for iostream... $ECHO_C" >&6; } -if test "${ac_cv_header_iostream+set}" = set; then + +for ac_header in iostream +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -25915,7 +24123,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -25934,19 +24142,27 @@ 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_iostream=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_iostream=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iostream" >&5 -echo "${ECHO_T}$ac_cv_header_iostream" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF +fi + +done if test "$ac_cv_header_iostream" = "yes" ; then @@ -25967,92 +24183,6 @@ 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 $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. */ - - -int -main () -{ - - bool b = true; - - 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_cpp_bool=yes - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - wx_cv_cpp_bool=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_cpp_bool" >&5 -echo "${ECHO_T}$wx_cv_cpp_bool" >&6; } - - if test "$wx_cv_cpp_bool" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_BOOL 1 -_ACEOF - - 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 @@ -26142,251 +24272,28 @@ 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 - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_explicit=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; } - - if test "$wx_cv_explicit" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_EXPLICIT 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 - 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. */ - -int -main () -{ -int x = 0;const int& y = x;int& z = const_cast(y);return z; - ; - 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_cxx_const_cast=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_cxx_const_cast=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_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 - -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 - 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 -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; } -int -main () -{ - -Derived d;Base& b=d;Unrelated& e=reinterpret_cast(b);return g(e); - ; - 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_cxx_reinterpret_cast=yes + wx_cv_explicit=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_cxx_reinterpret_cast=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 + wx_cv_explicit=yes 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 $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 -class Base { public : Base () {} virtual void f () = 0; }; -class Derived : public Base { public : Derived () {} virtual void f () {} }; -int g (Derived&) { return 0; } -int -main () -{ +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -Derived d; Base& b = d; Derived& s = static_cast (b); return g (s); - ; - 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_cxx_static_cast=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_cxx_static_cast=no + wx_cv_explicit=no + 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' @@ -26394,15 +24301,15 @@ 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_explicit" >&5 +echo "${ECHO_T}$wx_cv_explicit" >&6; } -cat >>confdefs.h <<\_ACEOF -#define HAVE_STATIC_CAST + if test "$wx_cv_explicit" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_EXPLICIT 1 _ACEOF -fi + fi if test "x$SUNCXX" = xyes; then @@ -26424,7 +24331,7 @@ if test "x$HPCC" = "xyes"; then CFLAGS="+W 2011,2450 $CFLAGS" fi if test "x$HPCXX" = "xyes"; then - CXXFLAGS="+W 2340 $CXXFLAGS" + CXXFLAGS="+W 2340,4232 $CXXFLAGS" fi if test "x$COMPAQCXX" = "xyes"; then @@ -26581,7 +24488,7 @@ echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6; } { { 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 + 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; }; } @@ -26726,7 +24633,7 @@ fi if test "$wxUSE_STD_IOSTREAM" != "yes"; then - if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; 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; }; } @@ -26869,7 +24776,247 @@ _ACEOF fi - { echo "$as_me:$LINENO: checking for hash_map" >&5 + if test "$wx_cv_class_gnuhashmapset" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_EXT_HASH_MAP 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_GNU_CXX_HASH_MAP 1 +_ACEOF + + fi + + { 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 +/* 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_unordered_map=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_unordered_map=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ 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 +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include +int +main () +{ +std::unordered_map test1; + std::unordered_set test2; + ; + 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_stdunorderedmapset=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + 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_stdunorderedmapset" >&5 +echo "${ECHO_T}$wx_cv_class_stdunorderedmapset" >&6; } +fi + + + + 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 +/* 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_tr1_unordered_map=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + 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_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 +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include +int +main () +{ +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; +} +_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_tr1unorderedmapset=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + 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 + + + + 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 + + else + { 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 @@ -26915,8 +25062,8 @@ 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; } + { 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 @@ -26927,12 +25074,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include - #include + #include int main () { std::hash_map, std::equal_to > test1; - std::hash_set, std::equal_to > test2; + std::hash_set, std::equal_to > test2; ; return 0; } @@ -26972,18 +25119,18 @@ fi - if test "$wx_cv_class_stdhashmapset" = yes; then - cat >>confdefs.h <<\_ACEOF + if test "$wx_cv_class_stdhashmapset" = yes; then + cat >>confdefs.h <<\_ACEOF #define HAVE_HASH_MAP 1 _ACEOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_STD_HASH_MAP 1 _ACEOF - fi + fi - { echo "$as_me:$LINENO: checking for ext/hash_map" >&5 + { 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 @@ -27041,12 +25188,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include - #include + #include int main () { __gnu_cxx::hash_map, std::equal_to > test1; - __gnu_cxx::hash_set, std::equal_to > test2; + __gnu_cxx::hash_set, std::equal_to > test2; ; return 0; } @@ -27086,18 +25233,83 @@ fi - if test "$wx_cv_class_gnuhashmapset" = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_EXT_HASH_MAP 1 + fi + fi +fi + + + + 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 +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - cat >>confdefs.h <<\_ACEOF -#define HAVE_GNU_CXX_HASH_MAP 1 +int +main () +{ + + 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 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_gcc_atomic_builtins=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_cc_gcc_atomic_builtins=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext - fi fi + { 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 + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -27108,6 +25320,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 \ @@ -27120,29 +25336,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 @@ -27912,7 +26124,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 @@ -27994,7 +26206,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 @@ -28021,8 +26233,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 @@ -28624,8 +26836,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 @@ -29445,6 +27655,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 @@ -29817,9 +28034,13 @@ TOOLKIT_INCLUDE= WIDGET_SET= if test "$USE_WIN32" = 1 ; then - { echo "$as_me:$LINENO: checking for w32api.h" >&5 -echo $ECHO_N "checking for w32api.h... $ECHO_C" >&6; } -if test "${ac_cv_header_w32api_h+set}" = set; then + +for ac_header in w32api.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -29830,7 +28051,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -29849,19 +28070,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 - ac_cv_header_w32api_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_w32api_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_w32api_h" >&5 -echo "${ECHO_T}$ac_cv_header_w32api_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi +done { echo "$as_me:$LINENO: checking for windows.h" >&5 echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; } @@ -29919,8 +28148,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 @@ -29930,17 +28165,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" @@ -30011,7 +28235,7 @@ if test "$wxUSE_GUI" = "yes"; then WXGTK12= WXGTK127= - WXGTK20= + WXGTK2= WXGPE= if test "$wxUSE_COCOA" = 1 ; then @@ -30144,7 +28368,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; } @@ -31062,7 +29286,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 @@ -31090,86 +29314,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 @@ -31217,10 +29367,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 @@ -31284,10 +29430,6 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat >>confdefs.h <<\_ACEOF #define __WXGTK26__ 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define __WXGTK24__ 1 _ACEOF { echo "$as_me:$LINENO: result: yes" >&5 @@ -31305,68 +29447,6 @@ echo "${ECHO_T}no" >&6; } 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 -_ACEOF - - { 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; } - -fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -33749,12 +31829,6 @@ done fi if test "$wxUSE_MOTIF" = 1; then - if test "$wxUSE_UNICODE" = "yes"; then - { { echo "$as_me:$LINENO: error: Unicode configuration not supported with Motif" >&5 -echo "$as_me: error: Unicode configuration not supported with Motif" >&2;} - { (exit 1); exit 1; }; } - fi - { echo "$as_me:$LINENO: checking for Motif/Lesstif headers" >&5 echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; } @@ -33959,9 +32033,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 @@ -34033,7 +32107,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 @@ -34502,7 +32576,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 @@ -34524,11 +32598,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 @@ -34607,7 +32686,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 @@ -34633,11 +32712,9 @@ fi if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then - if test "$TOOLKIT" = "DFB" ; then + if test "$USE_UNIX" = 1 -a "$wxUSE_DARWIN" != 1 ; then wxUSE_UNICODE_UTF8=yes - elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "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 @@ -34647,55 +32724,13 @@ fi if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then - { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 -echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xlib_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_X11_Xlib_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_X11_Xlib_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; } - - - { echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5 -echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then +for ac_header in X11/Xlib.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -34705,12 +32740,8 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #if HAVE_X11_XLIB_H - #include - #endif - -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -34729,35 +32760,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_X11_XKBlib_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_X11_XKBlib_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6; } - +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - fi fi +done -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 +for ac_header in X11/XKBlib.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -34767,8 +32798,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + #if HAVE_X11_XLIB_H + #include + #endif + -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -34787,258 +32822,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_sql_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_sql_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_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. */ +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -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 +done 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 @@ -35095,9 +32903,13 @@ echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; } if test "$ac_find_libraries" != "" ; then { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - { echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 -echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then + +for ac_header in X11/extensions/xf86vmode.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -35112,7 +32924,7 @@ cat >>conftest.$ac_ext <<_ACEOF #endif -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -35131,24 +32943,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_X11_extensions_xf86vmode_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_X11_extensions_xf86vmode_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6; } -if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" fi +done else { echo "$as_me:$LINENO: result: no" >&5 @@ -35263,16 +33080,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; } @@ -35353,25 +33169,19 @@ fi echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } if test $ac_cv_header_GL_gl_h = yes; then - if test "${ac_cv_header_GL_glu_h+set}" = set; then - { echo "$as_me:$LINENO: checking for GL/glu.h" >&5 + { echo "$as_me:$LINENO: checking for GL/glu.h" >&5 echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; } if test "${ac_cv_header_GL_glu_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking GL/glu.h usability" >&5 -echo $ECHO_N "checking GL/glu.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + + #include _ACEOF rm -f conftest.$ac_objext @@ -35391,98 +33201,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + ac_cv_header_GL_glu_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_GL_glu_h=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking GL/glu.h presence" >&5 -echo $ECHO_N "checking GL/glu.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: GL/glu.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: GL/glu.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: GL/glu.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: GL/glu.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: GL/glu.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: GL/glu.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for GL/glu.h" >&5 -echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; } -if test "${ac_cv_header_GL_glu_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_GL_glu_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5 echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; } - -fi if test $ac_cv_header_GL_glu_h = yes; then found_gl=0 @@ -35616,10 +33346,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 @@ -35774,6 +33517,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); @@ -35827,11 +33575,176 @@ 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 + { 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' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + std::string s("hello"); + return s.length(); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (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_broken_libstdcxx_visibility=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_cc_broken_libstdcxx_visibility=yes +fi + +rm -f 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 + + 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="" @@ -35986,7 +33899,6 @@ EOF ;; *-*-cygwin* | *-*-mingw32* ) - WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL" ;; *-*-hpux* ) @@ -35997,6 +33909,8 @@ EOF esac fi + WXCONFIG_ONLY_CPPFLAGS="$WXCONFIG_ONLY_CPPFLAGS -DWXUSINGDLL" + if test $wxUSE_RPATH = "no"; then SAMPLES_RPATH_FLAG='' SAMPLES_RPATH_POSTLINK='' @@ -36039,7 +33953,7 @@ 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}" @@ -36181,157 +34095,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 @@ -36584,44 +34350,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; } @@ -37484,7 +35212,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 @@ -37578,6 +35307,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; } @@ -37627,7 +35362,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 @@ -37701,7 +35436,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 @@ -37777,7 +35512,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 @@ -37801,80 +35536,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 @@ -37962,128 +35623,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 - 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 +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 + 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; @@ -38103,15 +35672,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 @@ -38119,24 +35688,36 @@ 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 " case "${host}" in *-*-solaris2* ) - { echo "$as_me:$LINENO: checking for widec.h" >&5 -echo $ECHO_N "checking for widec.h... $ECHO_C" >&6; } -if test "${ac_cv_header_widec_h+set}" = set; then + +for ac_header in widec.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -38147,7 +35728,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -38166,19 +35747,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 - ac_cv_header_widec_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_widec_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_widec_h" >&5 -echo "${ECHO_T}$ac_cv_header_widec_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF +fi + +done if test "$ac_cv_header_widec_h" = "yes"; then wchar_headers="$wchar_headers @@ -38187,7 +35776,7 @@ echo "${ECHO_T}$ac_cv_header_widec_h" >&6; } 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; } @@ -38257,7 +35846,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 @@ -38319,90 +35908,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 @@ -38475,7 +35980,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 @@ -38564,7 +36069,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 @@ -38583,7 +36088,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$TOOLKIT" != "MSW"; then - +if test "$wxUSE_LIBICONV" != "no" ; then @@ -38795,7 +36300,8 @@ _ACEOF fi -LIBS="$LIBICONV $LIBS" + LIBS="$LIBICONV $LIBS" +fi if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then @@ -39139,7 +36645,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 @@ -39705,7 +37211,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 @@ -39794,14 +37301,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 putenv setenv +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 @@ -39890,10 +37396,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 @@ -40152,7 +37659,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 @@ -40246,7 +37753,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 @@ -40328,7 +37835,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 @@ -40411,7 +37918,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 @@ -40979,7 +38486,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 @@ -40990,6 +38497,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 @@ -41429,9 +39198,13 @@ _ACEOF fi - { echo "$as_me:$LINENO: checking for sched.h" >&5 -echo $ECHO_N "checking for sched.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sched_h+set}" = set; then + +for ac_header in sched.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -41442,7 +39215,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -41461,19 +39234,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 - ac_cv_header_sched_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_sched_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sched_h" >&5 -echo "${ECHO_T}$ac_cv_header_sched_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi +done if test "$ac_cv_header_sched_h" = "yes"; then { echo "$as_me:$LINENO: checking for sched_yield" >&5 @@ -42231,388 +40012,483 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_func_pthread_attr_setstacksize=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_pthread_attr_setstacksize=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_pthread_attr_setstacksize" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_attr_setstacksize" >&6; } -if test $ac_cv_func_pthread_attr_setstacksize = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 -_ACEOF - -fi - - - - { echo "$as_me:$LINENO: checking for pthread_mutexattr_t" >&5 -echo $ECHO_N "checking for pthread_mutexattr_t... $ECHO_C" >&6; } -if test "${wx_cv_type_pthread_mutexattr_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 -int -main () -{ - - pthread_mutexattr_t attr; - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - - ; - 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_type_pthread_mutexattr_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_type_pthread_mutexattr_t=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_type_pthread_mutexattr_t" >&5 -echo "${ECHO_T}$wx_cv_type_pthread_mutexattr_t" >&6; } - - if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_MUTEXATTR_T 1 -_ACEOF - - - { echo "$as_me:$LINENO: checking for pthread_mutexattr_settype declaration" >&5 -echo $ECHO_N "checking for pthread_mutexattr_settype declaration... $ECHO_C" >&6; } -if test "${wx_cv_func_pthread_mutexattr_settype_decl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ - - pthread_mutexattr_t attr; - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - - ; - 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_pthread_mutexattr_settype_decl=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_func_pthread_mutexattr_settype_decl=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_pthread_mutexattr_settype_decl" >&5 -echo "${ECHO_T}$wx_cv_func_pthread_mutexattr_settype_decl" >&6; } - if test "$wx_cv_func_pthread_mutexattr_settype_decl" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1 -_ACEOF - - fi - else - { echo "$as_me:$LINENO: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 -echo $ECHO_N "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... $ECHO_C" >&6; } -if test "${wx_cv_type_pthread_rec_mutex_init+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 () -{ - - pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; - - ; - 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_type_pthread_rec_mutex_init=yes - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - wx_cv_type_pthread_rec_mutex_init=no - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_type_pthread_rec_mutex_init" >&5 -echo "${ECHO_T}$wx_cv_type_pthread_rec_mutex_init" >&6; } - if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1 -_ACEOF - - else - { 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 - fi - -else - if test "$wxUSE_THREADS" = "yes" ; then - case "${host}" in - *-*-mingw32* ) - { echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5 -echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6; } -if test "${wx_cv_cflags_mthread+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - CFLAGS_OLD="$CFLAGS" - CFLAGS="-mthreads $CFLAGS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (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_cflags_mthread=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_cflags_mthread=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_cflags_mthread" >&5 -echo "${ECHO_T}$wx_cv_cflags_mthread" >&6; } - - if test "$wx_cv_cflags_mthread" = "yes"; then - WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads" - LDFLAGS="$LDFLAGS -mthreads" - else - CFLAGS="$CFLAGS_OLD" - fi - ;; - *-pc-os2*emx ) - WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__" - LDFLAGS="$LDFLAGS -Zmt" - ;; - esac - fi -fi - -{ echo "$as_me:$LINENO: checking for localtime_r" >&5 -echo $ECHO_N "checking for localtime_r... $ECHO_C" >&6; } -if test "${ac_cv_func_localtime_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 localtime_r to an innocuous variant, in case declares localtime_r. - For example, HP-UX 11i declares gettimeofday. */ -#define localtime_r innocuous_localtime_r - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char localtime_r (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef localtime_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 localtime_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_localtime_r || defined __stub___localtime_r -choke me -#endif - -int -main () -{ -return localtime_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_localtime_r=yes + ac_cv_func_pthread_attr_setstacksize=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_localtime_r=no + ac_cv_func_pthread_attr_setstacksize=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_localtime_r" >&5 -echo "${ECHO_T}$ac_cv_func_localtime_r" >&6; } -if test $ac_cv_func_localtime_r = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_LOCALTIME_R 1 +{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_attr_setstacksize" >&5 +echo "${ECHO_T}$ac_cv_func_pthread_attr_setstacksize" >&6; } +if test $ac_cv_func_pthread_attr_setstacksize = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 _ACEOF fi -{ echo "$as_me:$LINENO: checking for gmtime_r" >&5 -echo $ECHO_N "checking for gmtime_r... $ECHO_C" >&6; } -if test "${ac_cv_func_gmtime_r+set}" = set; then + + + { echo "$as_me:$LINENO: checking for pthread_mutexattr_t" >&5 +echo $ECHO_N "checking for pthread_mutexattr_t... $ECHO_C" >&6; } +if test "${wx_cv_type_pthread_mutexattr_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 +int +main () +{ + + pthread_mutexattr_t attr; + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + + ; + 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_type_pthread_mutexattr_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_type_pthread_mutexattr_t=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_type_pthread_mutexattr_t" >&5 +echo "${ECHO_T}$wx_cv_type_pthread_mutexattr_t" >&6; } + + if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_PTHREAD_MUTEXATTR_T 1 +_ACEOF + + + { echo "$as_me:$LINENO: checking for pthread_mutexattr_settype declaration" >&5 +echo $ECHO_N "checking for pthread_mutexattr_settype declaration... $ECHO_C" >&6; } +if test "${wx_cv_func_pthread_mutexattr_settype_decl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + + pthread_mutexattr_t attr; + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + + ; + 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_pthread_mutexattr_settype_decl=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_func_pthread_mutexattr_settype_decl=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_func_pthread_mutexattr_settype_decl" >&5 +echo "${ECHO_T}$wx_cv_func_pthread_mutexattr_settype_decl" >&6; } + if test "$wx_cv_func_pthread_mutexattr_settype_decl" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1 +_ACEOF + + fi + else + { echo "$as_me:$LINENO: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 +echo $ECHO_N "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... $ECHO_C" >&6; } +if test "${wx_cv_type_pthread_rec_mutex_init+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 () +{ + + pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; + + ; + 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_type_pthread_rec_mutex_init=yes + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + wx_cv_type_pthread_rec_mutex_init=no + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_type_pthread_rec_mutex_init" >&5 +echo "${ECHO_T}$wx_cv_type_pthread_rec_mutex_init" >&6; } + if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1 +_ACEOF + + else + { 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; } +if test "${wx_cv_cflags_mthread+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + CFLAGS_OLD="$CFLAGS" + CFLAGS="-mthreads $CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (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_cflags_mthread=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_cflags_mthread=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_cflags_mthread" >&5 +echo "${ECHO_T}$wx_cv_cflags_mthread" >&6; } + + if test "$wx_cv_cflags_mthread" = "yes"; then + WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -mthreads" + LDFLAGS="$LDFLAGS -mthreads" + else + CFLAGS="$CFLAGS_OLD" + fi + ;; + *-pc-os2*emx ) + WXCONFIG_CFLAGS="$WXCONFIG_CFLAGS -Zmt -D__ST_MT_ERRNO__" + LDFLAGS="$LDFLAGS -Zmt" + ;; + esac + fi +fi + +{ echo "$as_me:$LINENO: checking for localtime_r" >&5 +echo $ECHO_N "checking for localtime_r... $ECHO_C" >&6; } +if test "${ac_cv_func_localtime_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -42621,12 +40497,12 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define gmtime_r to an innocuous variant, in case declares gmtime_r. +/* Define localtime_r to an innocuous variant, in case declares localtime_r. For example, HP-UX 11i declares gettimeofday. */ -#define gmtime_r innocuous_gmtime_r +#define localtime_r innocuous_localtime_r /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gmtime_r (); below. + which can conflict with char localtime_r (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -42636,7 +40512,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif -#undef gmtime_r +#undef localtime_r /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -42644,18 +40520,18 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char gmtime_r (); +char localtime_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_gmtime_r || defined __stub___gmtime_r +#if defined __stub_localtime_r || defined __stub___localtime_r choke me #endif int main () { -return gmtime_r (); +return localtime_r (); ; return 0; } @@ -42678,29 +40554,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_func_gmtime_r=yes + ac_cv_func_localtime_r=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_gmtime_r=no + ac_cv_func_localtime_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_gmtime_r" >&5 -echo "${ECHO_T}$ac_cv_func_gmtime_r" >&6; } -if test $ac_cv_func_gmtime_r = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_localtime_r" >&5 +echo "${ECHO_T}$ac_cv_func_localtime_r" >&6; } +if test $ac_cv_func_localtime_r = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_GMTIME_R 1 +#define HAVE_LOCALTIME_R 1 _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 "$as_me:$LINENO: checking for gmtime_r" >&5 +echo $ECHO_N "checking for gmtime_r... $ECHO_C" >&6; } +if test "${ac_cv_func_gmtime_r+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -42709,12 +40585,12 @@ _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. +/* Define gmtime_r to an innocuous variant, in case declares gmtime_r. For example, HP-UX 11i declares gettimeofday. */ -#define readdir_r innocuous_readdir_r +#define gmtime_r innocuous_gmtime_r /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char readdir_r (); below. + which can conflict with char gmtime_r (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -42724,7 +40600,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif -#undef readdir_r +#undef gmtime_r /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -42732,18 +40608,18 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char readdir_r (); +char gmtime_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 +#if defined __stub_gmtime_r || defined __stub___gmtime_r choke me #endif int main () { -return readdir_r (); +return gmtime_r (); ; return 0; } @@ -42766,22 +40642,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_func_readdir_r=yes + ac_cv_func_gmtime_r=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_readdir_r=no + ac_cv_func_gmtime_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 +{ echo "$as_me:$LINENO: result: $ac_cv_func_gmtime_r" >&5 +echo "${ECHO_T}$ac_cv_func_gmtime_r" >&6; } +if test $ac_cv_func_gmtime_r = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_READDIR_R 1 +#define HAVE_GMTIME_R 1 _ACEOF fi @@ -43497,9 +41373,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 @@ -43529,7 +41405,6 @@ fi DEBUG_CFLAGS= if test "$wxUSE_DEBUG_INFO" = "yes" ; then DEBUG_CFLAGS="-g" - wxUSE_OPTIMISE=no fi if test "$wxUSE_DEBUG_GDB" = "yes" ; then @@ -43659,9 +41534,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 @@ -44014,7 +41887,7 @@ fi done - if test "$HAVE_DL_FUNCS" = 1; then + if test "$HAVE_DL_FUNCS" = 1; then for ac_func in dlerror do @@ -44111,7 +41984,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 @@ -44184,7 +42057,11 @@ fi fi done + fi fi + + if test "$USE_DARWIN" = 1; then + HAVE_DL_FUNCS=1 fi if test "$HAVE_DL_FUNCS" = 0; then @@ -44271,7 +42148,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; } @@ -44399,7 +42276,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. @@ -44736,7 +42613,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 @@ -44859,6 +42736,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 @@ -45266,7 +43234,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 @@ -45366,6 +43334,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 @@ -45439,6 +43478,308 @@ _ACEOF fi +if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_CONSOLE_EVENTLOOP 1 +_ACEOF + + + if test "$wxUSE_UNIX" = "yes"; then + if test "$wxUSE_SELECT_DISPATCHER" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_SELECT_DISPATCHER 1 +_ACEOF + + fi + + if test "$wxUSE_EPOLL_DISPATCHER" = "yes"; then + +for ac_header in sys/epoll.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_sys_epoll_h" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_EPOLL_DISPATCHER 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5 +echo "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;} + fi + fi + fi +fi + + + + +for ac_func in gettimeofday ftime +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +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 + break +fi +done + + +if test "$ac_cv_func_gettimeofday" = "yes"; then + { echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5 +echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6; } +if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* 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, NULL); + + ; + 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=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; } @@ -46022,227 +44363,12 @@ _ACEOF fi - - -for ac_func in gettimeofday ftime -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -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 - break -fi -done - - - if test "$ac_cv_func_gettimeofday" = "yes"; then - { echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5 -echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6; } -if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* 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, NULL); - - ; - 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=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 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" 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" @@ -46561,76 +44687,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; @@ -46653,71 +44866,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; @@ -46737,53 +44952,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 @@ -46866,7 +45064,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; } @@ -46931,10 +45129,14 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; } fi else - if test "$wxUSE_MGL" != "1"; then - { echo "$as_me:$LINENO: checking for linux/joystick.h" >&5 -echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_joystick_h+set}" = set; then + if test "$wxUSE_MGL" != 1; then + +for ac_header in linux/joystick.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -46945,7 +45147,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -46964,22 +45166,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 - ac_cv_header_linux_joystick_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_linux_joystick_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; } -if test $ac_cv_header_linux_joystick_h = yes; then - wxUSE_JOYSTICK=yes +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + wxUSE_JOYSTICK=yes fi +done fi fi @@ -46998,6 +45205,13 @@ fi +if test "$wxUSE_FONTENUM" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FONTENUM 1 +_ACEOF + +fi + if test "$wxUSE_FONTMAP" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_FONTMAP 1 @@ -47105,13 +45319,6 @@ _ACEOF fi fi -if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_EXPERIMENTAL_PRINTF 1 -_ACEOF - -fi - if test "$wxUSE_CONSTRAINTS" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -47142,9 +45349,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 @@ -47178,15 +45382,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 @@ -47202,11 +45401,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define wxUSE_NORMALIZED_PS_FONTS 1 -_ACEOF - - if test "$wxUSE_SVG" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SVG 1 @@ -47449,6 +45643,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 @@ -47575,7 +45773,6 @@ if test "$wxUSE_CHECKLST" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then @@ -47602,6 +45799,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 @@ -47628,7 +45833,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 @@ -47702,7 +45907,6 @@ if test "$wxUSE_LISTBOX" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox" fi if test "$wxUSE_LISTCTRL" = "yes"; then @@ -47737,6 +45941,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 @@ -47746,7 +45957,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo" fi - if test "$wxUSE_RADIOBOX" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_RADIOBOX 1 @@ -47777,7 +45987,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 @@ -47866,13 +46076,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 @@ -47880,6 +46083,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 @@ -47966,7 +46178,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 @@ -48026,13 +46238,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" fi -if test "$wxUSE_DC_CACHEING" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_DC_CACHEING 1 -_ACEOF - -fi - if test "$wxUSE_DRAGIMAGE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_DRAGIMAGE 1 @@ -48062,9 +46267,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 @@ -48143,6 +46345,9 @@ _ACEOF else wxUSE_WEBKIT=no fi + if test "$wxUSE_WEBKIT" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl" + fi fi USE_XRC=0 @@ -48171,6 +46376,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 @@ -48208,7 +46423,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 @@ -48216,10 +46430,14 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then #define wxUSE_SYSTEM_OPTIONS 1 _ACEOF - if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \ - "$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" - fi +fi + +if test "$wxUSE_TASKBARICON" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TASKBARICON 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" fi @@ -48385,15 +46603,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 @@ -48405,15 +46618,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 @@ -48432,8 +46640,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 +#define wxUSE_DC_CACHEING 1 +_ACEOF + + fi + + if test "$wxUSE_DIB" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WXDIB 1 +_ACEOF + + fi + + if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 +_ACEOF + + fi + + if test "$wxUSE_UXTHEME" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UXTHEME 1 +_ACEOF + + fi + +fi + +if test "$wxUSE_AUTOID_MANAGEMENT" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_AUTOID_MANAGEMENT 1 +_ACEOF + +fi + +if test "$USE_WIN32" = 1 ; then + if test "$wxUSE_INICONF" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_INICONF 1 +_ACEOF + + fi + + if test "$wxUSE_REGKEY" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_REGKEY 1 +_ACEOF + + fi +fi + + +if test "$wxUSE_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 @@ -48526,7 +46804,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 @@ -48705,7 +46983,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 @@ -48722,6 +47000,15 @@ _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 @@ -48755,15 +47042,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" @@ -48777,9 +47061,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" @@ -48793,6 +47074,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 @@ -48813,14 +47100,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 @@ -48839,9 +47122,9 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ - dynamic erase event exec font image minimal mobile \ - mobile/wxedit mobile/styles propsize render \ - rotate shaped svg taborder vscroll widgets" + erase event exec font image minimal mobile \ + mobile/wxedit mobile/styles render \ + shaped svg taborder vscroll widgets" if test "$wxUSE_MONOLITHIC" != "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" @@ -48857,19 +47140,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 @@ -48885,6 +47263,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` @@ -48900,7 +47280,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` @@ -48919,9 +47299,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 @@ -48952,7 +47329,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 @@ -48970,7 +47347,6 @@ fi - if test $wxUSE_MONOLITHIC = "yes" ; then MONOLITHIC=1 else @@ -48983,12 +47359,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 @@ -49026,7 +47396,21 @@ 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 @@ -49038,8 +47422,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 @@ -49069,23 +47456,6 @@ if test "$wxUSE_WINE" = "yes"; then BAKEFILE_FORCE_PLATFORM=win32 fi -if test "$wxUSE_MAC" = 1 ; then - if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then - if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then - OSX_UNIV_OPTS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk" - else - OSX_UNIV_OPTS=${wxUSE_UNIVERSAL_BINARY:+"-isysroot '$wxUSE_UNIVERSAL_BINARY'"} - fi - OSX_UNIV_OPTS="$OSX_UNIV_OPTS -arch ppc -arch i386" - CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS" - CFLAGS="$OSX_UNIV_OPTS $CFLAGS" - LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS" - bk_use_pch=no - fi - # TODO: where do we add "-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" for libtool (static builds only)? - # The makefile currently uses AR and RANLIB, which libtool apparently supercedes. -fi - if test "$wxUSE_UNICODE" = yes -a "$GCC" = yes -a "$bk_use_pch" != no then { echo "$as_me:$LINENO: checking for gcc precompiled header bug" >&5 @@ -49136,6 +47506,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 @@ -49670,14 +48043,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= @@ -49833,6 +48212,8 @@ fi dlldir="$libdir" case "${BAKEFILE_HOST}" in + ia64-hp-hpux* ) + ;; *-hp-hpux* ) SO_SUFFIX="sl" SO_SUFFIX_MODULE="sl" @@ -49914,7 +48295,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" @@ -49950,6 +48331,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 @@ -49963,6 +48348,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" @@ -50002,9 +48393,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}? # @@ -50013,9 +48404,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 @@ -50030,7 +48421,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 @@ -50713,7 +49104,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 @@ -50818,24 +49210,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 ) @@ -50850,24 +49238,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 @@ -50887,8 +49288,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. @@ -50909,8 +49317,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}? @@ -51111,10 +49526,13 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" + + BAKEFILE_BAKEFILE_M4_VERSION="0.2.5" + + +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.5" @@ -51194,59 +49612,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 @@ -51258,7 +49638,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. @@ -51268,6 +49648,8 @@ header="${D}{2}" shift shift +builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\` + compiler="" headerfile="" @@ -51280,7 +49662,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 ;; @@ -51299,8 +49681,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}" @@ -51312,7 +49694,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 @@ -51330,6 +49712,8 @@ EOF + + COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then COND_BUILD_DEBUG="" @@ -51375,6 +49759,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="" @@ -51440,19 +49869,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="#" @@ -51495,19 +49919,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="#" @@ -51540,11 +49959,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="" @@ -51555,9 +49969,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="#" @@ -51620,39 +50034,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="#" @@ -51660,6 +50064,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="" @@ -51670,6 +50079,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="" @@ -51755,19 +50169,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="#" @@ -51775,29 +50189,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="#" @@ -51810,11 +50214,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_="" @@ -51890,16 +50289,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="" @@ -51945,6 +50334,41 @@ 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_CARBON_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="" + fi + + COND_TOOLKIT_OSX_COCOA="#" + if test "x$TOOLKIT" = "xOSX_COCOA" ; then + COND_TOOLKIT_OSX_COCOA="" + 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_COCOA_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="" + fi + + COND_TOOLKIT_OSX_IPHONE="#" + if test "x$TOOLKIT" = "xOSX_IPHONE" ; then + COND_TOOLKIT_OSX_IPHONE="" + fi + COND_TOOLKIT_PM="#" if test "x$TOOLKIT" = "xPM" ; then COND_TOOLKIT_PM="" @@ -52045,9 +50469,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="#" @@ -52160,11 +50594,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="" @@ -52175,6 +50604,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 @@ -52190,6 +50649,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 @@ -52201,7 +50754,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 @@ -52214,10 +50771,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" @@ -52226,10 +50779,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 @@ -52246,7 +50795,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//'` @@ -52264,6 +50813,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'`" @@ -52324,7 +50875,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 @@ -52375,6 +50925,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" @@ -52389,7 +50942,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 @@ -52522,34 +51076,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 @@ -53137,6 +51697,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" ;; @@ -53266,16 +51827,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 @@ -53296,10 +51848,19 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -53341,15 +51902,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 @@ -53361,7 +51913,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 @@ -53376,11 +51927,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 @@ -53395,12 +51948,19 @@ SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$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 @@ -53433,11 +51993,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 @@ -53479,6 +52040,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 @@ -53486,6 +52052,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 @@ -53499,9 +52074,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 @@ -53510,19 +52084,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 @@ -53535,16 +52107,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 @@ -53562,20 +52134,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 @@ -53617,6 +52178,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 @@ -53630,8 +52199,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 @@ -53641,6 +52208,13 @@ 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_CARBON_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim +COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim +COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim +COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim +COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim COND_TOOLKIT_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 @@ -53661,7 +52235,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 @@ -53684,36 +52260,21 @@ 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 USE_GUI!$USE_GUI$ac_delim AFMINSTALL!$AFMINSTALL$ac_delim WIN32INSTALL!$WIN32INSTALL$ac_delim -TOOLKIT!$TOOLKIT$ac_delim -TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim -TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim -TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim -cross_compiling!$cross_compiling$ac_delim -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 @@ -53755,6 +52316,26 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 +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 @@ -53769,12 +52350,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` = 38; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -54183,6 +52765,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 ;; @@ -54407,7 +52990,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)" @@ -54423,6 +53006,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 " jpeg ${wxUSE_LIBJPEG-none}" echo " png ${wxUSE_LIBPNG-none}" echo " regex ${wxUSE_REGEX}" @@ -54431,7 +53015,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}"