X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a48b659563cbb93db2affb995fb4e0711df16d21..a19e936e75653d1c5614b2c0423947c366b02a5b:/configure diff --git a/configure b/configure index 1f80a10f05..6dd327d017 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in. +# From configure.in Id: configure.in 48824 2007-09-20 00:01:33Z VZ . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -679,17 +679,7 @@ EGREP CXX CXXFLAGS ac_ct_CXX -RANLIB AR -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -STRIP -WINDRES -DLLTOOL -IF_GNU_MAKE -LN_S -CXXCPP subdirs PKG_CONFIG GTK_CFLAGS @@ -708,14 +698,14 @@ PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS -REZ -DEREZ -SETFILE +CFLAGS_VISIBILITY +CXXFLAGS_VISIBILITY LIBICONV -EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS +GTKPRINT_CFLAGS +GTKPRINT_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS @@ -726,8 +716,10 @@ CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS GST_LIBS -CORE_BASE_LIBS -CORE_GUI_LIBS +ALL_WX_LIBS +BUILT_WX_LIBS +STD_BASE_LIBS +STD_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT @@ -742,6 +734,7 @@ WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS +CXXWARNINGS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML @@ -750,6 +743,7 @@ EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL +EXTRALIBS_GTKPRINT EXTRALIBS_GNOMEPRINT EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON @@ -764,12 +758,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 @@ -802,6 +803,9 @@ USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING BK_DEPS +WINDRES +REZ +SETFILE GCC_PCH ICC_PCH BK_MAKE_PCH @@ -831,6 +835,7 @@ 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_RICHTEXT_1 +COND_MONOLITHIC_0_SHARED_0_USE_STC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_AUI_1 @@ -841,9 +846,19 @@ 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_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_QA_1 +COND_MONOLITHIC_0_USE_RICHTEXT_1 +COND_MONOLITHIC_0_USE_STC_1 +COND_MONOLITHIC_0_USE_XRC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 @@ -882,6 +897,7 @@ 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_STC_1 COND_SHARED_0_USE_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN @@ -930,6 +946,7 @@ COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 +COND_USE_GUI_1_USE_OPENGL_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN @@ -946,6 +963,7 @@ COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 +COND_USE_STC_1 COND_USE_THREADS_0 COND_USE_THREADS_1 COND_USE_XRC_1 @@ -960,6 +978,7 @@ COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN +DEREZ SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI @@ -1001,6 +1020,7 @@ LIBWXMACRES POSTLINK_COMMAND MACSETFILE GCC +DLLTOOL CPPUNIT_CONFIG LIBOBJS LTLIBOBJS' @@ -1017,7 +1037,6 @@ CPP CXX CXXFLAGS CCC -CXXCPP PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS @@ -1028,6 +1047,8 @@ PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS +GTKPRINT_CFLAGS +GTKPRINT_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS @@ -1038,7 +1059,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= @@ -1617,17 +1639,27 @@ if test -n "$ac_init_help"; then Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-gui use GUI classes + --disable-gui don't build GUI parts of the library --enable-monolithic build wxWidgets as single library --enable-plugins build parts of wxWidgets as loadable components + --enable-official_build official build of wxWidgets (win32 DLL only) + --enable-vendor=VENDOR vendor name (win32 DLL only) + --disable-all-features disable all optional features to build minimal library --enable-universal use wxWidgets GUI controls instead of native ones --enable-nanox use NanoX --disable-gtk2 use GTK+ 1.2 instead of 2.0 --enable-gpe use GNOME PDA Environment features if possible - --enable-shared create shared library code - --enable-optimise create optimised code + --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 + --enable-std_string use standard C++ string classes + --disable-unicode compile without Unicode support + --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only) + --enable-utf8 use UTF-8 representation for strings (Unix only) + --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only) + --enable-extended_rtti use extended RTTI (XTI) --enable-omf use OMF object format --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!) --enable-debug_info create code with debugging information @@ -1640,10 +1672,12 @@ 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-config use wxConfig (and derived) classes --enable-protocols use wxProtocol and derived classes @@ -1654,8 +1688,12 @@ Optional Features: --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 --enable-backtrace use wxStackWalker class for getting backtraces --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only) --enable-cmdline use wxCmdLineParser class @@ -1668,6 +1706,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 @@ -1676,10 +1715,7 @@ Optional Features: --enable-log use logging system --enable-longlong use wxLongLong class --enable-mimetype use wxMimeTypesManager - --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only) --enable-snglinst use wxSingleInstanceChecker class - --enable-std_iostreams use standard C++ stream classes - --enable-std_string use standard C++ string classes --enable-stdpaths use wxStandardPaths class --enable-stopwatch use wxStopWatch class --enable-streams use wxStream etc classes @@ -1688,7 +1724,6 @@ Optional Features: --enable-textbuf use wxTextBuffer class --enable-textfile use wxTextFile class --enable-timer use wxTimer class - --enable-unicode compile wxString with Unicode support --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 @@ -1701,6 +1736,8 @@ Optional Features: --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) @@ -1708,6 +1745,7 @@ Optional Features: --enable-htmlhelp use wxHTML-based help --enable-xrc use XRC resources sub-library --enable-aui use AUI docking library + --enable-stc use wxStyledTextCtrl library --enable-constraints use layout-constraints system --enable-printarch use printing architecture --enable-mdi use multiple document interface architecture @@ -1719,12 +1757,11 @@ Optional Features: --enable-richtext use wxRichTextCtrl --enable-graphics_ctx use graphics context 2D drawing API --enable-postscript use wxPostscriptDC device context (default for gtk+) - --enable-prologio not available; see contrib - --enable-resources not available; see contrib + --enable-svg use wxSVGFileDC device context --enable-clipboard use wxClipboard class --enable-dnd use Drag'n'Drop classes --enable-metafile use win32 metafiles - --enable-controls use all usual controls + --disable-controls disable compilation of all standard controls --enable-accel use accelerators --enable-animatectrl use wxAnimationCtrl class --enable-button use wxButton class @@ -1744,7 +1781,9 @@ Optional Features: --enable-dirpicker use wxDirPickerCtrl class --enable-display use wxDisplay class --enable-detect_sm use code to detect X11 session manager + --enable-editablebox use wxEditableListBox class --enable-filepicker use wxFilePickerCtrl class + --enable-filectrl use wxFileCtrl class --enable-fontpicker use wxFontPickerCtrl class --enable-gauge use wxGauge class --enable-grid use wxGrid class @@ -1771,6 +1810,7 @@ Optional Features: --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 @@ -1806,7 +1846,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) @@ -1816,8 +1855,11 @@ Optional Features: --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-official_build official build of wxWidgets (win32 DLL only) - --enable-vendor=VENDOR vendor name (win32 DLL only) + --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 only) + --enable-uxtheme enable support for Windows XP themed look (Win32 only) + --enable-wxdib use wxDIB class (Win32 only) --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 @@ -1833,6 +1875,8 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-subdirs don't generate makefiles for samples/demos/... + --with-flavour=NAME specify a name to identify this build + --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 @@ -1849,18 +1893,19 @@ Optional Packages: --with-libtiff use libtiff (TIFF file format) --with-libxpm use libxpm (XPM file format) --with-libmspack use libmspack (CHM help files loading) - --with-sdl use SDL for audio on Unix - --with-gnomeprint use GNOME print for printing under GNOME + --without-gtkprint don't use GTK printing support + --without-gnomeprint don't use GNOME printing libraries --with-gnomevfs use GNOME VFS for associating MIME types --with-hildon use Hildon framework for Nokia 770 --with-opengl use OpenGL (or Mesa) - --with-themes=all|list use only the specified comma-separated list of wxUniversal themes --with-dmalloc use dmalloc library (http://dmalloc.com/) + --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-flavour=NAME specify a name to identify this build + --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 @@ -1881,7 +1926,6 @@ Some influential environment variables: CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor PKG_CONFIG path to pkg-config utility DIRECTFB_CFLAGS C compiler flags for DIRECTFB, overriding pkg-config @@ -1899,6 +1943,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 @@ -2887,460 +2935,35 @@ esac touch ${wx_arg_cache_file} -DEBUG_CONFIGURE=0 -if test $DEBUG_CONFIGURE = 1; then - DEFAULT_wxUSE_UNIVERSAL=no - DEFAULT_wxUSE_STL=no - - DEFAULT_wxUSE_NANOX=no - - DEFAULT_wxUSE_THREADS=yes - - DEFAULT_wxUSE_SHARED=${DEFAULT_wxUSE_SHARED:-yes} - DEFAULT_wxUSE_OPTIMISE=no - DEFAULT_wxUSE_PROFILE=no - DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_VARARG_MACROS=no - DEFAULT_wxUSE_NO_RTTI=no - DEFAULT_wxUSE_NO_EXCEPTIONS=no - DEFAULT_wxUSE_UNIVERSAL_BINARY=no - DEFAULT_wxUSE_RPATH=yes - DEFAULT_wxUSE_PERMISSIVE=no - DEFAULT_wxUSE_DEBUG_FLAG=yes - DEFAULT_wxUSE_DEBUG_INFO=yes - DEFAULT_wxUSE_DEBUG_GDB=yes - DEFAULT_wxUSE_MEM_TRACING=no - DEFAULT_wxUSE_DEBUG_CONTEXT=no - DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_APPLE_IEEE=no - - DEFAULT_wxUSE_EXCEPTIONS=no - DEFAULT_wxUSE_LOG=yes - DEFAULT_wxUSE_LOGWINDOW=no - DEFAULT_wxUSE_LOGGUI=no - DEFAULT_wxUSE_LOGDIALOG=no - - DEFAULT_wxUSE_GUI=yes - DEFAULT_wxUSE_CONTROLS=no - - DEFAULT_wxUSE_REGEX=no - DEFAULT_wxUSE_XML=no - DEFAULT_wxUSE_EXPAT=no - DEFAULT_wxUSE_ZLIB=no - DEFAULT_wxUSE_LIBPNG=no - DEFAULT_wxUSE_LIBJPEG=no - DEFAULT_wxUSE_LIBTIFF=no - DEFAULT_wxUSE_LIBXPM=no - DEFAULT_wxUSE_LIBMSPACK=no - DEFAULT_wxUSE_LIBSDL=no - DEFAULT_wxUSE_LIBGNOMEPRINT=no - DEFAULT_wxUSE_LIBGNOMEVFS=no - DEFAULT_wxUSE_LIBHILDON=no - DEFAULT_wxUSE_ODBC=no - DEFAULT_wxUSE_OPENGL=no - - DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no - DEFAULT_wxUSE_STACKWALKER=no - DEFAULT_wxUSE_DEBUGREPORT=no - DEFAULT_wxUSE_SNGLINST_CHECKER=no - DEFAULT_wxUSE_STD_IOSTREAM=no - DEFAULT_wxUSE_STD_STRING=no - DEFAULT_wxUSE_CMDLINE_PARSER=no - DEFAULT_wxUSE_DATETIME=no - DEFAULT_wxUSE_TIMER=no - DEFAULT_wxUSE_STOPWATCH=no - DEFAULT_wxUSE_FILE=no - DEFAULT_wxUSE_FFILE=no - DEFAULT_wxUSE_STDPATHS=no - DEFAULT_wxUSE_TEXTBUFFER=no - DEFAULT_wxUSE_TEXTFILE=no - DEFAULT_wxUSE_SOUND=no - DEFAULT_wxUSE_MEDIACTRL=no - DEFAULT_wxUSE_GSTREAMER8=no - DEFAULT_wxUSE_PRINTF_POS_PARAMS=no - DEFAULT_wxUSE_INTL=no - DEFAULT_wxUSE_CONFIG=no - DEFAULT_wxUSE_FONTMAP=no - DEFAULT_wxUSE_STREAMS=no - DEFAULT_wxUSE_SOCKETS=no - DEFAULT_wxUSE_OLE=no - DEFAULT_wxUSE_DATAOBJ=no - DEFAULT_wxUSE_DIALUP_MANAGER=no - DEFAULT_wxUSE_JOYSTICK=no - DEFAULT_wxUSE_DYNLIB_CLASS=no - DEFAULT_wxUSE_DYNAMIC_LOADER=no - DEFAULT_wxUSE_LONGLONG=no - DEFAULT_wxUSE_GEOMETRY=no - - DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no - DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no - DEFAULT_wxUSE_POSTSCRIPT=no - - DEFAULT_wxUSE_CLIPBOARD=no - DEFAULT_wxUSE_TOOLTIPS=no - DEFAULT_wxUSE_DRAG_AND_DROP=no - DEFAULT_wxUSE_DRAGIMAGE=no - DEFAULT_wxUSE_SPLINES=no - DEFAULT_wxUSE_MOUSEWHEEL=no - - DEFAULT_wxUSE_MDI=no - DEFAULT_wxUSE_MDI_ARCHITECTURE=no - DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no - DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no - - DEFAULT_wxUSE_RESOURCES=no - DEFAULT_wxUSE_CONSTRAINTS=no - DEFAULT_wxUSE_IPC=no - DEFAULT_wxUSE_HELP=no - DEFAULT_wxUSE_MS_HTML_HELP=no - DEFAULT_wxUSE_WXHTML_HELP=no - DEFAULT_wxUSE_TREELAYOUT=no - DEFAULT_wxUSE_METAFILE=no - DEFAULT_wxUSE_MIMETYPE=no - DEFAULT_wxUSE_SYSTEM_OPTIONS=no - DEFAULT_wxUSE_PROTOCOL=no - DEFAULT_wxUSE_PROTOCOL_HTTP=no - DEFAULT_wxUSE_PROTOCOL_FTP=no - DEFAULT_wxUSE_PROTOCOL_FILE=no - DEFAULT_wxUSE_URL=no - DEFAULT_wxUSE_VARIANT=no - - DEFAULT_wxUSE_ABOUTDLG=no - DEFAULT_wxUSE_COMMONDLGS=no - DEFAULT_wxUSE_CHOICEDLG=no - DEFAULT_wxUSE_COLOURDLG=no - DEFAULT_wxUSE_DIRDLG=no - DEFAULT_wxUSE_FILEDLG=no - DEFAULT_wxUSE_FINDREPLDLG=no - DEFAULT_wxUSE_FONTDLG=no - DEFAULT_wxUSE_MSGDLG=no - DEFAULT_wxUSE_NUMBERDLG=no - DEFAULT_wxUSE_TEXTDLG=no - DEFAULT_wxUSE_SPLASH=no - DEFAULT_wxUSE_STARTUP_TIPS=no - DEFAULT_wxUSE_PROGRESSDLG=no - DEFAULT_wxUSE_WIZARDDLG=no - - DEFAULT_wxUSE_MENUS=no - DEFAULT_wxUSE_MINIFRAME=no - DEFAULT_wxUSE_HTML=no - DEFAULT_wxUSE_RICHTEXT=no - DEFAULT_wxUSE_XRC=no - DEFAULT_wxUSE_AUI=no - DEFAULT_wxUSE_WEBKIT=no - DEFAULT_wxUSE_FILESYSTEM=no - DEFAULT_wxUSE_FS_INET=no - DEFAULT_wxUSE_FS_ZIP=no - DEFAULT_wxUSE_FS_ARCHIVE=no - DEFAULT_wxUSE_BUSYINFO=no - DEFAULT_wxUSE_ARCHIVE_STREAMS=no - DEFAULT_wxUSE_ZIPSTREAM=no - DEFAULT_wxUSE_TARSTREAM=no - DEFAULT_wxUSE_VALIDATORS=no - - DEFAULT_wxUSE_ACCEL=no - DEFAULT_wxUSE_ANIMATIONCTRL=no - DEFAULT_wxUSE_BUTTON=no - DEFAULT_wxUSE_BMPBUTTON=no - DEFAULT_wxUSE_BITMAPCOMBOBOX=no - DEFAULT_wxUSE_CALCTRL=no - DEFAULT_wxUSE_CARET=no - DEFAULT_wxUSE_CHECKBOX=no - DEFAULT_wxUSE_CHECKLST=no - DEFAULT_wxUSE_CHOICE=no - DEFAULT_wxUSE_CHOICEBOOK=no - DEFAULT_wxUSE_COLLPANE=no - DEFAULT_wxUSE_COLOURPICKERCTRL=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_COMBOCTRL=no - DEFAULT_wxUSE_DATEPICKCTRL=no - DEFAULT_wxUSE_DISPLAY=no - DEFAULT_wxUSE_DETECT_SM=no - DEFAULT_wxUSE_DIRPICKERCTRL=no - DEFAULT_wxUSE_FILEPICKERCTRL=no - DEFAULT_wxUSE_FONTPICKERCTRL=no - DEFAULT_wxUSE_GAUGE=no - DEFAULT_wxUSE_GRAPHICS_CONTEXT=no - DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_HYPERLINKCTRL=no - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=no - DEFAULT_wxUSE_LISTBOOK=no - DEFAULT_wxUSE_LISTBOX=no - DEFAULT_wxUSE_LISTCTRL=no - DEFAULT_wxUSE_NOTEBOOK=no - DEFAULT_wxUSE_ODCOMBOBOX=no - DEFAULT_wxUSE_RADIOBOX=no - DEFAULT_wxUSE_RADIOBTN=no - DEFAULT_wxUSE_SASH=no - DEFAULT_wxUSE_SCROLLBAR=no - DEFAULT_wxUSE_SEARCHCTRL=no - DEFAULT_wxUSE_SLIDER=no - DEFAULT_wxUSE_SPINBTN=no - DEFAULT_wxUSE_SPINCTRL=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_STATBMP=no - DEFAULT_wxUSE_STATBOX=no - DEFAULT_wxUSE_STATLINE=no - DEFAULT_wxUSE_STATTEXT=no - DEFAULT_wxUSE_STATUSBAR=yes - DEFAULT_wxUSE_TAB_DIALOG=no - DEFAULT_wxUSE_TEXTCTRL=no - DEFAULT_wxUSE_TOGGLEBTN=no - DEFAULT_wxUSE_TOOLBAR=no - DEFAULT_wxUSE_TOOLBAR_NATIVE=no - DEFAULT_wxUSE_TREEBOOK=no - DEFAULT_wxUSE_TOOLBOOK=no - DEFAULT_wxUSE_TREECTRL=no - DEFAULT_wxUSE_POPUPWIN=no - DEFAULT_wxUSE_TIPWINDOW=no +DEFAULT_wxUSE_ALL_FEATURES=yes - DEFAULT_wxUSE_UNICODE=no - DEFAULT_wxUSE_UNICODE_MSLU=no - DEFAULT_wxUSE_WCSRTOMBS=no - - DEFAULT_wxUSE_PALETTE=no - DEFAULT_wxUSE_IMAGE=no - DEFAULT_wxUSE_GIF=no - DEFAULT_wxUSE_PCX=no - DEFAULT_wxUSE_TGA=no - DEFAULT_wxUSE_PNM=no - DEFAULT_wxUSE_IFF=no - DEFAULT_wxUSE_XPM=no - DEFAULT_wxUSE_ICO_CUR=no - DEFAULT_wxUSE_ACCESSIBILITY=no - - DEFAULT_wxUSE_MONOLITHIC=no - DEFAULT_wxUSE_PLUGINS=no - DEFAULT_wxUSE_OFFICIAL_BUILD=no -else - DEFAULT_wxUSE_UNIVERSAL=no - DEFAULT_wxUSE_STL=no - - DEFAULT_wxUSE_NANOX=no - - DEFAULT_wxUSE_THREADS=yes - - DEFAULT_wxUSE_SHARED=${DEFAULT_wxUSE_SHARED:-yes} - DEFAULT_wxUSE_OPTIMISE=yes - DEFAULT_wxUSE_PROFILE=no - DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_VARARG_MACROS=yes - DEFAULT_wxUSE_NO_RTTI=no - DEFAULT_wxUSE_NO_EXCEPTIONS=no - DEFAULT_wxUSE_UNIVERSAL_BINARY=no - DEFAULT_wxUSE_RPATH=yes - DEFAULT_wxUSE_PERMISSIVE=no - DEFAULT_wxUSE_DEBUG_FLAG=no - DEFAULT_wxUSE_DEBUG_INFO=no - DEFAULT_wxUSE_DEBUG_GDB=no - DEFAULT_wxUSE_MEM_TRACING=no - DEFAULT_wxUSE_DEBUG_CONTEXT=no - DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_APPLE_IEEE=yes - - DEFAULT_wxUSE_EXCEPTIONS=yes - DEFAULT_wxUSE_LOG=yes - DEFAULT_wxUSE_LOGWINDOW=yes - DEFAULT_wxUSE_LOGGUI=yes - DEFAULT_wxUSE_LOGDIALOG=yes - - DEFAULT_wxUSE_GUI=yes - - DEFAULT_wxUSE_REGEX=yes - DEFAULT_wxUSE_XML=yes - DEFAULT_wxUSE_EXPAT=yes - DEFAULT_wxUSE_ZLIB=yes - DEFAULT_wxUSE_LIBPNG=yes - DEFAULT_wxUSE_LIBJPEG=yes - DEFAULT_wxUSE_LIBTIFF=yes - DEFAULT_wxUSE_LIBXPM=yes - DEFAULT_wxUSE_LIBMSPACK=yes - DEFAULT_wxUSE_LIBSDL=no - DEFAULT_wxUSE_LIBGNOMEPRINT=yes - DEFAULT_wxUSE_LIBGNOMEVFS=no - DEFAULT_wxUSE_LIBHILDON=no - DEFAULT_wxUSE_ODBC=no - DEFAULT_wxUSE_OPENGL=no - - DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes - DEFAULT_wxUSE_STACKWALKER=yes - DEFAULT_wxUSE_DEBUGREPORT=yes - DEFAULT_wxUSE_SNGLINST_CHECKER=yes - DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG - DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG - DEFAULT_wxUSE_CMDLINE_PARSER=yes - DEFAULT_wxUSE_DATETIME=yes - DEFAULT_wxUSE_TIMER=yes - DEFAULT_wxUSE_STOPWATCH=yes - DEFAULT_wxUSE_FILE=yes - DEFAULT_wxUSE_FFILE=yes - DEFAULT_wxUSE_STDPATHS=yes - DEFAULT_wxUSE_TEXTBUFFER=yes - DEFAULT_wxUSE_TEXTFILE=yes - DEFAULT_wxUSE_SOUND=yes - DEFAULT_wxUSE_MEDIACTRL=no - DEFAULT_wxUSE_GSTREAMER8=no - DEFAULT_wxUSE_PRINTF_POS_PARAMS=yes - DEFAULT_wxUSE_INTL=yes - DEFAULT_wxUSE_CONFIG=yes - DEFAULT_wxUSE_FONTMAP=yes - DEFAULT_wxUSE_STREAMS=yes - DEFAULT_wxUSE_SOCKETS=yes - DEFAULT_wxUSE_OLE=yes - DEFAULT_wxUSE_DATAOBJ=yes - DEFAULT_wxUSE_DIALUP_MANAGER=yes - DEFAULT_wxUSE_JOYSTICK=yes - DEFAULT_wxUSE_DYNLIB_CLASS=yes - DEFAULT_wxUSE_DYNAMIC_LOADER=yes - DEFAULT_wxUSE_LONGLONG=yes - DEFAULT_wxUSE_GEOMETRY=yes - - DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes - DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes - DEFAULT_wxUSE_POSTSCRIPT=yes - - DEFAULT_wxUSE_CLIPBOARD=yes - DEFAULT_wxUSE_TOOLTIPS=yes - DEFAULT_wxUSE_DRAG_AND_DROP=yes - DEFAULT_wxUSE_DRAGIMAGE=yes - DEFAULT_wxUSE_SPLINES=yes - DEFAULT_wxUSE_MOUSEWHEEL=yes - - DEFAULT_wxUSE_MDI=yes - DEFAULT_wxUSE_MDI_ARCHITECTURE=yes - DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes - DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes - - DEFAULT_wxUSE_RESOURCES=no - DEFAULT_wxUSE_CONSTRAINTS=yes - DEFAULT_wxUSE_IPC=yes - DEFAULT_wxUSE_HELP=yes - DEFAULT_wxUSE_MS_HTML_HELP=yes - DEFAULT_wxUSE_WXHTML_HELP=yes - DEFAULT_wxUSE_TREELAYOUT=yes - DEFAULT_wxUSE_METAFILE=yes - DEFAULT_wxUSE_MIMETYPE=yes - DEFAULT_wxUSE_SYSTEM_OPTIONS=yes - DEFAULT_wxUSE_PROTOCOL=yes - DEFAULT_wxUSE_PROTOCOL_HTTP=yes - DEFAULT_wxUSE_PROTOCOL_FTP=yes - DEFAULT_wxUSE_PROTOCOL_FILE=yes - DEFAULT_wxUSE_URL=yes - DEFAULT_wxUSE_VARIANT=yes - - DEFAULT_wxUSE_ABOUTDLG=yes - DEFAULT_wxUSE_COMMONDLGS=yes - DEFAULT_wxUSE_CHOICEDLG=yes - DEFAULT_wxUSE_COLOURDLG=yes - DEFAULT_wxUSE_DIRDLG=yes - DEFAULT_wxUSE_FILEDLG=yes - DEFAULT_wxUSE_FINDREPLDLG=yes - DEFAULT_wxUSE_FONTDLG=yes - DEFAULT_wxUSE_MSGDLG=yes - DEFAULT_wxUSE_NUMBERDLG=yes - DEFAULT_wxUSE_TEXTDLG=yes - DEFAULT_wxUSE_SPLASH=yes - DEFAULT_wxUSE_STARTUP_TIPS=yes - DEFAULT_wxUSE_PROGRESSDLG=yes - DEFAULT_wxUSE_WIZARDDLG=yes - - DEFAULT_wxUSE_MENUS=yes - DEFAULT_wxUSE_MINIFRAME=yes - DEFAULT_wxUSE_HTML=yes - DEFAULT_wxUSE_RICHTEXT=yes - DEFAULT_wxUSE_XRC=yes - DEFAULT_wxUSE_AUI=yes - DEFAULT_wxUSE_WEBKIT=yes - DEFAULT_wxUSE_FILESYSTEM=yes - DEFAULT_wxUSE_FS_INET=yes - DEFAULT_wxUSE_FS_ZIP=yes - DEFAULT_wxUSE_FS_ARCHIVE=yes - DEFAULT_wxUSE_BUSYINFO=yes - DEFAULT_wxUSE_ARCHIVE_STREAMS=yes - DEFAULT_wxUSE_ZIPSTREAM=yes - DEFAULT_wxUSE_TARSTREAM=yes - DEFAULT_wxUSE_VALIDATORS=yes +DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG +DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG - DEFAULT_wxUSE_ACCEL=yes - DEFAULT_wxUSE_ANIMATIONCTRL=yes - DEFAULT_wxUSE_BUTTON=yes - DEFAULT_wxUSE_BMPBUTTON=yes - DEFAULT_wxUSE_BITMAPCOMBOBOX=yes - DEFAULT_wxUSE_CALCTRL=yes - DEFAULT_wxUSE_CARET=yes - DEFAULT_wxUSE_CHECKBOX=yes - DEFAULT_wxUSE_CHECKLST=yes - DEFAULT_wxUSE_CHOICE=yes - DEFAULT_wxUSE_CHOICEBOOK=yes - DEFAULT_wxUSE_COLLPANE=yes - DEFAULT_wxUSE_COLOURPICKERCTRL=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_COMBOCTRL=yes - DEFAULT_wxUSE_DATEPICKCTRL=yes - DEFAULT_wxUSE_DISPLAY=yes - DEFAULT_wxUSE_DETECT_SM=yes - DEFAULT_wxUSE_DIRPICKERCTRL=yes - DEFAULT_wxUSE_FILEPICKERCTRL=yes - DEFAULT_wxUSE_FONTPICKERCTRL=yes - DEFAULT_wxUSE_GAUGE=yes - DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_GRAPHICS_CONTEXT=no - DEFAULT_wxUSE_HYPERLINKCTRL=yes - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=yes - DEFAULT_wxUSE_LISTBOOK=yes - DEFAULT_wxUSE_LISTBOX=yes - DEFAULT_wxUSE_LISTCTRL=yes - DEFAULT_wxUSE_NOTEBOOK=yes - DEFAULT_wxUSE_ODCOMBOBOX=yes - DEFAULT_wxUSE_RADIOBOX=yes - DEFAULT_wxUSE_RADIOBTN=yes - DEFAULT_wxUSE_SASH=yes - DEFAULT_wxUSE_SCROLLBAR=yes - DEFAULT_wxUSE_SEARCHCTRL=yes - DEFAULT_wxUSE_SLIDER=yes - DEFAULT_wxUSE_SPINBTN=yes - DEFAULT_wxUSE_SPINCTRL=yes - DEFAULT_wxUSE_SPLITTER=yes - DEFAULT_wxUSE_STATBMP=yes - DEFAULT_wxUSE_STATBOX=yes - DEFAULT_wxUSE_STATLINE=yes - DEFAULT_wxUSE_STATTEXT=yes - DEFAULT_wxUSE_STATUSBAR=yes - DEFAULT_wxUSE_TAB_DIALOG=no - DEFAULT_wxUSE_TEXTCTRL=yes - DEFAULT_wxUSE_TOGGLEBTN=yes - DEFAULT_wxUSE_TOOLBAR=yes - DEFAULT_wxUSE_TOOLBAR_NATIVE=yes - DEFAULT_wxUSE_TREEBOOK=yes - DEFAULT_wxUSE_TOOLBOOK=yes - DEFAULT_wxUSE_TREECTRL=yes - DEFAULT_wxUSE_POPUPWIN=yes - DEFAULT_wxUSE_TIPWINDOW=yes +DEFAULT_wxUSE_DMALLOC=no +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_UNICODE=no - DEFAULT_wxUSE_UNICODE_MSLU=yes - DEFAULT_wxUSE_WCSRTOMBS=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_PALETTE=yes - DEFAULT_wxUSE_IMAGE=yes - DEFAULT_wxUSE_GIF=yes - DEFAULT_wxUSE_PCX=yes - DEFAULT_wxUSE_TGA=yes - DEFAULT_wxUSE_IFF=no DEFAULT_wxUSE_PNM=yes - DEFAULT_wxUSE_XPM=yes - DEFAULT_wxUSE_ICO_CUR=yes - DEFAULT_wxUSE_ACCESSIBILITY=no +DEFAULT_wxUSE_UNICODE_UTF8=auto +DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no - DEFAULT_wxUSE_MONOLITHIC=no - DEFAULT_wxUSE_PLUGINS=no - DEFAULT_wxUSE_OFFICIAL_BUILD=no +DEFAULT_wxUSE_UNIVERSAL_BINARY=no - DEFAULT_wxUSE_GTK2=yes -fi +DEFAULT_wxUSE_OFFICIAL_BUILD=no +DEFAULT_wxUSE_GTK2=yes +DEFAULT_wxUSE_OBJC_UNIQUIFYING=no for toolkit in `echo $ALL_TOOLKITS`; do @@ -3359,214 +2982,427 @@ done - enablestring= + + + 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}-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; if test "$enableval" = yes; then - ac_cv_use_gui='wxUSE_GUI=yes' + wx_cv_use_gui='wxUSE_GUI=yes' else - ac_cv_use_gui='wxUSE_GUI=no' + wx_cv_use_gui='wxUSE_GUI=no' fi + cache=yes else - LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI + wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}" fi - eval "$ac_cv_use_gui" - if test "$no_cache" != 1; then - echo $ac_cv_use_gui >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gui" + if test "x$cache" = xyes; then + echo "wxUSE_GUI=$wxUSE_GUI" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GUI" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_GUI = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_GUI fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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; if test "$enableval" = yes; then - ac_cv_use_monolithic='wxUSE_MONOLITHIC=yes' + wx_cv_use_monolithic='wxUSE_MONOLITHIC=yes' else - ac_cv_use_monolithic='wxUSE_MONOLITHIC=no' + wx_cv_use_monolithic='wxUSE_MONOLITHIC=no' fi + cache=yes else - LINE=`grep "wxUSE_MONOLITHIC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_monolithic='wxUSE_MONOLITHIC='$DEFAULT_wxUSE_MONOLITHIC + wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}" fi - eval "$ac_cv_use_monolithic" - if test "$no_cache" != 1; then - echo $ac_cv_use_monolithic >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_monolithic" + if test "x$cache" = xyes; then + echo "wxUSE_MONOLITHIC=$wxUSE_MONOLITHIC" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MONOLITHIC" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MONOLITHIC = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_MONOLITHIC fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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; if test "$enableval" = yes; then - ac_cv_use_plugins='wxUSE_PLUGINS=yes' + wx_cv_use_plugins='wxUSE_PLUGINS=yes' else - ac_cv_use_plugins='wxUSE_PLUGINS=no' + wx_cv_use_plugins='wxUSE_PLUGINS=no' fi + cache=yes else - LINE=`grep "wxUSE_PLUGINS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_plugins='wxUSE_PLUGINS='$DEFAULT_wxUSE_PLUGINS + wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}" fi - eval "$ac_cv_use_plugins" - if test "$no_cache" != 1; then - echo $ac_cv_use_plugins >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_plugins" + if test "x$cache" = xyes; then + echo "wxUSE_PLUGINS=$wxUSE_PLUGINS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PLUGINS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PLUGINS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PLUGINS 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}-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 withval=$with_subdirs; if test "$withval" = yes; then - ac_cv_use_subdirs='wxWITH_SUBDIRS=yes' + wx_cv_use_subdirs='wxWITH_SUBDIRS=yes' else - ac_cv_use_subdirs='wxWITH_SUBDIRS=no' + wx_cv_use_subdirs='wxWITH_SUBDIRS=no' fi + cache=yes else - LINE=`grep "wxWITH_SUBDIRS" ${wx_arg_cache_file}` + LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_subdirs='wxWITH_SUBDIRS='$DEFAULT_wxWITH_SUBDIRS + wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}" fi - eval "$ac_cv_use_subdirs" - if test "$no_cache" != 1; then - echo $ac_cv_use_subdirs >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_subdirs" + if test "x$cache" = xyes; then + echo "wxWITH_SUBDIRS=$wxWITH_SUBDIRS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxWITH_SUBDIRS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$withstring" = xwithout; then + if test $wxWITH_SUBDIRS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxWITH_SUBDIRS + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + +# Check whether --with-flavour was given. +if test "${with_flavour+set}" = set; then + withval=$with_flavour; WX_FLAVOUR="$withval" +fi + + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6; } + # Check whether --enable-official_build was given. +if test "${enable_official_build+set}" = set; then + enableval=$enable_official_build; + if test "$enableval" = yes; then + wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes' + else + wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}" + +fi + + + eval "$wx_cv_use_official_build" + if test "x$cache" = xyes; then + echo "wxUSE_OFFICIAL_BUILD=$wxUSE_OFFICIAL_BUILD" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_OFFICIAL_BUILD = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_OFFICIAL_BUILD + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + +# Check whether --enable-vendor was given. +if test "${enable_vendor+set}" = set; then + enableval=$enable_vendor; VENDOR="$enableval" +fi + +if test "x$VENDOR" = "x"; then + VENDOR="custom" +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}-all-features" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-all-features... $ECHO_C" >&6; } + # Check whether --enable-all-features was given. +if test "${enable_all_features+set}" = set; then + enableval=$enable_all_features; + if test "$enableval" = yes; then + wx_cv_use_all_features='wxUSE_ALL_FEATURES=yes' + else + wx_cv_use_all_features='wxUSE_ALL_FEATURES=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}" + +fi + + + eval "$wx_cv_use_all_features" + if test "x$cache" = xyes; then + echo "wxUSE_ALL_FEATURES=$wxUSE_ALL_FEATURES" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_ALL_FEATURES = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_ALL_FEATURES + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + if test "$wxUSE_GUI" = "yes"; then 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}-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; if test "$enableval" = yes; then - ac_cv_use_universal='wxUSE_UNIVERSAL=yes' + wx_cv_use_universal='wxUSE_UNIVERSAL=yes' else - ac_cv_use_universal='wxUSE_UNIVERSAL=no' + wx_cv_use_universal='wxUSE_UNIVERSAL=no' fi + cache=yes else - LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL + wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}" fi - eval "$ac_cv_use_universal" - if test "$no_cache" != 1; then - echo $ac_cv_use_universal >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_universal" + if test "x$cache" = xyes; then + echo "wxUSE_UNIVERSAL=$wxUSE_UNIVERSAL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_UNIVERSAL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_UNIVERSAL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_UNIVERSAL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + +if test "$wxUSE_UNIVERSAL" = "yes"; then + +# Check whether --with-themes was given. +if test "${with_themes+set}" = set; then + withval=$with_themes; wxUNIV_THEMES="$withval" +fi + +fi + # Check whether --with-gtk was given. if test "${with_gtk+set}" = set; then @@ -3635,45 +3471,60 @@ fi enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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; if test "$enableval" = yes; then - ac_cv_use_nanox='wxUSE_NANOX=yes' + wx_cv_use_nanox='wxUSE_NANOX=yes' else - ac_cv_use_nanox='wxUSE_NANOX=no' + wx_cv_use_nanox='wxUSE_NANOX=no' fi + cache=yes else - LINE=`grep "wxUSE_NANOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_nanox='wxUSE_NANOX='$DEFAULT_wxUSE_NANOX + wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}" fi - eval "$ac_cv_use_nanox" - if test "$no_cache" != 1; then - echo $ac_cv_use_nanox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_nanox" + if test "x$cache" = xyes; then + echo "wxUSE_NANOX=$wxUSE_NANOX" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NANOX" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_NANOX = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_NANOX fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + # Check whether --enable-gtk2 was given. if test "${enable_gtk2+set}" = set; then @@ -3682,85 +3533,102 @@ fi enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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; if test "$enableval" = yes; then - ac_cv_use_gpe='wxUSE_GPE=yes' + wx_cv_use_gpe='wxUSE_GPE=yes' else - ac_cv_use_gpe='wxUSE_GPE=no' + wx_cv_use_gpe='wxUSE_GPE=no' fi + cache=yes else - LINE=`grep "wxUSE_GPE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gpe='wxUSE_GPE='$DEFAULT_wxUSE_GPE + wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}" fi - eval "$ac_cv_use_gpe" - if test "$no_cache" != 1; then - echo $ac_cv_use_gpe >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gpe" + if test "x$cache" = xyes; then + echo "wxUSE_GPE=$wxUSE_GPE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GPE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_GPE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_GPE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + { 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 withval=$with_libpng; if test "$withval" = yes; then - ac_cv_use_libpng='wxUSE_LIBPNG=yes' + wx_cv_use_libpng='wxUSE_LIBPNG=yes' elif test "$withval" = no; then - ac_cv_use_libpng='wxUSE_LIBPNG=no' + wx_cv_use_libpng='wxUSE_LIBPNG=no' elif test "$withval" = sys; then - ac_cv_use_libpng='wxUSE_LIBPNG=sys' + wx_cv_use_libpng='wxUSE_LIBPNG=sys' elif test "$withval" = builtin; then - ac_cv_use_libpng='wxUSE_LIBPNG=builtin' + wx_cv_use_libpng='wxUSE_LIBPNG=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else - LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG + wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}" fi - eval "$ac_cv_use_libpng" - if test "$no_cache" != 1; then - echo $ac_cv_use_libpng >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_libpng" + if test "x$cache" = xyes; then + echo "wxUSE_LIBPNG=$wxUSE_LIBPNG" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBPNG" = yes; then @@ -3784,42 +3652,43 @@ 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 withval=$with_libjpeg; if test "$withval" = yes; then - ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes' + wx_cv_use_libjpeg='wxUSE_LIBJPEG=yes' elif test "$withval" = no; then - ac_cv_use_libjpeg='wxUSE_LIBJPEG=no' + wx_cv_use_libjpeg='wxUSE_LIBJPEG=no' elif test "$withval" = sys; then - ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys' + wx_cv_use_libjpeg='wxUSE_LIBJPEG=sys' elif test "$withval" = builtin; then - ac_cv_use_libjpeg='wxUSE_LIBJPEG=builtin' + wx_cv_use_libjpeg='wxUSE_LIBJPEG=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else - LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG + wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}" fi - eval "$ac_cv_use_libjpeg" - if test "$no_cache" != 1; then - echo $ac_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_libjpeg" + if test "x$cache" = xyes; then + echo "wxUSE_LIBJPEG=$wxUSE_LIBJPEG" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBJPEG" = yes; then @@ -3843,42 +3712,43 @@ 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 withval=$with_libtiff; if test "$withval" = yes; then - ac_cv_use_libtiff='wxUSE_LIBTIFF=yes' + wx_cv_use_libtiff='wxUSE_LIBTIFF=yes' elif test "$withval" = no; then - ac_cv_use_libtiff='wxUSE_LIBTIFF=no' + wx_cv_use_libtiff='wxUSE_LIBTIFF=no' elif test "$withval" = sys; then - ac_cv_use_libtiff='wxUSE_LIBTIFF=sys' + wx_cv_use_libtiff='wxUSE_LIBTIFF=sys' elif test "$withval" = builtin; then - ac_cv_use_libtiff='wxUSE_LIBTIFF=builtin' + wx_cv_use_libtiff='wxUSE_LIBTIFF=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else - LINE=`grep "wxUSE_LIBTIFF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF + wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}" fi - eval "$ac_cv_use_libtiff" - if test "$no_cache" != 1; then - echo $ac_cv_use_libtiff >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_libtiff" + if test "x$cache" = xyes; then + echo "wxUSE_LIBTIFF=$wxUSE_LIBTIFF" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBTIFF" = yes; then @@ -3902,42 +3772,43 @@ 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 withval=$with_libxpm; if test "$withval" = yes; then - ac_cv_use_libxpm='wxUSE_LIBXPM=yes' + wx_cv_use_libxpm='wxUSE_LIBXPM=yes' elif test "$withval" = no; then - ac_cv_use_libxpm='wxUSE_LIBXPM=no' + wx_cv_use_libxpm='wxUSE_LIBXPM=no' elif test "$withval" = sys; then - ac_cv_use_libxpm='wxUSE_LIBXPM=sys' + wx_cv_use_libxpm='wxUSE_LIBXPM=sys' elif test "$withval" = builtin; then - ac_cv_use_libxpm='wxUSE_LIBXPM=builtin' + wx_cv_use_libxpm='wxUSE_LIBXPM=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else - LINE=`grep "wxUSE_LIBXPM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_libxpm='wxUSE_LIBXPM='$DEFAULT_wxUSE_LIBXPM + wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}" fi - eval "$ac_cv_use_libxpm" - if test "$no_cache" != 1; then - echo $ac_cv_use_libxpm >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_libxpm" + if test "x$cache" = xyes; then + echo "wxUSE_LIBXPM=$wxUSE_LIBXPM" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBXPM" = yes; then @@ -3960,349 +3831,495 @@ 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}-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 withval=$with_libmspack; if test "$withval" = yes; then - ac_cv_use_libmspack='wxUSE_LIBMSPACK=yes' + wx_cv_use_libmspack='wxUSE_LIBMSPACK=yes' else - ac_cv_use_libmspack='wxUSE_LIBMSPACK=no' + wx_cv_use_libmspack='wxUSE_LIBMSPACK=no' fi + cache=yes else - LINE=`grep "wxUSE_LIBMSPACK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_libmspack='wxUSE_LIBMSPACK='$DEFAULT_wxUSE_LIBMSPACK + wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}" fi - eval "$ac_cv_use_libmspack" - if test "$no_cache" != 1; then - echo $ac_cv_use_libmspack >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_libmspack" + if test "x$cache" = xyes; then + echo "wxUSE_LIBMSPACK=$wxUSE_LIBMSPACK" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBMSPACK" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBMSPACK = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LIBMSPACK fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - withstring= - { 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 - withval=$with_sdl; + 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 - ac_cv_use_sdl='wxUSE_LIBSDL=yes' + wx_cv_use_gtkprint='wxUSE_GTKPRINT=yes' else - ac_cv_use_sdl='wxUSE_LIBSDL=no' + wx_cv_use_gtkprint='wxUSE_GTKPRINT=no' fi + cache=yes else - LINE=`grep "wxUSE_LIBSDL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GTKPRINT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_sdl='wxUSE_LIBSDL='$DEFAULT_wxUSE_LIBSDL + wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}" fi - eval "$ac_cv_use_sdl" - if test "$no_cache" != 1; then - echo $ac_cv_use_sdl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gtkprint" + if test "x$cache" = xyes; then + echo "wxUSE_GTKPRINT=$wxUSE_GTKPRINT" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBSDL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$withstring" = xwithout; then + if test $wxUSE_GTKPRINT = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_GTKPRINT fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - withstring= + + 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 withval=$with_gnomeprint; if test "$withval" = yes; then - ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes' + wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes' else - ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no' + wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no' fi + cache=yes else - LINE=`grep "wxUSE_LIBGNOMEPRINT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT='$DEFAULT_wxUSE_LIBGNOMEPRINT + wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}" fi - eval "$ac_cv_use_gnomeprint" - if test "$no_cache" != 1; then - echo $ac_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gnomeprint" + if test "x$cache" = xyes; then + echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBGNOMEPRINT" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBGNOMEPRINT = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LIBGNOMEPRINT 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}-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 withval=$with_gnomevfs; if test "$withval" = yes; then - ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes' + wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes' else - ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' + wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' fi + cache=yes else - LINE=`grep "wxUSE_LIBGNOMEVFS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS='$DEFAULT_wxUSE_LIBGNOMEVFS + wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" fi - eval "$ac_cv_use_gnomevfs" - if test "$no_cache" != 1; then - echo $ac_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gnomevfs" + if test "x$cache" = xyes; then + echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBGNOMEVFS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBGNOMEVFS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LIBGNOMEVFS 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}-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 withval=$with_hildon; if test "$withval" = yes; then - ac_cv_use_hildon='wxUSE_LIBHILDON=yes' + wx_cv_use_hildon='wxUSE_LIBHILDON=yes' else - ac_cv_use_hildon='wxUSE_LIBHILDON=no' + wx_cv_use_hildon='wxUSE_LIBHILDON=no' fi + cache=yes else - LINE=`grep "wxUSE_LIBHILDON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_hildon='wxUSE_LIBHILDON='$DEFAULT_wxUSE_LIBHILDON + wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}" fi - eval "$ac_cv_use_hildon" - if test "$no_cache" != 1; then - echo $ac_cv_use_hildon >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_hildon" + if test "x$cache" = xyes; then + echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBHILDON" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBHILDON = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LIBHILDON 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}-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 withval=$with_opengl; if test "$withval" = yes; then - ac_cv_use_opengl='wxUSE_OPENGL=yes' + wx_cv_use_opengl='wxUSE_OPENGL=yes' else - ac_cv_use_opengl='wxUSE_OPENGL=no' + wx_cv_use_opengl='wxUSE_OPENGL=no' fi + cache=yes else - LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL + wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}" fi - eval "$ac_cv_use_opengl" - if test "$no_cache" != 1; then - echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_opengl" + if test "x$cache" = xyes; then + echo "wxUSE_OPENGL=$wxUSE_OPENGL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_OPENGL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$withstring" = xwithout; then + if test $wxUSE_OPENGL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_OPENGL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } -if test "$wxUSE_UNIVERSAL" = "yes"; then - -# Check whether --with-themes was given. -if test "${with_themes+set}" = set; then - withval=$with_themes; wxUNIV_THEMES="$withval" -fi - -fi 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 withval=$with_dmalloc; if test "$withval" = yes; then - ac_cv_use_dmalloc='wxUSE_DMALLOC=yes' + wx_cv_use_dmalloc='wxUSE_DMALLOC=yes' else - ac_cv_use_dmalloc='wxUSE_DMALLOC=no' + wx_cv_use_dmalloc='wxUSE_DMALLOC=no' fi + cache=yes else - LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC + wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}" fi - eval "$ac_cv_use_dmalloc" - if test "$no_cache" != 1; then - echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dmalloc" + if test "x$cache" = xyes; then + echo "wxUSE_DMALLOC=$wxUSE_DMALLOC" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DMALLOC" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$withstring" = xwithout; then + if test $wxUSE_DMALLOC = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DMALLOC + 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}-sdl" >&5 +echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6; } + +# Check whether --with-sdl was given. +if test "${with_sdl+set}" = set; then + withval=$with_sdl; + if test "$withval" = yes; then + wx_cv_use_sdl='wxUSE_LIBSDL=yes' + else + wx_cv_use_sdl='wxUSE_LIBSDL=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}" + +fi + + + eval "$wx_cv_use_sdl" + if test "x$cache" = xyes; then + echo "wxUSE_LIBSDL=$wxUSE_LIBSDL" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBSDL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_LIBSDL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +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 withval=$with_regex; if test "$withval" = yes; then - ac_cv_use_regex='wxUSE_REGEX=yes' + wx_cv_use_regex='wxUSE_REGEX=yes' elif test "$withval" = no; then - ac_cv_use_regex='wxUSE_REGEX=no' + wx_cv_use_regex='wxUSE_REGEX=no' elif test "$withval" = sys; then - ac_cv_use_regex='wxUSE_REGEX=sys' + wx_cv_use_regex='wxUSE_REGEX=sys' elif test "$withval" = builtin; then - ac_cv_use_regex='wxUSE_REGEX=builtin' + wx_cv_use_regex='wxUSE_REGEX=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else - LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX + wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}" fi - eval "$ac_cv_use_regex" - if test "$no_cache" != 1; then - echo $ac_cv_use_regex >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_regex" + if test "x$cache" = xyes; then + echo "wxUSE_REGEX=$wxUSE_REGEX" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_REGEX" = yes; then @@ -4326,42 +4343,43 @@ 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 withval=$with_zlib; if test "$withval" = yes; then - ac_cv_use_zlib='wxUSE_ZLIB=yes' + wx_cv_use_zlib='wxUSE_ZLIB=yes' elif test "$withval" = no; then - ac_cv_use_zlib='wxUSE_ZLIB=no' + wx_cv_use_zlib='wxUSE_ZLIB=no' elif test "$withval" = sys; then - ac_cv_use_zlib='wxUSE_ZLIB=sys' + wx_cv_use_zlib='wxUSE_ZLIB=sys' elif test "$withval" = builtin; then - ac_cv_use_zlib='wxUSE_ZLIB=builtin' + wx_cv_use_zlib='wxUSE_ZLIB=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else - LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB + wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}" fi - eval "$ac_cv_use_zlib" - if test "$no_cache" != 1; then - echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_zlib" + if test "x$cache" = xyes; then + echo "wxUSE_ZLIB=$wxUSE_ZLIB" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_ZLIB" = yes; then @@ -4385,42 +4403,43 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b { 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 - ac_cv_use_odbc='wxUSE_ODBC=yes' + wx_cv_use_odbc='wxUSE_ODBC=yes' elif test "$withval" = no; then - ac_cv_use_odbc='wxUSE_ODBC=no' + wx_cv_use_odbc='wxUSE_ODBC=no' elif test "$withval" = sys; then - ac_cv_use_odbc='wxUSE_ODBC=sys' + wx_cv_use_odbc='wxUSE_ODBC=sys' elif test "$withval" = builtin; then - ac_cv_use_odbc='wxUSE_ODBC=builtin' + wx_cv_use_odbc='wxUSE_ODBC=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else - LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC + wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}" fi - eval "$ac_cv_use_odbc" - if test "$no_cache" != 1; then - echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_odbc" + if test "x$cache" = xyes; then + echo "wxUSE_ODBC=$wxUSE_ODBC" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_ODBC" = yes; then @@ -4444,42 +4463,43 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b { 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 withval=$with_expat; if test "$withval" = yes; then - ac_cv_use_expat='wxUSE_EXPAT=yes' + wx_cv_use_expat='wxUSE_EXPAT=yes' elif test "$withval" = no; then - ac_cv_use_expat='wxUSE_EXPAT=no' + wx_cv_use_expat='wxUSE_EXPAT=no' elif test "$withval" = sys; then - ac_cv_use_expat='wxUSE_EXPAT=sys' + wx_cv_use_expat='wxUSE_EXPAT=sys' elif test "$withval" = builtin; then - ac_cv_use_expat='wxUSE_EXPAT=builtin' + wx_cv_use_expat='wxUSE_EXPAT=builtin' else { { echo "$as_me:$LINENO: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&5 echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else - LINE=`grep "wxUSE_EXPAT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_expat='wxUSE_EXPAT='$DEFAULT_wxUSE_EXPAT + wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}" fi - eval "$ac_cv_use_expat" - if test "$no_cache" != 1; then - echo $ac_cv_use_expat >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_expat" + if test "x$cache" = xyes; then + echo "wxUSE_EXPAT=$wxUSE_EXPAT" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_EXPAT" = yes; then @@ -4501,8090 +4521,11987 @@ 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" + echo "wxUSE_MACOSX_SDK=$wxUSE_MACOSX_SDK" >> ${wx_arg_cache_file}.tmp + +else + + # NOTE: Empty string on purpose so that --without-macosx-sdk (thus no) + # will override --enable-universal_binary's automatic SDK usage. + wxUSE_MACOSX_SDK= + LINE=`grep "^wxUSE_MACOSX_SDK=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "$LINE" + echo "$LINE" >> ${wx_arg_cache_file}.tmp + fi + +fi + +{ 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" + echo "wxUSE_MACOSX_VERSION_MIN=$wxUSE_MACOSX_VERSION_MIN" >> ${wx_arg_cache_file}.tmp + +else + + # default "yes" because when not using an SDK it means the same as no + # but when using an SDK it means to use the SDK version + wxUSE_MACOSX_VERSION_MIN=yes + # See if there is a value in the cache + LINE=`grep "^wxUSE_MACOSX_VERSION_MIN=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "$LINE" + echo "$LINE" >> ${wx_arg_cache_file}.tmp + fi + +fi + +{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5 +echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; } + + + + enablestring=disable + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi - enablestring= { 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; if test "$enableval" = yes; then - ac_cv_use_shared='wxUSE_SHARED=yes' + wx_cv_use_shared='wxUSE_SHARED=yes' else - ac_cv_use_shared='wxUSE_SHARED=no' + wx_cv_use_shared='wxUSE_SHARED=no' fi + cache=yes else - LINE=`grep "wxUSE_SHARED" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED + wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" fi - eval "$ac_cv_use_shared" - if test "$no_cache" != 1; then - echo $ac_cv_use_shared >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_shared" + if test "x$cache" = xyes; then + echo "wxUSE_SHARED=$wxUSE_SHARED" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SHARED" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SHARED = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SHARED fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring=disable + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi - enablestring= { 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 - ac_cv_use_optimise='wxUSE_OPTIMISE=yes' + wx_cv_use_optimise='wxUSE_OPTIMISE=yes' else - ac_cv_use_optimise='wxUSE_OPTIMISE=no' + wx_cv_use_optimise='wxUSE_OPTIMISE=no' fi + cache=yes else - LINE=`grep "wxUSE_OPTIMISE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE + wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" fi - eval "$ac_cv_use_optimise" - if test "$no_cache" != 1; then - echo $ac_cv_use_optimise >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_optimise" + if test "x$cache" = xyes; then + echo "wxUSE_OPTIMISE=$wxUSE_OPTIMISE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_OPTIMISE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_OPTIMISE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_OPTIMISE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&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; if test "$enableval" = yes; then - ac_cv_use_debug='wxUSE_DEBUG=yes' + wx_cv_use_debug='wxUSE_DEBUG=yes' else - ac_cv_use_debug='wxUSE_DEBUG=no' + wx_cv_use_debug='wxUSE_DEBUG=no' fi + cache=yes else - LINE=`grep "wxUSE_DEBUG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debug='wxUSE_DEBUG='$DEFAULT_wxUSE_DEBUG + wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}" fi - eval "$ac_cv_use_debug" - if test "$no_cache" != 1; then - echo $ac_cv_use_debug >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debug" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG=$wxUSE_DEBUG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DEBUG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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; if test "$enableval" = yes; then - ac_cv_use_stl='wxUSE_STL=yes' + wx_cv_use_stl='wxUSE_STL=yes' else - ac_cv_use_stl='wxUSE_STL=no' + wx_cv_use_stl='wxUSE_STL=no' fi + cache=yes else - LINE=`grep "wxUSE_STL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_stl='wxUSE_STL='$DEFAULT_wxUSE_STL + wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}" fi - eval "$ac_cv_use_stl" - if test "$no_cache" != 1; then - echo $ac_cv_use_stl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_stl" + if test "x$cache" = xyes; then + echo "wxUSE_STL=$wxUSE_STL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STL fi -if test "$USE_OS2" = "1"; then - DEFAULT_wxUSE_OMF=no + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6; } + # Check whether --enable-std_iostreams was given. +if test "${enable_std_iostreams+set}" = set; then + enableval=$enable_std_iostreams; if test "$enableval" = yes; then - ac_cv_use_omf='wxUSE_OMF=yes' + wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' else - ac_cv_use_omf='wxUSE_OMF=no' + wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' fi + cache=yes else - LINE=`grep "wxUSE_OMF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_omf='wxUSE_OMF='$DEFAULT_wxUSE_OMF + wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}" fi - eval "$ac_cv_use_omf" - if test "$no_cache" != 1; then - echo $ac_cv_use_omf >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_std_iostreams" + if test "x$cache" = xyes; then + echo "wxUSE_STD_IOSTREAM=$wxUSE_STD_IOSTREAM" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_OMF" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STD_IOSTREAM = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STD_IOSTREAM fi -fi - -if test "$wxUSE_DEBUG" = "yes"; then - DEFAULT_wxUSE_DEBUG_FLAG=yes - DEFAULT_wxUSE_DEBUG_INFO=yes - BUILD=debug -elif test "$wxUSE_DEBUG" = "no"; then - DEFAULT_wxUSE_DEBUG_FLAG=no - DEFAULT_wxUSE_DEBUG_INFO=no - BUILD=release -fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6; } + # Check whether --enable-std_string was given. +if test "${enable_std_string+set}" = set; then + enableval=$enable_std_string; if test "$enableval" = yes; then - ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes' + wx_cv_use_std_string='wxUSE_STD_STRING=yes' else - ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' + wx_cv_use_std_string='wxUSE_STD_STRING=no' fi + cache=yes else - LINE=`grep "wxUSE_DEBUG_FLAG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG + wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}" fi - eval "$ac_cv_use_debug_flag" - if test "$no_cache" != 1; then - echo $ac_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_std_string" + if test "x$cache" = xyes; then + echo "wxUSE_STD_STRING=$wxUSE_STD_STRING" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUG_FLAG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STD_STRING = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STD_STRING fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - enablestring= - { 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; + + 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}-unicode" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6; } + # Check whether --enable-unicode was given. +if test "${enable_unicode+set}" = set; then + enableval=$enable_unicode; if test "$enableval" = yes; then - ac_cv_use_debug_info='wxUSE_DEBUG_INFO=yes' + wx_cv_use_unicode='wxUSE_UNICODE=yes' else - ac_cv_use_debug_info='wxUSE_DEBUG_INFO=no' + wx_cv_use_unicode='wxUSE_UNICODE=no' fi + cache=yes else - LINE=`grep "wxUSE_DEBUG_INFO" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO + wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}" fi - eval "$ac_cv_use_debug_info" - if test "$no_cache" != 1; then - echo $ac_cv_use_debug_info >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_unicode" + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE=$wxUSE_UNICODE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUG_INFO" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_UNICODE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_UNICODE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-mslu" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6; } + # Check whether --enable-mslu was given. +if test "${enable_mslu+set}" = set; then + enableval=$enable_mslu; if test "$enableval" = yes; then - ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes' + wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes' else - ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' + wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no' fi + cache=yes else - LINE=`grep "wxUSE_DEBUG_GDB" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB='$DEFAULT_wxUSE_DEBUG_GDB + wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}" fi - eval "$ac_cv_use_debug_gdb" - if test "$no_cache" != 1; then - echo $ac_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mslu" + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE_MSLU=$wxUSE_UNICODE_MSLU" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUG_GDB" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_UNICODE_MSLU = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_UNICODE_MSLU fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; - if test "$enableval" = yes; then - ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' - else - ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' - fi + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; } + # Check whether --enable-utf8 was given. +if test "${enable_utf8+set}" = set; then + enableval=$enable_utf8; + wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'" + cache=yes else - LINE=`grep "wxUSE_DEBUG_CONTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT='$DEFAULT_wxUSE_DEBUG_CONTEXT + wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8 fi - eval "$ac_cv_use_debug_cntxt" - if test "$no_cache" != 1; then - echo $ac_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_utf8" + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE_UTF8=$wxUSE_UNICODE_UTF8" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUG_CONTEXT" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi + { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5 +echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; } enablestring= - { 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; + 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}-utf8only" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; } + # Check whether --enable-utf8only was given. +if test "${enable_utf8only+set}" = set; then + enableval=$enable_utf8only; if test "$enableval" = yes; then - ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes' + wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes' else - ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' + wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no' fi + cache=yes else - LINE=`grep "wxUSE_MEM_TRACING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING + wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}" fi - eval "$ac_cv_use_mem_tracing" - if test "$no_cache" != 1; then - echo $ac_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_utf8only" + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE_UTF8_LOCALE=$wxUSE_UNICODE_UTF8_LOCALE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MEM_TRACING" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_UNICODE_UTF8_LOCALE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-extended_rtti" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6; } + # Check whether --enable-extended_rtti was given. +if test "${enable_extended_rtti+set}" = set; then + enableval=$enable_extended_rtti; if test "$enableval" = yes; then - ac_cv_use_profile='wxUSE_PROFILE=yes' + wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes' else - ac_cv_use_profile='wxUSE_PROFILE=no' + wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no' fi + cache=yes else - LINE=`grep "wxUSE_PROFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE + wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}" fi - eval "$ac_cv_use_profile" - if test "$no_cache" != 1; then - echo $ac_cv_use_profile >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_extended_rtti" + if test "x$cache" = xyes; then + echo "wxUSE_EXTENDED_RTTI=$wxUSE_EXTENDED_RTTI" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROFILE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_EXTENDED_RTTI = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_EXTENDED_RTTI fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + +if test "$USE_OS2" = "1"; then + DEFAULT_wxUSE_OMF=no enablestring= - { 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; + 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}-omf" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; } + # Check whether --enable-omf was given. +if test "${enable_omf+set}" = set; then + enableval=$enable_omf; if test "$enableval" = yes; then - ac_cv_use_no_rtti='wxUSE_NO_RTTI=yes' + wx_cv_use_omf='wxUSE_OMF=yes' else - ac_cv_use_no_rtti='wxUSE_NO_RTTI=no' + wx_cv_use_omf='wxUSE_OMF=no' fi + cache=yes else - LINE=`grep "wxUSE_NO_RTTI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_no_rtti='wxUSE_NO_RTTI='$DEFAULT_wxUSE_NO_RTTI + wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}" fi - eval "$ac_cv_use_no_rtti" - if test "$no_cache" != 1; then - echo $ac_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_omf" + if test "x$cache" = xyes; then + echo "wxUSE_OMF=$wxUSE_OMF" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NO_RTTI" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_OMF = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_OMF fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + +fi + +if test "$wxUSE_DEBUG" = "yes"; then + DEFAULT_wxUSE_DEBUG_FLAG=yes + DEFAULT_wxUSE_DEBUG_INFO=yes + BUILD=debug +elif test "$wxUSE_DEBUG" = "no"; then + DEFAULT_wxUSE_DEBUG_FLAG=no + DEFAULT_wxUSE_DEBUG_INFO=no + BUILD=release +fi + enablestring= - { 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; + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; } + # Check whether --enable-debug_flag was given. +if test "${enable_debug_flag+set}" = set; then + enableval=$enable_debug_flag; if test "$enableval" = yes; then - ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes' + wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes' else - ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no' + wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' fi + cache=yes else - LINE=`grep "wxUSE_NO_EXCEPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS='$DEFAULT_wxUSE_NO_EXCEPTIONS + wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" fi - eval "$ac_cv_use_no_exceptions" - if test "$no_cache" != 1; then - echo $ac_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debug_flag" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_FLAG=$wxUSE_DEBUG_FLAG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NO_EXCEPTIONS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_FLAG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DEBUG_FLAG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; } + # Check whether --enable-debug_info was given. +if test "${enable_debug_info+set}" = set; then + enableval=$enable_debug_info; if test "$enableval" = yes; then - ac_cv_use_permissive='wxUSE_PERMISSIVE=yes' + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes' else - ac_cv_use_permissive='wxUSE_PERMISSIVE=no' + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' fi + cache=yes else - LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_permissive='wxUSE_PERMISSIVE='$DEFAULT_wxUSE_PERMISSIVE + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" fi - eval "$ac_cv_use_permissive" - if test "$no_cache" != 1; then - echo $ac_cv_use_permissive >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debug_info" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_INFO=$wxUSE_DEBUG_INFO" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PERMISSIVE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_INFO = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DEBUG_INFO fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; } + # Check whether --enable-debug_gdb was given. +if test "${enable_debug_gdb+set}" = set; then + enableval=$enable_debug_gdb; if test "$enableval" = yes; then - ac_cv_use_no_deps='wxUSE_NO_DEPS=yes' + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes' else - ac_cv_use_no_deps='wxUSE_NO_DEPS=no' + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' fi + cache=yes else - LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_no_deps='wxUSE_NO_DEPS='$DEFAULT_wxUSE_NO_DEPS + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" fi - eval "$ac_cv_use_no_deps" - if test "$no_cache" != 1; then - echo $ac_cv_use_no_deps >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debug_gdb" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_GDB=$wxUSE_DEBUG_GDB" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NO_DEPS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_GDB = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DEBUG_GDB fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; } + # Check whether --enable-debug_cntxt was given. +if test "${enable_debug_cntxt+set}" = set; then + enableval=$enable_debug_cntxt; if test "$enableval" = yes; then - ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes' + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' else - ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no' + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' fi + cache=yes else - LINE=`grep "wxUSE_VARARG_MACROS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_vararg_macros='wxUSE_VARARG_MACROS='$DEFAULT_wxUSE_VARARG_MACROS + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" fi - eval "$ac_cv_use_vararg_macros" - if test "$no_cache" != 1; then - echo $ac_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debug_cntxt" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_CONTEXT=$wxUSE_DEBUG_CONTEXT" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_VARARG_MACROS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_CONTEXT = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DEBUG_CONTEXT fi + { echo "$as_me:$LINENO: result: $result" >&5 +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; - wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'" - -else - LINE=`grep "wxUSE_UNIVERSAL_BINARY" ${wx_arg_cache_file}` + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; } + # Check whether --enable-mem_tracing was given. +if test "${enable_mem_tracing+set}" = set; then + enableval=$enable_mem_tracing; + if test "$enableval" = yes; then + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes' + else + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 - wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY=no" + cache=no fi + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" + fi - eval "$wx_cv_use_universal_binary" - if test "$no_cache" != 1; then - echo $wx_cv_use_universal_binary >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mem_tracing" + if test "x$cache" = xyes; then + echo "wxUSE_MEM_TRACING=$wxUSE_MEM_TRACING" >> ${wx_arg_cache_file}.tmp fi - { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5 -echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MEM_TRACING = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_MEM_TRACING + fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - enablestring=enable - { 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; + 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}-profile" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6; } + # Check whether --enable-profile was given. +if test "${enable_profile+set}" = set; then + enableval=$enable_profile; if test "$enableval" = yes; then - ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes' + wx_cv_use_profile='wxUSE_PROFILE=yes' else - ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no' + wx_cv_use_profile='wxUSE_PROFILE=no' fi + cache=yes else - LINE=`grep "WXWIN_COMPATIBILITY_2_6" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_compat26='WXWIN_COMPATIBILITY_2_6='$DEFAULT_WXWIN_COMPATIBILITY_2_6 + wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}" fi - eval "$ac_cv_use_compat26" - if test "$no_cache" != 1; then - echo $ac_cv_use_compat26 >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_profile" + if test "x$cache" = xyes; then + echo "wxUSE_PROFILE=$wxUSE_PROFILE" >> ${wx_arg_cache_file}.tmp fi - if test "$WXWIN_COMPATIBILITY_2_6" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROFILE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PROFILE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - enablestring=disable - { 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; + + 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}-no_rtti" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6; } + # Check whether --enable-no_rtti was given. +if test "${enable_no_rtti+set}" = set; then + enableval=$enable_no_rtti; if test "$enableval" = yes; then - ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes' + wx_cv_use_no_rtti='wxUSE_NO_RTTI=yes' else - ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no' + wx_cv_use_no_rtti='wxUSE_NO_RTTI=no' fi + cache=yes else - LINE=`grep "WXWIN_COMPATIBILITY_2_8" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8='$DEFAULT_WXWIN_COMPATIBILITY_2_8 + wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}" fi - eval "$ac_cv_use_compat28" - if test "$no_cache" != 1; then - echo $ac_cv_use_compat28 >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_no_rtti" + if test "x$cache" = xyes; then + echo "wxUSE_NO_RTTI=$wxUSE_NO_RTTI" >> ${wx_arg_cache_file}.tmp fi - if test "$WXWIN_COMPATIBILITY_2_8" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_NO_RTTI = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_NO_RTTI fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-no_exceptions" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >&6; } + # Check whether --enable-no_exceptions was given. +if test "${enable_no_exceptions+set}" = set; then + enableval=$enable_no_exceptions; if test "$enableval" = yes; then - ac_cv_use_rpath='wxUSE_RPATH=yes' + wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes' else - ac_cv_use_rpath='wxUSE_RPATH=no' + wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no' fi + cache=yes else - LINE=`grep "wxUSE_RPATH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_rpath='wxUSE_RPATH='$DEFAULT_wxUSE_RPATH + wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}" fi - eval "$ac_cv_use_rpath" - if test "$no_cache" != 1; then - echo $ac_cv_use_rpath >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_no_exceptions" + if test "x$cache" = xyes; then + echo "wxUSE_NO_EXCEPTIONS=$wxUSE_NO_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_RPATH" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_NO_EXCEPTIONS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_NO_EXCEPTIONS fi - - + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-permissive" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6; } + # Check whether --enable-permissive was given. +if test "${enable_permissive+set}" = set; then + enableval=$enable_permissive; if test "$enableval" = yes; then - ac_cv_use_intl='wxUSE_INTL=yes' + wx_cv_use_permissive='wxUSE_PERMISSIVE=yes' else - ac_cv_use_intl='wxUSE_INTL=no' + wx_cv_use_permissive='wxUSE_PERMISSIVE=no' fi + cache=yes else - LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL + wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}" fi - eval "$ac_cv_use_intl" - if test "$no_cache" != 1; then - echo $ac_cv_use_intl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_permissive" + if test "x$cache" = xyes; then + echo "wxUSE_PERMISSIVE=$wxUSE_PERMISSIVE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_INTL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PERMISSIVE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PERMISSIVE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-no_deps" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6; } + # Check whether --enable-no_deps was given. +if test "${enable_no_deps+set}" = set; then + enableval=$enable_no_deps; if test "$enableval" = yes; then - ac_cv_use_config='wxUSE_CONFIG=yes' + wx_cv_use_no_deps='wxUSE_NO_DEPS=yes' else - ac_cv_use_config='wxUSE_CONFIG=no' + wx_cv_use_no_deps='wxUSE_NO_DEPS=no' fi + cache=yes else - LINE=`grep "wxUSE_CONFIG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG + wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}" fi - eval "$ac_cv_use_config" - if test "$no_cache" != 1; then - echo $ac_cv_use_config >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_no_deps" + if test "x$cache" = xyes; then + echo "wxUSE_NO_DEPS=$wxUSE_NO_DEPS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CONFIG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_NO_DEPS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_NO_DEPS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - enablestring= - { 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; + 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}-vararg_macros" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6; } + # Check whether --enable-vararg_macros was given. +if test "${enable_vararg_macros+set}" = set; then + enableval=$enable_vararg_macros; if test "$enableval" = yes; then - ac_cv_use_protocols='wxUSE_PROTOCOL=yes' + wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=yes' else - ac_cv_use_protocols='wxUSE_PROTOCOL=no' + wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_protocols='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL + wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}" fi - eval "$ac_cv_use_protocols" - if test "$no_cache" != 1; then - echo $ac_cv_use_protocols >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_vararg_macros" + if test "x$cache" = xyes; then + echo "wxUSE_VARARG_MACROS=$wxUSE_VARARG_MACROS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_VARARG_MACROS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_VARARG_MACROS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; - if test "$enableval" = yes; then - ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes' - else - ac_cv_use_ftp='wxUSE_PROTOCOL_FTP=no' - fi + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6; } + # Check whether --enable-universal_binary was given. +if test "${enable_universal_binary+set}" = set; then + enableval=$enable_universal_binary; + wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'" + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP + wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY fi - eval "$ac_cv_use_ftp" - if test "$no_cache" != 1; then - echo $ac_cv_use_ftp >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_universal_binary" + if test "x$cache" = xyes; then + echo "wxUSE_UNIVERSAL_BINARY=$wxUSE_UNIVERSAL_BINARY" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_FTP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi + { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5 +echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; } + enablestring= - { 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; + 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}-compat26" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; } + # Check whether --enable-compat26 was given. +if test "${enable_compat26+set}" = set; then + enableval=$enable_compat26; if test "$enableval" = yes; then - ac_cv_use_http='wxUSE_PROTOCOL_HTTP=yes' + wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=yes' else - ac_cv_use_http='wxUSE_PROTOCOL_HTTP=no' + wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}` + LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP + wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}" fi - eval "$ac_cv_use_http" - if test "$no_cache" != 1; then - echo $ac_cv_use_http >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_compat26" + if test "x$cache" = xyes; then + echo "WXWIN_COMPATIBILITY_2_6=$WXWIN_COMPATIBILITY_2_6" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_HTTP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $WXWIN_COMPATIBILITY_2_6 = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$WXWIN_COMPATIBILITY_2_6 fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - enablestring= - { 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; + + 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}-compat28" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; } + # Check whether --enable-compat28 was given. +if test "${enable_compat28+set}" = set; then + enableval=$enable_compat28; if test "$enableval" = yes; then - ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes' + wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes' else - ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no' + wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}` + LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fileproto='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE + wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" fi - eval "$ac_cv_use_fileproto" - if test "$no_cache" != 1; then - echo $ac_cv_use_fileproto >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_compat28" + if test "x$cache" = xyes; then + echo "WXWIN_COMPATIBILITY_2_8=$WXWIN_COMPATIBILITY_2_8" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_FILE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $WXWIN_COMPATIBILITY_2_8 = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$WXWIN_COMPATIBILITY_2_8 fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - enablestring= - { 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; + + + 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}-rpath" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6; } + # Check whether --enable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval=$enable_rpath; if test "$enableval" = yes; then - ac_cv_use_sockets='wxUSE_SOCKETS=yes' + wx_cv_use_rpath='wxUSE_RPATH=yes' else - ac_cv_use_sockets='wxUSE_SOCKETS=no' + wx_cv_use_rpath='wxUSE_RPATH=no' fi + cache=yes else - LINE=`grep "wxUSE_SOCKETS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_sockets='wxUSE_SOCKETS='$DEFAULT_wxUSE_SOCKETS + wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}" fi - eval "$ac_cv_use_sockets" - if test "$no_cache" != 1; then - echo $ac_cv_use_sockets >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_rpath" + if test "x$cache" = xyes; then + echo "wxUSE_RPATH=$wxUSE_RPATH" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SOCKETS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_RPATH = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_RPATH fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= - { 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; + 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}-objc_uniquifying" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C" >&6; } + # Check whether --enable-objc_uniquifying was given. +if test "${enable_objc_uniquifying+set}" = set; then + enableval=$enable_objc_uniquifying; if test "$enableval" = yes; then - ac_cv_use_ole='wxUSE_OLE=yes' + wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes' else - ac_cv_use_ole='wxUSE_OLE=no' + wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no' fi + cache=yes else - LINE=`grep "wxUSE_OLE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_ole='wxUSE_OLE='$DEFAULT_wxUSE_OLE + wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}" fi - eval "$ac_cv_use_ole" - if test "$no_cache" != 1; then - echo $ac_cv_use_ole >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_objc_uniquifying" + if test "x$cache" = xyes; then + echo "wxUSE_OBJC_UNIQUIFYING=$wxUSE_OBJC_UNIQUIFYING" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_OLE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_OBJC_UNIQUIFYING = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_OBJC_UNIQUIFYING fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - enablestring= - { 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; + + + 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}-visibility" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6; } + # Check whether --enable-visibility was given. +if test "${enable_visibility+set}" = set; then + enableval=$enable_visibility; if test "$enableval" = yes; then - ac_cv_use_dataobj='wxUSE_DATAOBJ=yes' + wx_cv_use_visibility='wxUSE_VISIBILITY=yes' else - ac_cv_use_dataobj='wxUSE_DATAOBJ=no' + wx_cv_use_visibility='wxUSE_VISIBILITY=no' fi + cache=yes else - LINE=`grep "wxUSE_DATAOBJ" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dataobj='wxUSE_DATAOBJ='$DEFAULT_wxUSE_DATAOBJ + wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}" fi - eval "$ac_cv_use_dataobj" - if test "$no_cache" != 1; then - echo $ac_cv_use_dataobj >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_visibility" + if test "x$cache" = xyes; then + echo "wxUSE_VISIBILITY=$wxUSE_VISIBILITY" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DATAOBJ" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_VISIBILITY = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_VISIBILITY fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= - { 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; + 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}-intl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6; } + # Check whether --enable-intl was given. +if test "${enable_intl+set}" = set; then + enableval=$enable_intl; if test "$enableval" = yes; then - ac_cv_use_ipc='wxUSE_IPC=yes' + wx_cv_use_intl='wxUSE_INTL=yes' else - ac_cv_use_ipc='wxUSE_IPC=no' + wx_cv_use_intl='wxUSE_INTL=no' fi + cache=yes else - LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC + wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}" fi - eval "$ac_cv_use_ipc" - if test "$no_cache" != 1; then - echo $ac_cv_use_ipc >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_intl" + if test "x$cache" = xyes; then + echo "wxUSE_INTL=$wxUSE_INTL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_IPC" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_INTL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_INTL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-config" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6; } + # Check whether --enable-config was given. +if test "${enable_config+set}" = set; then + enableval=$enable_config; if test "$enableval" = yes; then - ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes' + wx_cv_use_config='wxUSE_CONFIG=yes' else - ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' + wx_cv_use_config='wxUSE_CONFIG=no' fi + cache=yes else - LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE + wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}" fi - eval "$ac_cv_use_apple_ieee" - if test "$no_cache" != 1; then - echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_config" + if test "x$cache" = xyes; then + echo "wxUSE_CONFIG=$wxUSE_CONFIG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_APPLE_IEEE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CONFIG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CONFIG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= - { 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; + 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}-protocols" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6; } + # Check whether --enable-protocols was given. +if test "${enable_protocols+set}" = set; then + enableval=$enable_protocols; if test "$enableval" = yes; then - ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes' + wx_cv_use_protocols='wxUSE_PROTOCOL=yes' else - ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no' + wx_cv_use_protocols='wxUSE_PROTOCOL=no' fi + cache=yes else - LINE=`grep "wxUSE_ARCHIVE_STREAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS='$DEFAULT_wxUSE_ARCHIVE_STREAMS + wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi - eval "$ac_cv_use_arcstream" - if test "$no_cache" != 1; then - echo $ac_cv_use_arcstream >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_protocols" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ARCHIVE_STREAMS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PROTOCOL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-ftp" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6; } + # Check whether --enable-ftp was given. +if test "${enable_ftp+set}" = set; then + enableval=$enable_ftp; if test "$enableval" = yes; then - ac_cv_use_backtrace='wxUSE_STACKWALKER=yes' + wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=yes' else - ac_cv_use_backtrace='wxUSE_STACKWALKER=no' + wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no' fi + cache=yes else - LINE=`grep "wxUSE_STACKWALKER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_backtrace='wxUSE_STACKWALKER='$DEFAULT_wxUSE_STACKWALKER + wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi - eval "$ac_cv_use_backtrace" - if test "$no_cache" != 1; then - echo $ac_cv_use_backtrace >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_ftp" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STACKWALKER" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_FTP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PROTOCOL_FTP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-catch_segvs was given. -if test "${enable_catch_segvs+set}" = set; then - enableval=$enable_catch_segvs; + 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}-http" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6; } + # Check whether --enable-http was given. +if test "${enable_http+set}" = set; then + enableval=$enable_http; if test "$enableval" = yes; then - ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes' + wx_cv_use_http='wxUSE_PROTOCOL_HTTP=yes' else - ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' + wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no' fi + cache=yes else - LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION + wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi - eval "$ac_cv_use_catch_segvs" - if test "$no_cache" != 1; then - echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_http" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_HTTP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PROTOCOL_HTTP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-fileproto" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6; } + # Check whether --enable-fileproto was given. +if test "${enable_fileproto+set}" = set; then + enableval=$enable_fileproto; if test "$enableval" = yes; then - ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes' + wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=yes' else - ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' + wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no' fi + cache=yes else - LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER + wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi - eval "$ac_cv_use_cmdline" - if test "$no_cache" != 1; then - echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fileproto" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CMDLINE_PARSER" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_FILE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PROTOCOL_FILE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-sockets" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6; } + # Check whether --enable-sockets was given. +if test "${enable_sockets+set}" = set; then + enableval=$enable_sockets; if test "$enableval" = yes; then - ac_cv_use_datetime='wxUSE_DATETIME=yes' + wx_cv_use_sockets='wxUSE_SOCKETS=yes' else - ac_cv_use_datetime='wxUSE_DATETIME=no' + wx_cv_use_sockets='wxUSE_SOCKETS=no' fi + cache=yes else - LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME + wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}" fi - eval "$ac_cv_use_datetime" - if test "$no_cache" != 1; then - echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_sockets" + if test "x$cache" = xyes; then + echo "wxUSE_SOCKETS=$wxUSE_SOCKETS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DATETIME" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SOCKETS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SOCKETS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debugreport" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-debugreport was given. -if test "${enable_debugreport+set}" = set; then - enableval=$enable_debugreport; + 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}-ole" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6; } + # Check whether --enable-ole was given. +if test "${enable_ole+set}" = set; then + enableval=$enable_ole; if test "$enableval" = yes; then - ac_cv_use_debugreport='wxUSE_DEBUGREPORT=yes' + wx_cv_use_ole='wxUSE_OLE=yes' else - ac_cv_use_debugreport='wxUSE_DEBUGREPORT=no' + wx_cv_use_ole='wxUSE_OLE=no' fi + cache=yes else - LINE=`grep "wxUSE_DEBUGREPORT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_debugreport='wxUSE_DEBUGREPORT='$DEFAULT_wxUSE_DEBUGREPORT + wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}" fi - eval "$ac_cv_use_debugreport" - if test "$no_cache" != 1; then - echo $ac_cv_use_debugreport >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_ole" + if test "x$cache" = xyes; then + echo "wxUSE_OLE=$wxUSE_OLE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DEBUGREPORT" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_OLE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_OLE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-dataobj" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6; } + # Check whether --enable-dataobj was given. +if test "${enable_dataobj+set}" = set; then + enableval=$enable_dataobj; if test "$enableval" = yes; then - ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes' + wx_cv_use_dataobj='wxUSE_DATAOBJ=yes' else - ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' + wx_cv_use_dataobj='wxUSE_DATAOBJ=no' fi + cache=yes else - LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER + wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}" fi - eval "$ac_cv_use_dialupman" - if test "$no_cache" != 1; then - echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dataobj" + if test "x$cache" = xyes; then + echo "wxUSE_DATAOBJ=$wxUSE_DATAOBJ" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DIALUP_MANAGER" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DATAOBJ = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DATAOBJ fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= - { 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; + 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}-ipc" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6; } + # Check whether --enable-ipc was given. +if test "${enable_ipc+set}" = set; then + enableval=$enable_ipc; if test "$enableval" = yes; then - ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes' + wx_cv_use_ipc='wxUSE_IPC=yes' else - ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' + wx_cv_use_ipc='wxUSE_IPC=no' fi + cache=yes else - LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS + wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}" fi - eval "$ac_cv_use_dynlib" - if test "$no_cache" != 1; then - echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_ipc" + if test "x$cache" = xyes; then + echo "wxUSE_IPC=$wxUSE_IPC" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DYNLIB_CLASS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_IPC = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_IPC fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= - { 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; + 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 - ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes' + wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=yes' else - ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no' + wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no' fi + cache=yes else - LINE=`grep "wxUSE_DYNAMIC_LOADER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER='$DEFAULT_wxUSE_DYNAMIC_LOADER + wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}" fi - eval "$ac_cv_use_dynamicloader" - if test "$no_cache" != 1; then - echo $ac_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_baseevtloop" + if test "x$cache" = xyes; then + echo "wxUSE_CONSOLE_EVENTLOOP=$wxUSE_CONSOLE_EVENTLOOP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DYNAMIC_LOADER" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CONSOLE_EVENTLOOP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CONSOLE_EVENTLOOP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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 - ac_cv_use_exceptions='wxUSE_EXCEPTIONS=yes' + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=yes' else - ac_cv_use_exceptions='wxUSE_EXCEPTIONS=no' + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no' fi + cache=yes else - LINE=`grep "wxUSE_EXCEPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_exceptions='wxUSE_EXCEPTIONS='$DEFAULT_wxUSE_EXCEPTIONS + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" fi - eval "$ac_cv_use_exceptions" - if test "$no_cache" != 1; then - echo $ac_cv_use_exceptions >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_epollloop" + if test "x$cache" = xyes; then + echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_EXCEPTIONS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_EPOLL_DISPATCHER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_EPOLL_DISPATCHER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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 - ac_cv_use_ffile='wxUSE_FFILE=yes' + wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=yes' else - ac_cv_use_ffile='wxUSE_FFILE=no' + wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no' fi + cache=yes else - LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE + wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}" fi - eval "$ac_cv_use_ffile" - if test "$no_cache" != 1; then - echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_selectloop" + if test "x$cache" = xyes; then + echo "wxUSE_SELECT_DISPATCHER=$wxUSE_SELECT_DISPATCHER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FFILE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SELECT_DISPATCHER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SELECT_DISPATCHER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= - { 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; + 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}-apple_ieee" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6; } + # Check whether --enable-apple_ieee was given. +if test "${enable_apple_ieee+set}" = set; then + enableval=$enable_apple_ieee; if test "$enableval" = yes; then - ac_cv_use_file='wxUSE_FILE=yes' + wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes' else - ac_cv_use_file='wxUSE_FILE=no' + wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' fi + cache=yes else - LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE + wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}" fi - eval "$ac_cv_use_file" - if test "$no_cache" != 1; then - echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_apple_ieee" + if test "x$cache" = xyes; then + echo "wxUSE_APPLE_IEEE=$wxUSE_APPLE_IEEE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FILE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_APPLE_IEEE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_APPLE_IEEE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-arcstream" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6; } + # Check whether --enable-arcstream was given. +if test "${enable_arcstream+set}" = set; then + enableval=$enable_arcstream; if test "$enableval" = yes; then - ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes' + wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes' else - ac_cv_use_filesystem='wxUSE_FILESYSTEM=no' + wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no' fi + cache=yes else - LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM + wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}" fi - eval "$ac_cv_use_filesystem" - if test "$no_cache" != 1; then - echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_arcstream" + if test "x$cache" = xyes; then + echo "wxUSE_ARCHIVE_STREAMS=$wxUSE_ARCHIVE_STREAMS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FILESYSTEM" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_ARCHIVE_STREAMS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_ARCHIVE_STREAMS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-base64" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-base64... $ECHO_C" >&6; } + # Check whether --enable-base64 was given. +if test "${enable_base64+set}" = set; then + enableval=$enable_base64; if test "$enableval" = yes; then - ac_cv_use_fontmap='wxUSE_FONTMAP=yes' + wx_cv_use_base64='wxUSE_BASE64=yes' else - ac_cv_use_fontmap='wxUSE_FONTMAP=no' + wx_cv_use_base64='wxUSE_BASE64=no' fi + cache=yes else - LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP + wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}" fi - eval "$ac_cv_use_fontmap" - if test "$no_cache" != 1; then - echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_base64" + if test "x$cache" = xyes; then + echo "wxUSE_BASE64=$wxUSE_BASE64" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FONTMAP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_BASE64 = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_BASE64 fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-backtrace" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6; } + # Check whether --enable-backtrace was given. +if test "${enable_backtrace+set}" = set; then + enableval=$enable_backtrace; if test "$enableval" = yes; then - ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes' + wx_cv_use_backtrace='wxUSE_STACKWALKER=yes' else - ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no' + wx_cv_use_backtrace='wxUSE_STACKWALKER=no' fi + cache=yes else - LINE=`grep "wxUSE_FS_ARCHIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE='$DEFAULT_wxUSE_FS_ARCHIVE + wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}" fi - eval "$ac_cv_use_fs_archive" - if test "$no_cache" != 1; then - echo $ac_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_backtrace" + if test "x$cache" = xyes; then + echo "wxUSE_STACKWALKER=$wxUSE_STACKWALKER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FS_ARCHIVE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STACKWALKER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STACKWALKER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-catch_segvs" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6; } + # Check whether --enable-catch_segvs was given. +if test "${enable_catch_segvs+set}" = set; then + enableval=$enable_catch_segvs; if test "$enableval" = yes; then - ac_cv_use_fs_inet='wxUSE_FS_INET=yes' + wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes' else - ac_cv_use_fs_inet='wxUSE_FS_INET=no' + wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' fi + cache=yes else - LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET + wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}" fi - eval "$ac_cv_use_fs_inet" - if test "$no_cache" != 1; then - echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_catch_segvs" + if test "x$cache" = xyes; then + echo "wxUSE_ON_FATAL_EXCEPTION=$wxUSE_ON_FATAL_EXCEPTION" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FS_INET" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_ON_FATAL_EXCEPTION = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_ON_FATAL_EXCEPTION fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-cmdline" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6; } + # Check whether --enable-cmdline was given. +if test "${enable_cmdline+set}" = set; then + enableval=$enable_cmdline; if test "$enableval" = yes; then - ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes' + wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes' else - ac_cv_use_fs_zip='wxUSE_FS_ZIP=no' + wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' fi + cache=yes else - LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP + wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}" fi - eval "$ac_cv_use_fs_zip" - if test "$no_cache" != 1; then - echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_cmdline" + if test "x$cache" = xyes; then + echo "wxUSE_CMDLINE_PARSER=$wxUSE_CMDLINE_PARSER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FS_ZIP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CMDLINE_PARSER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CMDLINE_PARSER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-datetime" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6; } + # Check whether --enable-datetime was given. +if test "${enable_datetime+set}" = set; then + enableval=$enable_datetime; if test "$enableval" = yes; then - ac_cv_use_geometry='wxUSE_GEOMETRY=yes' + wx_cv_use_datetime='wxUSE_DATETIME=yes' else - ac_cv_use_geometry='wxUSE_GEOMETRY=no' + wx_cv_use_datetime='wxUSE_DATETIME=no' fi + cache=yes else - LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY + wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}" fi - eval "$ac_cv_use_geometry" - if test "$no_cache" != 1; then - echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_datetime" + if test "x$cache" = xyes; then + echo "wxUSE_DATETIME=$wxUSE_DATETIME" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GEOMETRY" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DATETIME = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DATETIME fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-debugreport" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6; } + # Check whether --enable-debugreport was given. +if test "${enable_debugreport+set}" = set; then + enableval=$enable_debugreport; if test "$enableval" = yes; then - ac_cv_use_log='wxUSE_LOG=yes' + wx_cv_use_debugreport='wxUSE_DEBUGREPORT=yes' else - ac_cv_use_log='wxUSE_LOG=no' + wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no' fi + cache=yes else - LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG + wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}" fi - eval "$ac_cv_use_log" - if test "$no_cache" != 1; then - echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_debugreport" + if test "x$cache" = xyes; then + echo "wxUSE_DEBUGREPORT=$wxUSE_DEBUGREPORT" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LOG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUGREPORT = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DEBUGREPORT fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-dialupman" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6; } + # Check whether --enable-dialupman was given. +if test "${enable_dialupman+set}" = set; then + enableval=$enable_dialupman; if test "$enableval" = yes; then - ac_cv_use_longlong='wxUSE_LONGLONG=yes' + wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes' else - ac_cv_use_longlong='wxUSE_LONGLONG=no' + wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' fi + cache=yes else - LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG + wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}" fi - eval "$ac_cv_use_longlong" - if test "$no_cache" != 1; then - echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dialupman" + if test "x$cache" = xyes; then + echo "wxUSE_DIALUP_MANAGER=$wxUSE_DIALUP_MANAGER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LONGLONG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DIALUP_MANAGER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DIALUP_MANAGER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-dynlib" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6; } + # Check whether --enable-dynlib was given. +if test "${enable_dynlib+set}" = set; then + enableval=$enable_dynlib; if test "$enableval" = yes; then - ac_cv_use_mimetype='wxUSE_MIMETYPE=yes' + wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes' else - ac_cv_use_mimetype='wxUSE_MIMETYPE=no' + wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' fi + cache=yes else - LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE + wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}" fi - eval "$ac_cv_use_mimetype" - if test "$no_cache" != 1; then - echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dynlib" + if test "x$cache" = xyes; then + echo "wxUSE_DYNLIB_CLASS=$wxUSE_DYNLIB_CLASS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MIMETYPE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DYNLIB_CLASS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DYNLIB_CLASS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-dynamicloader" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6; } + # Check whether --enable-dynamicloader was given. +if test "${enable_dynamicloader+set}" = set; then + enableval=$enable_dynamicloader; if test "$enableval" = yes; then - ac_cv_use_mslu='wxUSE_UNICODE_MSLU=yes' + wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes' else - ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no' + wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no' fi + cache=yes else - LINE=`grep "wxUSE_UNICODE_MSLU" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mslu='wxUSE_UNICODE_MSLU='$DEFAULT_wxUSE_UNICODE_MSLU + wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}" fi - eval "$ac_cv_use_mslu" - if test "$no_cache" != 1; then - echo $ac_cv_use_mslu >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dynamicloader" + if test "x$cache" = xyes; then + echo "wxUSE_DYNAMIC_LOADER=$wxUSE_DYNAMIC_LOADER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_UNICODE_MSLU" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DYNAMIC_LOADER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DYNAMIC_LOADER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-exceptions" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6; } + # Check whether --enable-exceptions was given. +if test "${enable_exceptions+set}" = set; then + enableval=$enable_exceptions; if test "$enableval" = yes; then - ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes' + wx_cv_use_exceptions='wxUSE_EXCEPTIONS=yes' else - ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no' + wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no' fi + cache=yes else - LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER + wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}" fi - eval "$ac_cv_use_snglinst" - if test "$no_cache" != 1; then - echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_exceptions" + if test "x$cache" = xyes; then + echo "wxUSE_EXCEPTIONS=$wxUSE_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SNGLINST_CHECKER" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_EXCEPTIONS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_EXCEPTIONS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-std_iostreams was given. -if test "${enable_std_iostreams+set}" = set; then - enableval=$enable_std_iostreams; + 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}-ffile" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6; } + # Check whether --enable-ffile was given. +if test "${enable_ffile+set}" = set; then + enableval=$enable_ffile; if test "$enableval" = yes; then - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' + wx_cv_use_ffile='wxUSE_FFILE=yes' else - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' + wx_cv_use_ffile='wxUSE_FFILE=no' fi + cache=yes else - LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM + wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}" fi - eval "$ac_cv_use_std_iostreams" - if test "$no_cache" != 1; then - echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_ffile" + if test "x$cache" = xyes; then + echo "wxUSE_FFILE=$wxUSE_FFILE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STD_IOSTREAM" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FFILE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FFILE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-file" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6; } + # Check whether --enable-file was given. +if test "${enable_file+set}" = set; then + enableval=$enable_file; if test "$enableval" = yes; then - ac_cv_use_std_string='wxUSE_STD_STRING=yes' + wx_cv_use_file='wxUSE_FILE=yes' else - ac_cv_use_std_string='wxUSE_STD_STRING=no' + wx_cv_use_file='wxUSE_FILE=no' fi + cache=yes else - LINE=`grep "wxUSE_STD_STRING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_std_string='wxUSE_STD_STRING='$DEFAULT_wxUSE_STD_STRING + wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}" fi - eval "$ac_cv_use_std_string" - if test "$no_cache" != 1; then - echo $ac_cv_use_std_string >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_file" + if test "x$cache" = xyes; then + echo "wxUSE_FILE=$wxUSE_FILE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STD_STRING" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FILE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-stdpaths was given. -if test "${enable_stdpaths+set}" = set; then - enableval=$enable_stdpaths; + 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}-filesystem" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6; } + # Check whether --enable-filesystem was given. +if test "${enable_filesystem+set}" = set; then + enableval=$enable_filesystem; if test "$enableval" = yes; then - ac_cv_use_stdpaths='wxUSE_STDPATHS=yes' + wx_cv_use_filesystem='wxUSE_FILESYSTEM=yes' else - ac_cv_use_stdpaths='wxUSE_STDPATHS=no' + wx_cv_use_filesystem='wxUSE_FILESYSTEM=no' fi + cache=yes else - LINE=`grep "wxUSE_STDPATHS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_stdpaths='wxUSE_STDPATHS='$DEFAULT_wxUSE_STDPATHS + wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}" fi - eval "$ac_cv_use_stdpaths" - if test "$no_cache" != 1; then - echo $ac_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_filesystem" + if test "x$cache" = xyes; then + echo "wxUSE_FILESYSTEM=$wxUSE_FILESYSTEM" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STDPATHS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILESYSTEM = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FILESYSTEM fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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 - ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes' + wx_cv_use_fontenum='wxUSE_FONTENUM=yes' else - ac_cv_use_stopwatch='wxUSE_STOPWATCH=no' + wx_cv_use_fontenum='wxUSE_FONTENUM=no' fi + cache=yes else - LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH + wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}" fi - eval "$ac_cv_use_stopwatch" - if test "$no_cache" != 1; then - echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fontenum" + if test "x$cache" = xyes; then + echo "wxUSE_FONTENUM=$wxUSE_FONTENUM" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STOPWATCH" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FONTENUM = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FONTENUM fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-streams was given. -if test "${enable_streams+set}" = set; then - enableval=$enable_streams; + 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}-fontmap" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6; } + # Check whether --enable-fontmap was given. +if test "${enable_fontmap+set}" = set; then + enableval=$enable_fontmap; if test "$enableval" = yes; then - ac_cv_use_streams='wxUSE_STREAMS=yes' + wx_cv_use_fontmap='wxUSE_FONTMAP=yes' else - ac_cv_use_streams='wxUSE_STREAMS=no' + wx_cv_use_fontmap='wxUSE_FONTMAP=no' fi + cache=yes else - LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS + wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}" fi - eval "$ac_cv_use_streams" - if test "$no_cache" != 1; then - echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fontmap" + if test "x$cache" = xyes; then + echo "wxUSE_FONTMAP=$wxUSE_FONTMAP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STREAMS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FONTMAP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FONTMAP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-fs_archive" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6; } + # Check whether --enable-fs_archive was given. +if test "${enable_fs_archive+set}" = set; then + enableval=$enable_fs_archive; if test "$enableval" = yes; then - ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes' + wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes' else - ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no' + wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no' fi + cache=yes else - LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS + wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}" fi - eval "$ac_cv_use_system_options" - if test "$no_cache" != 1; then - echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fs_archive" + if test "x$cache" = xyes; then + echo "wxUSE_FS_ARCHIVE=$wxUSE_FS_ARCHIVE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SYSTEM_OPTIONS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FS_ARCHIVE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FS_ARCHIVE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-fs_inet" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6; } + # Check whether --enable-fs_inet was given. +if test "${enable_fs_inet+set}" = set; then + enableval=$enable_fs_inet; if test "$enableval" = yes; then - ac_cv_use_tarstream='wxUSE_TARSTREAM=yes' + wx_cv_use_fs_inet='wxUSE_FS_INET=yes' else - ac_cv_use_tarstream='wxUSE_TARSTREAM=no' + wx_cv_use_fs_inet='wxUSE_FS_INET=no' fi + cache=yes else - LINE=`grep "wxUSE_TARSTREAM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tarstream='wxUSE_TARSTREAM='$DEFAULT_wxUSE_TARSTREAM + wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}" fi - eval "$ac_cv_use_tarstream" - if test "$no_cache" != 1; then - echo $ac_cv_use_tarstream >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fs_inet" + if test "x$cache" = xyes; then + echo "wxUSE_FS_INET=$wxUSE_FS_INET" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TARSTREAM" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FS_INET = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FS_INET fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-fs_zip" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6; } + # Check whether --enable-fs_zip was given. +if test "${enable_fs_zip+set}" = set; then + enableval=$enable_fs_zip; if test "$enableval" = yes; then - ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes' + wx_cv_use_fs_zip='wxUSE_FS_ZIP=yes' else - ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no' + wx_cv_use_fs_zip='wxUSE_FS_ZIP=no' fi + cache=yes else - LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER + wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}" fi - eval "$ac_cv_use_textbuf" - if test "$no_cache" != 1; then - echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fs_zip" + if test "x$cache" = xyes; then + echo "wxUSE_FS_ZIP=$wxUSE_FS_ZIP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TEXTBUFFER" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FS_ZIP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FS_ZIP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-geometry" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6; } + # Check whether --enable-geometry was given. +if test "${enable_geometry+set}" = set; then + enableval=$enable_geometry; if test "$enableval" = yes; then - ac_cv_use_textfile='wxUSE_TEXTFILE=yes' + wx_cv_use_geometry='wxUSE_GEOMETRY=yes' else - ac_cv_use_textfile='wxUSE_TEXTFILE=no' + wx_cv_use_geometry='wxUSE_GEOMETRY=no' fi + cache=yes else - LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE + wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}" fi - eval "$ac_cv_use_textfile" - if test "$no_cache" != 1; then - echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_geometry" + if test "x$cache" = xyes; then + echo "wxUSE_GEOMETRY=$wxUSE_GEOMETRY" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TEXTFILE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_GEOMETRY = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_GEOMETRY fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-log" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6; } + # Check whether --enable-log was given. +if test "${enable_log+set}" = set; then + enableval=$enable_log; if test "$enableval" = yes; then - ac_cv_use_timer='wxUSE_TIMER=yes' + wx_cv_use_log='wxUSE_LOG=yes' else - ac_cv_use_timer='wxUSE_TIMER=no' + wx_cv_use_log='wxUSE_LOG=no' fi + cache=yes else - LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER + wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}" fi - eval "$ac_cv_use_timer" - if test "$no_cache" != 1; then - echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_log" + if test "x$cache" = xyes; then + echo "wxUSE_LOG=$wxUSE_LOG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TIMER" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_LOG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LOG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-longlong" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6; } + # Check whether --enable-longlong was given. +if test "${enable_longlong+set}" = set; then + enableval=$enable_longlong; if test "$enableval" = yes; then - ac_cv_use_unicode='wxUSE_UNICODE=yes' + wx_cv_use_longlong='wxUSE_LONGLONG=yes' else - ac_cv_use_unicode='wxUSE_UNICODE=no' + wx_cv_use_longlong='wxUSE_LONGLONG=no' fi + cache=yes else - LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE + wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}" fi - eval "$ac_cv_use_unicode" - if test "$no_cache" != 1; then - echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_longlong" + if test "x$cache" = xyes; then + echo "wxUSE_LONGLONG=$wxUSE_LONGLONG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_UNICODE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_LONGLONG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LONGLONG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-mimetype" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6; } + # Check whether --enable-mimetype was given. +if test "${enable_mimetype+set}" = set; then + enableval=$enable_mimetype; if test "$enableval" = yes; then - ac_cv_use_sound='wxUSE_SOUND=yes' + wx_cv_use_mimetype='wxUSE_MIMETYPE=yes' else - ac_cv_use_sound='wxUSE_SOUND=no' + wx_cv_use_mimetype='wxUSE_MIMETYPE=no' fi + cache=yes else - LINE=`grep "wxUSE_SOUND" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_sound='wxUSE_SOUND='$DEFAULT_wxUSE_SOUND + wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}" fi - eval "$ac_cv_use_sound" - if test "$no_cache" != 1; then - echo $ac_cv_use_sound >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mimetype" + if test "x$cache" = xyes; then + echo "wxUSE_MIMETYPE=$wxUSE_MIMETYPE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SOUND" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MIMETYPE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_MIMETYPE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-snglinst" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6; } + # Check whether --enable-snglinst was given. +if test "${enable_snglinst+set}" = set; then + enableval=$enable_snglinst; if test "$enableval" = yes; then - ac_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' + wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes' else - ac_cv_use_mediactrl='wxUSE_MEDIACTRL=no' + wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no' fi + cache=yes else - LINE=`grep "wxUSE_MEDIACTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mediactrl='wxUSE_MEDIACTRL='$DEFAULT_wxUSE_MEDIACTRL + wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}" fi - eval "$ac_cv_use_mediactrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_mediactrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_snglinst" + if test "x$cache" = xyes; then + echo "wxUSE_SNGLINST_CHECKER=$wxUSE_SNGLINST_CHECKER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MEDIACTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SNGLINST_CHECKER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SNGLINST_CHECKER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-stdpaths" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6; } + # Check whether --enable-stdpaths was given. +if test "${enable_stdpaths+set}" = set; then + enableval=$enable_stdpaths; if test "$enableval" = yes; then - ac_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes' + wx_cv_use_stdpaths='wxUSE_STDPATHS=yes' else - ac_cv_use_gstreamer8='wxUSE_GSTREAMER8=no' + wx_cv_use_stdpaths='wxUSE_STDPATHS=no' fi + cache=yes else - LINE=`grep "wxUSE_GSTREAMER8" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gstreamer8='wxUSE_GSTREAMER8='$DEFAULT_wxUSE_GSTREAMER8 + wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}" fi - eval "$ac_cv_use_gstreamer8" - if test "$no_cache" != 1; then - echo $ac_cv_use_gstreamer8 >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_stdpaths" + if test "x$cache" = xyes; then + echo "wxUSE_STDPATHS=$wxUSE_STDPATHS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GSTREAMER8" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STDPATHS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STDPATHS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-stopwatch" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6; } + # Check whether --enable-stopwatch was given. +if test "${enable_stopwatch+set}" = set; then + enableval=$enable_stopwatch; if test "$enableval" = yes; then - ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes' + wx_cv_use_stopwatch='wxUSE_STOPWATCH=yes' else - ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' + wx_cv_use_stopwatch='wxUSE_STOPWATCH=no' fi + cache=yes else - LINE=`grep "wxUSE_PRINTF_POS_PARAMS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS='$DEFAULT_wxUSE_PRINTF_POS_PARAMS + wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}" fi - eval "$ac_cv_use_printfposparam" - if test "$no_cache" != 1; then - echo $ac_cv_use_printfposparam >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_stopwatch" + if test "x$cache" = xyes; then + echo "wxUSE_STOPWATCH=$wxUSE_STOPWATCH" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PRINTF_POS_PARAMS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STOPWATCH = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STOPWATCH fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-streams" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6; } + # Check whether --enable-streams was given. +if test "${enable_streams+set}" = set; then + enableval=$enable_streams; if test "$enableval" = yes; then - ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes' + wx_cv_use_streams='wxUSE_STREAMS=yes' else - ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no' + wx_cv_use_streams='wxUSE_STREAMS=no' fi + cache=yes else - LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM + wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}" fi - eval "$ac_cv_use_zipstream" - if test "$no_cache" != 1; then - echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_streams" + if test "x$cache" = xyes; then + echo "wxUSE_STREAMS=$wxUSE_STREAMS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ZIPSTREAM" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STREAMS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STREAMS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-system_options" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6; } + # Check whether --enable-system_options was given. +if test "${enable_system_options+set}" = set; then + enableval=$enable_system_options; if test "$enableval" = yes; then - ac_cv_use_url='wxUSE_URL=yes' + wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes' else - ac_cv_use_url='wxUSE_URL=no' + wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no' fi + cache=yes else - LINE=`grep "wxUSE_URL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_url='wxUSE_URL='$DEFAULT_wxUSE_URL + wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" fi - eval "$ac_cv_use_url" - if test "$no_cache" != 1; then - echo $ac_cv_use_url >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_system_options" + if test "x$cache" = xyes; then + echo "wxUSE_SYSTEM_OPTIONS=$wxUSE_SYSTEM_OPTIONS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_URL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SYSTEM_OPTIONS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SYSTEM_OPTIONS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-tarstream" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6; } + # Check whether --enable-tarstream was given. +if test "${enable_tarstream+set}" = set; then + enableval=$enable_tarstream; if test "$enableval" = yes; then - ac_cv_use_variant='wxUSE_VARIANT=yes' + wx_cv_use_tarstream='wxUSE_TARSTREAM=yes' else - ac_cv_use_variant='wxUSE_VARIANT=no' + wx_cv_use_tarstream='wxUSE_TARSTREAM=no' fi + cache=yes else - LINE=`grep "wxUSE_VARIANT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_variant='wxUSE_VARIANT='$DEFAULT_wxUSE_VARIANT + wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}" fi - eval "$ac_cv_use_variant" - if test "$no_cache" != 1; then - echo $ac_cv_use_variant >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tarstream" + if test "x$cache" = xyes; then + echo "wxUSE_TARSTREAM=$wxUSE_TARSTREAM" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_VARIANT" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TARSTREAM = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TARSTREAM fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-textbuf" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6; } + # Check whether --enable-textbuf was given. +if test "${enable_textbuf+set}" = set; then + enableval=$enable_textbuf; if test "$enableval" = yes; then - ac_cv_use_protocol='wxUSE_PROTOCOL=yes' + wx_cv_use_textbuf='wxUSE_TEXTBUFFER=yes' else - ac_cv_use_protocol='wxUSE_PROTOCOL=no' + wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_protocol='wxUSE_PROTOCOL='$DEFAULT_wxUSE_PROTOCOL + wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}" fi - eval "$ac_cv_use_protocol" - if test "$no_cache" != 1; then - echo $ac_cv_use_protocol >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_textbuf" + if test "x$cache" = xyes; then + echo "wxUSE_TEXTBUFFER=$wxUSE_TEXTBUFFER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TEXTBUFFER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TEXTBUFFER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-textfile" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6; } + # Check whether --enable-textfile was given. +if test "${enable_textfile+set}" = set; then + enableval=$enable_textfile; if test "$enableval" = yes; then - ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes' + wx_cv_use_textfile='wxUSE_TEXTFILE=yes' else - ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no' + wx_cv_use_textfile='wxUSE_TEXTFILE=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_HTTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP='$DEFAULT_wxUSE_PROTOCOL_HTTP + wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}" fi - eval "$ac_cv_use_protocol_http" - if test "$no_cache" != 1; then - echo $ac_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_textfile" + if test "x$cache" = xyes; then + echo "wxUSE_TEXTFILE=$wxUSE_TEXTFILE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_HTTP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TEXTFILE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TEXTFILE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-timer" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6; } + # Check whether --enable-timer was given. +if test "${enable_timer+set}" = set; then + enableval=$enable_timer; if test "$enableval" = yes; then - ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes' + wx_cv_use_timer='wxUSE_TIMER=yes' else - ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no' + wx_cv_use_timer='wxUSE_TIMER=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_FTP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP='$DEFAULT_wxUSE_PROTOCOL_FTP + wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}" fi - eval "$ac_cv_use_protocol_ftp" - if test "$no_cache" != 1; then - echo $ac_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_timer" + if test "x$cache" = xyes; then + echo "wxUSE_TIMER=$wxUSE_TIMER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_FTP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TIMER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TIMER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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 - ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes' + wx_cv_use_sound='wxUSE_SOUND=yes' else - ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no' + wx_cv_use_sound='wxUSE_SOUND=no' fi + cache=yes else - LINE=`grep "wxUSE_PROTOCOL_FILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_protocol_file='wxUSE_PROTOCOL_FILE='$DEFAULT_wxUSE_PROTOCOL_FILE + wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" fi - eval "$ac_cv_use_protocol_file" - if test "$no_cache" != 1; then - echo $ac_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_sound" + if test "x$cache" = xyes; then + echo "wxUSE_SOUND=$wxUSE_SOUND" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROTOCOL_FILE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SOUND = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SOUND fi - - + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; } + # Check whether --enable-mediactrl was given. +if test "${enable_mediactrl+set}" = set; then + enableval=$enable_mediactrl; if test "$enableval" = yes; then - ac_cv_use_threads='wxUSE_THREADS=yes' + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' else - ac_cv_use_threads='wxUSE_THREADS=no' + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" fi - eval "$ac_cv_use_threads" - if test "$no_cache" != 1; then - echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mediactrl" + if test "x$cache" = xyes; then + echo "wxUSE_MEDIACTRL=$wxUSE_MEDIACTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_THREADS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MEDIACTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_MEDIACTRL fi - -if test "$wxUSE_GUI" = "yes"; then - + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; } + # Check whether --enable-gstreamer8 was given. +if test "${enable_gstreamer8+set}" = set; then + enableval=$enable_gstreamer8; if test "$enableval" = yes; then - ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes' + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes' else - ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no' fi + cache=yes else - LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" fi - eval "$ac_cv_use_docview" - if test "$no_cache" != 1; then - echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gstreamer8" + if test "x$cache" = xyes; then + echo "wxUSE_GSTREAMER8=$wxUSE_GSTREAMER8" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_GSTREAMER8 = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_GSTREAMER8 fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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 - ac_cv_use_help='wxUSE_HELP=yes' + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes' else - ac_cv_use_help='wxUSE_HELP=no' + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' fi + cache=yes else - LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" fi - eval "$ac_cv_use_help" - if test "$no_cache" != 1; then - echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_printfposparam" + if test "x$cache" = xyes; then + echo "wxUSE_PRINTF_POS_PARAMS=$wxUSE_PRINTF_POS_PARAMS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_HELP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PRINTF_POS_PARAMS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PRINTF_POS_PARAMS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-zipstream" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6; } + # Check whether --enable-zipstream was given. +if test "${enable_zipstream+set}" = set; then + enableval=$enable_zipstream; if test "$enableval" = yes; then - ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes' + wx_cv_use_zipstream='wxUSE_ZIPSTREAM=yes' else - ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' + wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no' fi + cache=yes else - LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP + wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}" fi - eval "$ac_cv_use_mshtmlhelp" - if test "$no_cache" != 1; then - echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_zipstream" + if test "x$cache" = xyes; then + echo "wxUSE_ZIPSTREAM=$wxUSE_ZIPSTREAM" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MS_HTML_HELP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_ZIPSTREAM = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_ZIPSTREAM fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= - { 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; + 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}-url" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6; } + # Check whether --enable-url was given. +if test "${enable_url+set}" = set; then + enableval=$enable_url; if test "$enableval" = yes; then - ac_cv_use_html='wxUSE_HTML=yes' + wx_cv_use_url='wxUSE_URL=yes' else - ac_cv_use_html='wxUSE_HTML=no' + wx_cv_use_url='wxUSE_URL=no' fi + cache=yes else - LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML + wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}" fi - eval "$ac_cv_use_html" - if test "$no_cache" != 1; then - echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_url" + if test "x$cache" = xyes; then + echo "wxUSE_URL=$wxUSE_URL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_HTML" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_URL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_URL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; } + # Check whether --enable-variant was given. +if test "${enable_variant+set}" = set; then + enableval=$enable_variant; if test "$enableval" = yes; then - ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes' + wx_cv_use_variant='wxUSE_VARIANT=yes' else - ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' + wx_cv_use_variant='wxUSE_VARIANT=no' fi + cache=yes else - LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP + wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" fi - eval "$ac_cv_use_htmlhelp" - if test "$no_cache" != 1; then - echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_variant" + if test "x$cache" = xyes; then + echo "wxUSE_VARIANT=$wxUSE_VARIANT" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_WXHTML_HELP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_VARIANT = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_VARIANT fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-protocol" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6; } + # Check whether --enable-protocol was given. +if test "${enable_protocol+set}" = set; then + enableval=$enable_protocol; if test "$enableval" = yes; then - ac_cv_use_xrc='wxUSE_XRC=yes' + wx_cv_use_protocol='wxUSE_PROTOCOL=yes' else - ac_cv_use_xrc='wxUSE_XRC=no' + wx_cv_use_protocol='wxUSE_PROTOCOL=no' fi + cache=yes else - LINE=`grep "wxUSE_XRC" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_xrc='wxUSE_XRC='$DEFAULT_wxUSE_XRC + wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi - eval "$ac_cv_use_xrc" - if test "$no_cache" != 1; then - echo $ac_cv_use_xrc >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_protocol" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_XRC" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PROTOCOL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-protocol_http" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >&6; } + # Check whether --enable-protocol_http was given. +if test "${enable_protocol_http+set}" = set; then + enableval=$enable_protocol_http; if test "$enableval" = yes; then - ac_cv_use_aui='wxUSE_AUI=yes' + wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=yes' else - ac_cv_use_aui='wxUSE_AUI=no' + wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no' fi + cache=yes else - LINE=`grep "wxUSE_AUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_aui='wxUSE_AUI='$DEFAULT_wxUSE_AUI + wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi - eval "$ac_cv_use_aui" - if test "$no_cache" != 1; then - echo $ac_cv_use_aui >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_protocol_http" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_AUI" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_HTTP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PROTOCOL_HTTP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-protocol_ftp" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&6; } + # Check whether --enable-protocol_ftp was given. +if test "${enable_protocol_ftp+set}" = set; then + enableval=$enable_protocol_ftp; if test "$enableval" = yes; then - ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes' + wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=yes' else - ac_cv_use_constraints='wxUSE_CONSTRAINTS=no' + wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no' fi + cache=yes else - LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS + wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi - eval "$ac_cv_use_constraints" - if test "$no_cache" != 1; then - echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_protocol_ftp" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CONSTRAINTS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_FTP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PROTOCOL_FTP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-protocol_file" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >&6; } + # Check whether --enable-protocol_file was given. +if test "${enable_protocol_file+set}" = set; then + enableval=$enable_protocol_file; if test "$enableval" = yes; then - ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' + wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=yes' else - ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' + wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no' fi + cache=yes else - LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE + wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi - eval "$ac_cv_use_printarch" - if test "$no_cache" != 1; then - echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_protocol_file" + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROTOCOL_FILE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PROTOCOL_FILE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= - { 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; + 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}-threads" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6; } + # Check whether --enable-threads was given. +if test "${enable_threads+set}" = set; then + enableval=$enable_threads; if test "$enableval" = yes; then - ac_cv_use_mdi='wxUSE_MDI=yes' + wx_cv_use_threads='wxUSE_THREADS=yes' else - ac_cv_use_mdi='wxUSE_MDI=no' + wx_cv_use_threads='wxUSE_THREADS=no' fi + cache=yes else - LINE=`grep "wxUSE_MDI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mdi='wxUSE_MDI='$DEFAULT_wxUSE_MDI + wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}" fi - eval "$ac_cv_use_mdi" - if test "$no_cache" != 1; then - echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_threads" + if test "x$cache" = xyes; then + echo "wxUSE_THREADS=$wxUSE_THREADS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MDI" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_THREADS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_THREADS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= - { 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; + 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 - ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes' + wx_cv_use_iniconf='wxUSE_INICONF=yes' else - ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' + wx_cv_use_iniconf='wxUSE_INICONF=no' fi + cache=yes else - LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE + wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}" fi - eval "$ac_cv_use_mdidoc" - if test "$no_cache" != 1; then - echo $ac_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_iniconf" + if test "x$cache" = xyes; then + echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MDI_ARCHITECTURE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_INICONF = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_INICONF fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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 - ac_cv_use_loggui='wxUSE_LOGGUI=yes' + wx_cv_use_regkey='wxUSE_REGKEY=yes' else - ac_cv_use_loggui='wxUSE_LOGGUI=no' + wx_cv_use_regkey='wxUSE_REGKEY=no' fi + cache=yes else - LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI + wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}" fi - eval "$ac_cv_use_loggui" - if test "$no_cache" != 1; then - echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_regkey" + if test "x$cache" = xyes; then + echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LOGGUI" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_REGKEY = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_REGKEY fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + +if test "$wxUSE_GUI" = "yes"; then + + enablestring= - { 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; + 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}-docview" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6; } + # Check whether --enable-docview was given. +if test "${enable_docview+set}" = set; then + enableval=$enable_docview; if test "$enableval" = yes; then - ac_cv_use_logwin='wxUSE_LOGWINDOW=yes' + wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes' else - ac_cv_use_logwin='wxUSE_LOGWINDOW=no' + wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' fi + cache=yes else - LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW + wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}" fi - eval "$ac_cv_use_logwin" - if test "$no_cache" != 1; then - echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_docview" + if test "x$cache" = xyes; then + echo "wxUSE_DOC_VIEW_ARCHITECTURE=$wxUSE_DOC_VIEW_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LOGWINDOW" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DOC_VIEW_ARCHITECTURE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-help" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6; } + # Check whether --enable-help was given. +if test "${enable_help+set}" = set; then + enableval=$enable_help; if test "$enableval" = yes; then - ac_cv_use_logdialog='wxUSE_LOGDIALOG=yes' + wx_cv_use_help='wxUSE_HELP=yes' else - ac_cv_use_logdialog='wxUSE_LOGDIALOG=no' + wx_cv_use_help='wxUSE_HELP=no' fi + cache=yes else - LINE=`grep "wxUSE_LOGDIALOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_logdialog='wxUSE_LOGDIALOG='$DEFAULT_wxUSE_LOGDIALOG + wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}" fi - eval "$ac_cv_use_logdialog" - if test "$no_cache" != 1; then - echo $ac_cv_use_logdialog >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_help" + if test "x$cache" = xyes; then + echo "wxUSE_HELP=$wxUSE_HELP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LOGDIALOG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_HELP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_HELP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-mshtmlhelp" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6; } + # Check whether --enable-mshtmlhelp was given. +if test "${enable_mshtmlhelp+set}" = set; then + enableval=$enable_mshtmlhelp; if test "$enableval" = yes; then - ac_cv_use_webkit='wxUSE_WEBKIT=yes' + wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes' else - ac_cv_use_webkit='wxUSE_WEBKIT=no' + wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' fi + cache=yes else - LINE=`grep "wxUSE_WEBKIT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_webkit='wxUSE_WEBKIT='$DEFAULT_wxUSE_WEBKIT + wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}" fi - eval "$ac_cv_use_webkit" - if test "$no_cache" != 1; then - echo $ac_cv_use_webkit >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mshtmlhelp" + if test "x$cache" = xyes; then + echo "wxUSE_MS_HTML_HELP=$wxUSE_MS_HTML_HELP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_WEBKIT" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MS_HTML_HELP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_MS_HTML_HELP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-html" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6; } + # Check whether --enable-html was given. +if test "${enable_html+set}" = set; then + enableval=$enable_html; if test "$enableval" = yes; then - ac_cv_use_richtext='wxUSE_RICHTEXT=yes' + wx_cv_use_html='wxUSE_HTML=yes' else - ac_cv_use_richtext='wxUSE_RICHTEXT=no' + wx_cv_use_html='wxUSE_HTML=no' fi + cache=yes else - LINE=`grep "wxUSE_RICHTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_richtext='wxUSE_RICHTEXT='$DEFAULT_wxUSE_RICHTEXT + wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}" fi - eval "$ac_cv_use_richtext" - if test "$no_cache" != 1; then - echo $ac_cv_use_richtext >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_html" + if test "x$cache" = xyes; then + echo "wxUSE_HTML=$wxUSE_HTML" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_RICHTEXT" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_HTML = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_HTML fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-htmlhelp" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6; } + # Check whether --enable-htmlhelp was given. +if test "${enable_htmlhelp+set}" = set; then + enableval=$enable_htmlhelp; if test "$enableval" = yes; then - ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' + wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes' else - ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' + wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' fi + cache=yes else - LINE=`grep "wxUSE_GRAPHICS_CONTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT='$DEFAULT_wxUSE_GRAPHICS_CONTEXT + wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}" fi - eval "$ac_cv_use_graphics_ctx" - if test "$no_cache" != 1; then - echo $ac_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_htmlhelp" + if test "x$cache" = xyes; then + echo "wxUSE_WXHTML_HELP=$wxUSE_WXHTML_HELP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GRAPHICS_CONTEXT" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_WXHTML_HELP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_WXHTML_HELP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-xrc" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6; } + # Check whether --enable-xrc was given. +if test "${enable_xrc+set}" = set; then + enableval=$enable_xrc; if test "$enableval" = yes; then - ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes' + wx_cv_use_xrc='wxUSE_XRC=yes' else - ac_cv_use_postscript='wxUSE_POSTSCRIPT=no' + wx_cv_use_xrc='wxUSE_XRC=no' fi + cache=yes else - LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT + wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}" fi - eval "$ac_cv_use_postscript" - if test "$no_cache" != 1; then - echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_xrc" + if test "x$cache" = xyes; then + echo "wxUSE_XRC=$wxUSE_XRC" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_POSTSCRIPT" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_XRC = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_XRC fi - - + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-prologio" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-prologio... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-prologio was given. -if test "${enable_prologio+set}" = set; then - enableval=$enable_prologio; + 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}-aui" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6; } + # Check whether --enable-aui was given. +if test "${enable_aui+set}" = set; then + enableval=$enable_aui; if test "$enableval" = yes; then - ac_cv_use_prologio='wxUSE_PROLOGIO=yes' + wx_cv_use_aui='wxUSE_AUI=yes' else - ac_cv_use_prologio='wxUSE_PROLOGIO=no' + wx_cv_use_aui='wxUSE_AUI=no' fi + cache=yes else - LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO + wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}" fi - eval "$ac_cv_use_prologio" - if test "$no_cache" != 1; then - echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_aui" + if test "x$cache" = xyes; then + echo "wxUSE_AUI=$wxUSE_AUI" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROLOGIO" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_AUI = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_AUI fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-resources" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-resources... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-resources was given. -if test "${enable_resources+set}" = set; then - enableval=$enable_resources; + 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}-stc" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; } + # Check whether --enable-stc was given. +if test "${enable_stc+set}" = set; then + enableval=$enable_stc; if test "$enableval" = yes; then - ac_cv_use_resources='wxUSE_RESOURCES=yes' + wx_cv_use_stc='wxUSE_STC=yes' else - ac_cv_use_resources='wxUSE_RESOURCES=no' + wx_cv_use_stc='wxUSE_STC=no' fi + cache=yes else - LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES + wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}" fi - eval "$ac_cv_use_resources" - if test "$no_cache" != 1; then - echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_stc" + if test "x$cache" = xyes; then + echo "wxUSE_STC=$wxUSE_STC" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_RESOURCES" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STC = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STC fi - + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-constraints" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6; } + # Check whether --enable-constraints was given. +if test "${enable_constraints+set}" = set; then + enableval=$enable_constraints; if test "$enableval" = yes; then - ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes' + wx_cv_use_constraints='wxUSE_CONSTRAINTS=yes' else - ac_cv_use_clipboard='wxUSE_CLIPBOARD=no' + wx_cv_use_constraints='wxUSE_CONSTRAINTS=no' fi + cache=yes else - LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD + wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}" fi - eval "$ac_cv_use_clipboard" - if test "$no_cache" != 1; then - echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_constraints" + if test "x$cache" = xyes; then + echo "wxUSE_CONSTRAINTS=$wxUSE_CONSTRAINTS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CLIPBOARD" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CONSTRAINTS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CONSTRAINTS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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 - ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes' + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' else - ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no' + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' fi + cache=yes else - LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" fi - eval "$ac_cv_use_dnd" - if test "$no_cache" != 1; then - echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_printarch" + if test "x$cache" = xyes; then + echo "wxUSE_PRINTING_ARCHITECTURE=$wxUSE_PRINTING_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DRAG_AND_DROP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PRINTING_ARCHITECTURE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PRINTING_ARCHITECTURE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-mdi" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; } + # Check whether --enable-mdi was given. +if test "${enable_mdi+set}" = set; then + enableval=$enable_mdi; if test "$enableval" = yes; then - ac_cv_use_metafile='wxUSE_METAFILE=yes' + wx_cv_use_mdi='wxUSE_MDI=yes' else - ac_cv_use_metafile='wxUSE_METAFILE=no' + wx_cv_use_mdi='wxUSE_MDI=no' fi + cache=yes else - LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE + wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" fi - eval "$ac_cv_use_metafile" - if test "$no_cache" != 1; then - echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mdi" + if test "x$cache" = xyes; then + echo "wxUSE_MDI=$wxUSE_MDI" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_METAFILE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MDI = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_MDI fi - - + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-mdidoc" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; } + # Check whether --enable-mdidoc was given. +if test "${enable_mdidoc+set}" = set; then + enableval=$enable_mdidoc; if test "$enableval" = yes; then - ac_cv_use_controls='wxUSE_CONTROLS=yes' + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes' else - ac_cv_use_controls='wxUSE_CONTROLS=no' + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' fi + cache=yes else - LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" fi - eval "$ac_cv_use_controls" - if test "$no_cache" != 1; then - echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mdidoc" + if test "x$cache" = xyes; then + echo "wxUSE_MDI_ARCHITECTURE=$wxUSE_MDI_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CONTROLS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MDI_ARCHITECTURE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_MDI_ARCHITECTURE fi - -if test "$wxUSE_CONTROLS" = "yes"; then - DEFAULT_wxUSE_ACCEL=yes - DEFAULT_wxUSE_ANIMATIONCTRL=yes - DEFAULT_wxUSE_BMPBUTTON=yes - DEFAULT_wxUSE_BUTTON=yes - DEFAULT_wxUSE_CALCTRL=yes - DEFAULT_wxUSE_CARET=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_CHECKBOX=yes - DEFAULT_wxUSE_CHECKLISTBOX=yes - DEFAULT_wxUSE_CHOICE=yes - DEFAULT_wxUSE_CHOICEBOOK=yes - DEFAULT_wxUSE_COLLPANE=yes - DEFAULT_wxUSE_COLOURPICKERCTRL=yes - DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_DATEPICKCTRL=yes - DEFAULT_wxUSE_DISPLAY=yes - DEFAULT_wxUSE_DETECT_SM=yes - DEFAULT_wxUSE_DIRPICKERCTRL=yes - DEFAULT_wxUSE_FILEPICKERCTRL=yes - DEFAULT_wxUSE_FONTPICKERCTRL=yes - DEFAULT_wxUSE_GAUGE=yes - DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_HYPERLINKCTRL=yes - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=yes - DEFAULT_wxUSE_LISTBOOK=yes - DEFAULT_wxUSE_LISTBOX=yes - DEFAULT_wxUSE_LISTCTRL=yes - DEFAULT_wxUSE_NOTEBOOK=yes - DEFAULT_wxUSE_RADIOBOX=yes - DEFAULT_wxUSE_RADIOBTN=yes - DEFAULT_wxUSE_SASH=yes - DEFAULT_wxUSE_SCROLLBAR=yes - DEFAULT_wxUSE_SEARCHCTRL=yes - DEFAULT_wxUSE_SLIDER=yes - DEFAULT_wxUSE_SPINBTN=yes - DEFAULT_wxUSE_SPINCTRL=yes - DEFAULT_wxUSE_SPLITTER=yes - DEFAULT_wxUSE_STATBMP=yes - DEFAULT_wxUSE_STATBOX=yes - DEFAULT_wxUSE_STATLINE=yes - DEFAULT_wxUSE_STATUSBAR=yes - DEFAULT_wxUSE_TAB_DIALOG=yes - DEFAULT_wxUSE_TOGGLEBTN=yes - DEFAULT_wxUSE_TOOLBAR=yes - DEFAULT_wxUSE_TOOLBAR_NATIVE=yes - DEFAULT_wxUSE_TOOLTIPS=yes - DEFAULT_wxUSE_TREEBOOK=yes - DEFAULT_wxUSE_TOOLBOOK=yes - DEFAULT_wxUSE_TREECTRL=yes - DEFAULT_wxUSE_POPUPWIN=yes - DEFAULT_wxUSE_TIPWINDOW=yes -elif test "$wxUSE_CONTROLS" = "no"; then - DEFAULT_wxUSE_ACCEL=no - DEFAULT_wxUSE_ANIMATIONCTRL=no - DEFAULT_wxUSE_BMPBUTTON=no - DEFAULT_wxUSE_BUTTON=no - DEFAULT_wxUSE_CALCTRL=no - DEFAULT_wxUSE_CARET=no - DEFAULT_wxUSE_COLLPANE=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_CHECKBOX=no - DEFAULT_wxUSE_CHECKLISTBOX=no - DEFAULT_wxUSE_CHOICE=no - DEFAULT_wxUSE_CHOICEBOOK=no - DEFAULT_wxUSE_COLOURPICKERCTRL=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_DATEPICKCTRL=no - DEFAULT_wxUSE_DISPLAY=no - DEFAULT_wxUSE_DETECT_SM=no - DEFAULT_wxUSE_DIRPICKERCTRL=no - DEFAULT_wxUSE_FILEPICKERCTRL=no - DEFAULT_wxUSE_FONTPICKERCTRL=no - DEFAULT_wxUSE_GAUGE=no - DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_HYPERLINKCTRL=no - DEFAULT_wxUSE_DATAVIEWCTRL=no - DEFAULT_wxUSE_IMAGLIST=no - DEFAULT_wxUSE_LISTBOOK=no - DEFAULT_wxUSE_LISTBOX=no - DEFAULT_wxUSE_LISTCTRL=no - DEFAULT_wxUSE_NOTEBOOK=no - DEFAULT_wxUSE_RADIOBOX=no - DEFAULT_wxUSE_RADIOBTN=no - DEFAULT_wxUSE_SASH=no - DEFAULT_wxUSE_SCROLLBAR=no - DEFAULT_wxUSE_SEARCHCTRL=no - DEFAULT_wxUSE_SLIDER=no - DEFAULT_wxUSE_SPINBTN=no - DEFAULT_wxUSE_SPINCTRL=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_STATBMP=no - DEFAULT_wxUSE_STATBOX=no - DEFAULT_wxUSE_STATLINE=no - DEFAULT_wxUSE_STATUSBAR=no - DEFAULT_wxUSE_TAB_DIALOG=no - DEFAULT_wxUSE_TOGGLEBTN=no - DEFAULT_wxUSE_TOOLBAR=no - DEFAULT_wxUSE_TOOLBAR_NATIVE=no - DEFAULT_wxUSE_TOOLTIPS=no - DEFAULT_wxUSE_TREEBOOK=no - DEFAULT_wxUSE_TOOLBOOK=no - DEFAULT_wxUSE_TREECTRL=no - DEFAULT_wxUSE_POPUPWIN=no - DEFAULT_wxUSE_TIPWINDOW=no -fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-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 - ac_cv_use_accel='wxUSE_ACCEL=yes' + wx_cv_use_loggui='wxUSE_LOGGUI=yes' else - ac_cv_use_accel='wxUSE_ACCEL=no' + wx_cv_use_loggui='wxUSE_LOGGUI=no' fi + cache=yes else - LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL + wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" fi - eval "$ac_cv_use_accel" - if test "$no_cache" != 1; then - echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_loggui" + if test "x$cache" = xyes; then + echo "wxUSE_LOGGUI=$wxUSE_LOGGUI" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ACCEL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_LOGGUI = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LOGGUI fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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 - ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes' + wx_cv_use_logwin='wxUSE_LOGWINDOW=yes' else - ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no' + wx_cv_use_logwin='wxUSE_LOGWINDOW=no' fi + cache=yes else - LINE=`grep "wxUSE_ANIMATIONCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_animatectrl='wxUSE_ANIMATIONCTRL='$DEFAULT_wxUSE_ANIMATIONCTRL + wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" fi - eval "$ac_cv_use_animatectrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_logwin" + if test "x$cache" = xyes; then + echo "wxUSE_LOGWINDOW=$wxUSE_LOGWINDOW" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ANIMATIONCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_LOGWINDOW = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LOGWINDOW fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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 - ac_cv_use_button='wxUSE_BUTTON=yes' + wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes' else - ac_cv_use_button='wxUSE_BUTTON=no' + wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' fi + cache=yes else - LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON + wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" fi - eval "$ac_cv_use_button" - if test "$no_cache" != 1; then - echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_logdialog" + if test "x$cache" = xyes; then + echo "wxUSE_LOGDIALOG=$wxUSE_LOGDIALOG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BUTTON" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_LOGDIALOG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LOGDIALOG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-webkit" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; } + # Check whether --enable-webkit was given. +if test "${enable_webkit+set}" = set; then + enableval=$enable_webkit; if test "$enableval" = yes; then - ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' + wx_cv_use_webkit='wxUSE_WEBKIT=yes' else - ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' + wx_cv_use_webkit='wxUSE_WEBKIT=no' fi + cache=yes else - LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON + wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" fi - eval "$ac_cv_use_bmpbutton" - if test "$no_cache" != 1; then - echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_webkit" + if test "x$cache" = xyes; then + echo "wxUSE_WEBKIT=$wxUSE_WEBKIT" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BMPBUTTON" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_WEBKIT = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_WEBKIT fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - enablestring= - { 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; - if test "$enableval" = yes; then - ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes' - else - ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' - fi -else + 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}-richtext" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6; } + # Check whether --enable-richtext was given. +if test "${enable_richtext+set}" = set; then + enableval=$enable_richtext; + if test "$enableval" = yes; then + wx_cv_use_richtext='wxUSE_RICHTEXT=yes' + else + wx_cv_use_richtext='wxUSE_RICHTEXT=no' + fi + cache=yes + +else - LINE=`grep "wxUSE_BITMAPCOMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX='$DEFAULT_wxUSE_BITMAPCOMBOBOX + wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}" fi - eval "$ac_cv_use_bmpcombobox" - if test "$no_cache" != 1; then - echo $ac_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_richtext" + if test "x$cache" = xyes; then + echo "wxUSE_RICHTEXT=$wxUSE_RICHTEXT" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BITMAPCOMBOBOX" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_RICHTEXT = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_RICHTEXT fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; } + # Check whether --enable-graphics_ctx was given. +if test "${enable_graphics_ctx+set}" = set; then + enableval=$enable_graphics_ctx; if test "$enableval" = yes; then - ac_cv_use_calendar='wxUSE_CALCTRL=yes' + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' else - ac_cv_use_calendar='wxUSE_CALCTRL=no' + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' fi + cache=yes else - LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL + wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" fi - eval "$ac_cv_use_calendar" - if test "$no_cache" != 1; then - echo $ac_cv_use_calendar >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_graphics_ctx" + if test "x$cache" = xyes; then + echo "wxUSE_GRAPHICS_CONTEXT=$wxUSE_GRAPHICS_CONTEXT" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CALCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_GRAPHICS_CONTEXT = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_GRAPHICS_CONTEXT fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-postscript" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; } + # Check whether --enable-postscript was given. +if test "${enable_postscript+set}" = set; then + enableval=$enable_postscript; if test "$enableval" = yes; then - ac_cv_use_caret='wxUSE_CARET=yes' + wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes' else - ac_cv_use_caret='wxUSE_CARET=no' + wx_cv_use_postscript='wxUSE_POSTSCRIPT=no' fi + cache=yes else - LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET + wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" fi - eval "$ac_cv_use_caret" - if test "$no_cache" != 1; then - echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_postscript" + if test "x$cache" = xyes; then + echo "wxUSE_POSTSCRIPT=$wxUSE_POSTSCRIPT" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CARET" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_POSTSCRIPT = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_POSTSCRIPT fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-svg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; } + # Check whether --enable-svg was given. +if test "${enable_svg+set}" = set; then + enableval=$enable_svg; if test "$enableval" = yes; then - ac_cv_use_checkbox='wxUSE_CHECKBOX=yes' + wx_cv_use_svg='wxUSE_SVG=yes' else - ac_cv_use_checkbox='wxUSE_CHECKBOX=no' + wx_cv_use_svg='wxUSE_SVG=no' fi + cache=yes else - LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX + wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" fi - eval "$ac_cv_use_checkbox" - if test "$no_cache" != 1; then - echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_svg" + if test "x$cache" = xyes; then + echo "wxUSE_SVG=$wxUSE_SVG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CHECKBOX" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SVG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SVG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= - { 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; + 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}-clipboard" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6; } + # Check whether --enable-clipboard was given. +if test "${enable_clipboard+set}" = set; then + enableval=$enable_clipboard; if test "$enableval" = yes; then - ac_cv_use_checklst='wxUSE_CHECKLST=yes' + wx_cv_use_clipboard='wxUSE_CLIPBOARD=yes' else - ac_cv_use_checklst='wxUSE_CHECKLST=no' + wx_cv_use_clipboard='wxUSE_CLIPBOARD=no' fi + cache=yes else - LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST + wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}" fi - eval "$ac_cv_use_checklst" - if test "$no_cache" != 1; then - echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_clipboard" + if test "x$cache" = xyes; then + echo "wxUSE_CLIPBOARD=$wxUSE_CLIPBOARD" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CHECKLST" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CLIPBOARD = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CLIPBOARD fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-dnd" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6; } + # Check whether --enable-dnd was given. +if test "${enable_dnd+set}" = set; then + enableval=$enable_dnd; if test "$enableval" = yes; then - ac_cv_use_choice='wxUSE_CHOICE=yes' + wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes' else - ac_cv_use_choice='wxUSE_CHOICE=no' + wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no' fi + cache=yes else - LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE + wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}" fi - eval "$ac_cv_use_choice" - if test "$no_cache" != 1; then - echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dnd" + if test "x$cache" = xyes; then + echo "wxUSE_DRAG_AND_DROP=$wxUSE_DRAG_AND_DROP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CHOICE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DRAG_AND_DROP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DRAG_AND_DROP fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-metafile" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; } + # Check whether --enable-metafile was given. +if test "${enable_metafile+set}" = set; then + enableval=$enable_metafile; if test "$enableval" = yes; then - ac_cv_use_choicebook='wxUSE_CHOICEBOOK=yes' + wx_cv_use_metafile='wxUSE_METAFILE=yes' else - ac_cv_use_choicebook='wxUSE_CHOICEBOOK=no' + wx_cv_use_metafile='wxUSE_METAFILE=no' fi + cache=yes else - LINE=`grep "wxUSE_CHOICEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_choicebook='wxUSE_CHOICEBOOK='$DEFAULT_wxUSE_CHOICEBOOK + wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" fi - eval "$ac_cv_use_choicebook" - if test "$no_cache" != 1; then - echo $ac_cv_use_choicebook >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_metafile" + if test "x$cache" = xyes; then + echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CHOICEBOOK" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_METAFILE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_METAFILE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - enablestring= - { 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; + + +DEFAULT_wxUSE_CONTROLS=none + + 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}-controls" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6; } + # Check whether --enable-controls was given. +if test "${enable_controls+set}" = set; then + enableval=$enable_controls; if test "$enableval" = yes; then - ac_cv_use_collpane='wxUSE_COLLPANE=yes' + wx_cv_use_controls='wxUSE_CONTROLS=yes' else - ac_cv_use_collpane='wxUSE_COLLPANE=no' + wx_cv_use_controls='wxUSE_CONTROLS=no' fi + cache=yes else - LINE=`grep "wxUSE_COLLPANE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_collpane='wxUSE_COLLPANE='$DEFAULT_wxUSE_COLLPANE + wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}" fi - eval "$ac_cv_use_collpane" - if test "$no_cache" != 1; then - echo $ac_cv_use_collpane >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_controls" + if test "x$cache" = xyes; then + echo "wxUSE_CONTROLS=$wxUSE_CONTROLS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COLLPANE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CONTROLS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CONTROLS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + +if test "$wxUSE_CONTROLS" = "yes"; then + DEFAULT_wxUSE_ACCEL=yes + DEFAULT_wxUSE_ANIMATIONCTRL=yes + DEFAULT_wxUSE_BMPBUTTON=yes + DEFAULT_wxUSE_BUTTON=yes + DEFAULT_wxUSE_CALCTRL=yes + DEFAULT_wxUSE_CARET=yes + DEFAULT_wxUSE_COMBOBOX=yes + DEFAULT_wxUSE_CHECKBOX=yes + DEFAULT_wxUSE_CHECKLISTBOX=yes + DEFAULT_wxUSE_CHOICE=yes + DEFAULT_wxUSE_CHOICEBOOK=yes + DEFAULT_wxUSE_COLLPANE=yes + DEFAULT_wxUSE_COLOURPICKERCTRL=yes + DEFAULT_wxUSE_COMBOBOX=yes + DEFAULT_wxUSE_DATEPICKCTRL=yes + DEFAULT_wxUSE_DISPLAY=yes + DEFAULT_wxUSE_DETECT_SM=yes + DEFAULT_wxUSE_DIRPICKERCTRL=yes + DEFAULT_wxUSE_FILECTRL=yes + DEFAULT_wxUSE_FILEPICKERCTRL=yes + DEFAULT_wxUSE_FONTPICKERCTRL=yes + DEFAULT_wxUSE_GAUGE=yes + DEFAULT_wxUSE_GRID=yes + DEFAULT_wxUSE_HYPERLINKCTRL=yes + DEFAULT_wxUSE_DATAVIEWCTRL=no + DEFAULT_wxUSE_IMAGLIST=yes + DEFAULT_wxUSE_LISTBOOK=yes + DEFAULT_wxUSE_LISTBOX=yes + DEFAULT_wxUSE_LISTCTRL=yes + DEFAULT_wxUSE_NOTEBOOK=yes + DEFAULT_wxUSE_RADIOBOX=yes + DEFAULT_wxUSE_RADIOBTN=yes + DEFAULT_wxUSE_SASH=yes + DEFAULT_wxUSE_SCROLLBAR=yes + DEFAULT_wxUSE_SEARCHCTRL=yes + DEFAULT_wxUSE_SLIDER=yes + DEFAULT_wxUSE_SPINBTN=yes + DEFAULT_wxUSE_SPINCTRL=yes + DEFAULT_wxUSE_SPLITTER=yes + DEFAULT_wxUSE_STATBMP=yes + DEFAULT_wxUSE_STATBOX=yes + DEFAULT_wxUSE_STATLINE=yes + DEFAULT_wxUSE_STATUSBAR=yes + DEFAULT_wxUSE_TAB_DIALOG=yes + DEFAULT_wxUSE_TOGGLEBTN=yes + DEFAULT_wxUSE_TOOLBAR=yes + DEFAULT_wxUSE_TOOLBAR_NATIVE=yes + DEFAULT_wxUSE_TOOLTIPS=yes + DEFAULT_wxUSE_TREEBOOK=yes + DEFAULT_wxUSE_TOOLBOOK=yes + DEFAULT_wxUSE_TREECTRL=yes + DEFAULT_wxUSE_POPUPWIN=yes + DEFAULT_wxUSE_TIPWINDOW=yes +elif test "$wxUSE_CONTROLS" = "no"; then + DEFAULT_wxUSE_ACCEL=no + DEFAULT_wxUSE_ANIMATIONCTRL=no + DEFAULT_wxUSE_BMPBUTTON=no + DEFAULT_wxUSE_BUTTON=no + DEFAULT_wxUSE_CALCTRL=no + DEFAULT_wxUSE_CARET=no + DEFAULT_wxUSE_COLLPANE=no + DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_CHECKBOX=no + DEFAULT_wxUSE_CHECKLISTBOX=no + DEFAULT_wxUSE_CHOICE=no + DEFAULT_wxUSE_CHOICEBOOK=no + DEFAULT_wxUSE_COLOURPICKERCTRL=no + DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_DATEPICKCTRL=no + DEFAULT_wxUSE_DISPLAY=no + DEFAULT_wxUSE_DETECT_SM=no + DEFAULT_wxUSE_DIRPICKERCTRL=no + DEFAULT_wxUSE_FILECTRL=no + DEFAULT_wxUSE_FILEPICKERCTRL=no + DEFAULT_wxUSE_FONTPICKERCTRL=no + DEFAULT_wxUSE_GAUGE=no + DEFAULT_wxUSE_GRID=no + DEFAULT_wxUSE_HYPERLINKCTRL=no + DEFAULT_wxUSE_DATAVIEWCTRL=no + DEFAULT_wxUSE_IMAGLIST=no + DEFAULT_wxUSE_LISTBOOK=no + DEFAULT_wxUSE_LISTBOX=no + DEFAULT_wxUSE_LISTCTRL=no + DEFAULT_wxUSE_NOTEBOOK=no + DEFAULT_wxUSE_RADIOBOX=no + DEFAULT_wxUSE_RADIOBTN=no + DEFAULT_wxUSE_SASH=no + DEFAULT_wxUSE_SCROLLBAR=no + DEFAULT_wxUSE_SEARCHCTRL=no + DEFAULT_wxUSE_SLIDER=no + DEFAULT_wxUSE_SPINBTN=no + DEFAULT_wxUSE_SPINCTRL=no + DEFAULT_wxUSE_SPLITTER=no + DEFAULT_wxUSE_STATBMP=no + DEFAULT_wxUSE_STATBOX=no + DEFAULT_wxUSE_STATLINE=no + DEFAULT_wxUSE_STATUSBAR=no + DEFAULT_wxUSE_TAB_DIALOG=no + DEFAULT_wxUSE_TOGGLEBTN=no + DEFAULT_wxUSE_TOOLBAR=no + DEFAULT_wxUSE_TOOLBAR_NATIVE=no + DEFAULT_wxUSE_TOOLTIPS=no + DEFAULT_wxUSE_TREEBOOK=no + DEFAULT_wxUSE_TOOLBOOK=no + DEFAULT_wxUSE_TREECTRL=no + DEFAULT_wxUSE_POPUPWIN=no + DEFAULT_wxUSE_TIPWINDOW=no +fi + enablestring= - { 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; + 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}-accel" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6; } + # Check whether --enable-accel was given. +if test "${enable_accel+set}" = set; then + enableval=$enable_accel; if test "$enableval" = yes; then - ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes' + wx_cv_use_accel='wxUSE_ACCEL=yes' else - ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no' + wx_cv_use_accel='wxUSE_ACCEL=no' fi + cache=yes else - LINE=`grep "wxUSE_COLOURPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL='$DEFAULT_wxUSE_COLOURPICKERCTRL + wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}" fi - eval "$ac_cv_use_colourpicker" - if test "$no_cache" != 1; then - echo $ac_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_accel" + if test "x$cache" = xyes; then + echo "wxUSE_ACCEL=$wxUSE_ACCEL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COLOURPICKERCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_ACCEL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_ACCEL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-animatectrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6; } + # Check whether --enable-animatectrl was given. +if test "${enable_animatectrl+set}" = set; then + enableval=$enable_animatectrl; if test "$enableval" = yes; then - ac_cv_use_combobox='wxUSE_COMBOBOX=yes' + wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=yes' else - ac_cv_use_combobox='wxUSE_COMBOBOX=no' + wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX + wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}" fi - eval "$ac_cv_use_combobox" - if test "$no_cache" != 1; then - echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_animatectrl" + if test "x$cache" = xyes; then + echo "wxUSE_ANIMATIONCTRL=$wxUSE_ANIMATIONCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COMBOBOX" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_ANIMATIONCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_ANIMATIONCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-button" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; } + # Check whether --enable-button was given. +if test "${enable_button+set}" = set; then + enableval=$enable_button; if test "$enableval" = yes; then - ac_cv_use_comboctrl='wxUSE_COMBOCTRL=yes' + wx_cv_use_button='wxUSE_BUTTON=yes' else - ac_cv_use_comboctrl='wxUSE_COMBOCTRL=no' + wx_cv_use_button='wxUSE_BUTTON=no' fi + cache=yes else - LINE=`grep "wxUSE_COMBOCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_comboctrl='wxUSE_COMBOCTRL='$DEFAULT_wxUSE_COMBOCTRL + wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" fi - eval "$ac_cv_use_comboctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_button" + if test "x$cache" = xyes; then + echo "wxUSE_BUTTON=$wxUSE_BUTTON" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COMBOCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_BUTTON = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_BUTTON fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-datepick was given. -if test "${enable_datepick+set}" = set; then - enableval=$enable_datepick; + 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}-bmpbutton" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; } + # Check whether --enable-bmpbutton was given. +if test "${enable_bmpbutton+set}" = set; then + enableval=$enable_bmpbutton; if test "$enableval" = yes; then - ac_cv_use_datepick='wxUSE_DATEPICKCTRL=yes' + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' else - ac_cv_use_datepick='wxUSE_DATEPICKCTRL=no' + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' fi + cache=yes else - LINE=`grep "wxUSE_DATEPICKCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_datepick='wxUSE_DATEPICKCTRL='$DEFAULT_wxUSE_DATEPICKCTRL + wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" fi - eval "$ac_cv_use_datepick" - if test "$no_cache" != 1; then - echo $ac_cv_use_datepick >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_bmpbutton" + if test "x$cache" = xyes; then + echo "wxUSE_BMPBUTTON=$wxUSE_BMPBUTTON" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DATEPICKCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_BMPBUTTON = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_BMPBUTTON fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-bmpcombobox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; } + # Check whether --enable-bmpcombobox was given. +if test "${enable_bmpcombobox+set}" = set; then + enableval=$enable_bmpcombobox; if test "$enableval" = yes; then - ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes' + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes' else - ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_DIRPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dirpicker='wxUSE_DIRPICKERCTRL='$DEFAULT_wxUSE_DIRPICKERCTRL + wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" fi - eval "$ac_cv_use_dirpicker" - if test "$no_cache" != 1; then - echo $ac_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_bmpcombobox" + if test "x$cache" = xyes; then + echo "wxUSE_BITMAPCOMBOBOX=$wxUSE_BITMAPCOMBOBOX" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DIRPICKERCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_BITMAPCOMBOBOX = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_BITMAPCOMBOBOX fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-calendar" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6; } + # Check whether --enable-calendar was given. +if test "${enable_calendar+set}" = set; then + enableval=$enable_calendar; if test "$enableval" = yes; then - ac_cv_use_display='wxUSE_DISPLAY=yes' + wx_cv_use_calendar='wxUSE_CALCTRL=yes' else - ac_cv_use_display='wxUSE_DISPLAY=no' + wx_cv_use_calendar='wxUSE_CALCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_DISPLAY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_display='wxUSE_DISPLAY='$DEFAULT_wxUSE_DISPLAY + wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}" fi - eval "$ac_cv_use_display" - if test "$no_cache" != 1; then - echo $ac_cv_use_display >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_calendar" + if test "x$cache" = xyes; then + echo "wxUSE_CALCTRL=$wxUSE_CALCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DISPLAY" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CALCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CALCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-caret" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6; } + # Check whether --enable-caret was given. +if test "${enable_caret+set}" = set; then + enableval=$enable_caret; if test "$enableval" = yes; then - ac_cv_use_detect_sm='wxUSE_DETECT_SM=yes' + wx_cv_use_caret='wxUSE_CARET=yes' else - ac_cv_use_detect_sm='wxUSE_DETECT_SM=no' + wx_cv_use_caret='wxUSE_CARET=no' fi + cache=yes else - LINE=`grep "wxUSE_DETECT_SM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_detect_sm='wxUSE_DETECT_SM='$DEFAULT_wxUSE_DETECT_SM + wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}" fi - eval "$ac_cv_use_detect_sm" - if test "$no_cache" != 1; then - echo $ac_cv_use_detect_sm >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_caret" + if test "x$cache" = xyes; then + echo "wxUSE_CARET=$wxUSE_CARET" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DETECT_SM" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CARET = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CARET fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-checkbox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6; } + # Check whether --enable-checkbox was given. +if test "${enable_checkbox+set}" = set; then + enableval=$enable_checkbox; if test "$enableval" = yes; then - ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes' + wx_cv_use_checkbox='wxUSE_CHECKBOX=yes' else - ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' + wx_cv_use_checkbox='wxUSE_CHECKBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_FILEPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_filepicker='wxUSE_FILEPICKERCTRL='$DEFAULT_wxUSE_FILEPICKERCTRL + wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}" fi - eval "$ac_cv_use_filepicker" - if test "$no_cache" != 1; then - echo $ac_cv_use_filepicker >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_checkbox" + if test "x$cache" = xyes; then + echo "wxUSE_CHECKBOX=$wxUSE_CHECKBOX" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FILEPICKERCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CHECKBOX = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CHECKBOX fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-checklst" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6; } + # Check whether --enable-checklst was given. +if test "${enable_checklst+set}" = set; then + enableval=$enable_checklst; if test "$enableval" = yes; then - ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes' + wx_cv_use_checklst='wxUSE_CHECKLST=yes' else - ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no' + wx_cv_use_checklst='wxUSE_CHECKLST=no' fi + cache=yes else - LINE=`grep "wxUSE_FONTPICKERCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fontpicker='wxUSE_FONTPICKERCTRL='$DEFAULT_wxUSE_FONTPICKERCTRL + wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}" fi - eval "$ac_cv_use_fontpicker" - if test "$no_cache" != 1; then - echo $ac_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_checklst" + if test "x$cache" = xyes; then + echo "wxUSE_CHECKLST=$wxUSE_CHECKLST" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FONTPICKERCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CHECKLST = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CHECKLST fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-choice" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6; } + # Check whether --enable-choice was given. +if test "${enable_choice+set}" = set; then + enableval=$enable_choice; if test "$enableval" = yes; then - ac_cv_use_gauge='wxUSE_GAUGE=yes' + wx_cv_use_choice='wxUSE_CHOICE=yes' else - ac_cv_use_gauge='wxUSE_GAUGE=no' + wx_cv_use_choice='wxUSE_CHOICE=no' fi + cache=yes else - LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE + wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}" fi - eval "$ac_cv_use_gauge" - if test "$no_cache" != 1; then - echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_choice" + if test "x$cache" = xyes; then + echo "wxUSE_CHOICE=$wxUSE_CHOICE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GAUGE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CHOICE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CHOICE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-choicebook" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6; } + # Check whether --enable-choicebook was given. +if test "${enable_choicebook+set}" = set; then + enableval=$enable_choicebook; if test "$enableval" = yes; then - ac_cv_use_grid='wxUSE_GRID=yes' + wx_cv_use_choicebook='wxUSE_CHOICEBOOK=yes' else - ac_cv_use_grid='wxUSE_GRID=no' + wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no' fi + cache=yes else - LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID + wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}" fi - eval "$ac_cv_use_grid" - if test "$no_cache" != 1; then - echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_choicebook" + if test "x$cache" = xyes; then + echo "wxUSE_CHOICEBOOK=$wxUSE_CHOICEBOOK" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GRID" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CHOICEBOOK = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CHOICEBOOK fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-collpane" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6; } + # Check whether --enable-collpane was given. +if test "${enable_collpane+set}" = set; then + enableval=$enable_collpane; if test "$enableval" = yes; then - ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' + wx_cv_use_collpane='wxUSE_COLLPANE=yes' else - ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' + wx_cv_use_collpane='wxUSE_COLLPANE=no' fi + cache=yes else - LINE=`grep "wxUSE_DATAVIEWCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL='$DEFAULT_wxUSE_DATAVIEWCTRL + wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}" fi - eval "$ac_cv_use_dataviewctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_collpane" + if test "x$cache" = xyes; then + echo "wxUSE_COLLPANE=$wxUSE_COLLPANE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DATAVIEWCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_COLLPANE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_COLLPANE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-colourpicker" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&6; } + # Check whether --enable-colourpicker was given. +if test "${enable_colourpicker+set}" = set; then + enableval=$enable_colourpicker; if test "$enableval" = yes; then - ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes' + wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=yes' else - ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no' + wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_HYPERLINKCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_hyperlink='wxUSE_HYPERLINKCTRL='$DEFAULT_wxUSE_HYPERLINKCTRL + wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}" fi - eval "$ac_cv_use_hyperlink" - if test "$no_cache" != 1; then - echo $ac_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_colourpicker" + if test "x$cache" = xyes; then + echo "wxUSE_COLOURPICKERCTRL=$wxUSE_COLOURPICKERCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_HYPERLINKCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_COLOURPICKERCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_COLOURPICKERCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-combobox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6; } + # Check whether --enable-combobox was given. +if test "${enable_combobox+set}" = set; then + enableval=$enable_combobox; if test "$enableval" = yes; then - ac_cv_use_imaglist='wxUSE_IMAGLIST=yes' + wx_cv_use_combobox='wxUSE_COMBOBOX=yes' else - ac_cv_use_imaglist='wxUSE_IMAGLIST=no' + wx_cv_use_combobox='wxUSE_COMBOBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST + wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}" fi - eval "$ac_cv_use_imaglist" - if test "$no_cache" != 1; then - echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_combobox" + if test "x$cache" = xyes; then + echo "wxUSE_COMBOBOX=$wxUSE_COMBOBOX" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_IMAGLIST" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_COMBOBOX = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_COMBOBOX fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-comboctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6; } + # Check whether --enable-comboctrl was given. +if test "${enable_comboctrl+set}" = set; then + enableval=$enable_comboctrl; if test "$enableval" = yes; then - ac_cv_use_listbook='wxUSE_LISTBOOK=yes' + wx_cv_use_comboctrl='wxUSE_COMBOCTRL=yes' else - ac_cv_use_listbook='wxUSE_LISTBOOK=no' + wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_LISTBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_listbook='wxUSE_LISTBOOK='$DEFAULT_wxUSE_LISTBOOK + wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}" fi - eval "$ac_cv_use_listbook" - if test "$no_cache" != 1; then - echo $ac_cv_use_listbook >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_comboctrl" + if test "x$cache" = xyes; then + echo "wxUSE_COMBOCTRL=$wxUSE_COMBOCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LISTBOOK" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_COMBOCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_COMBOCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-datepick" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; } + # Check whether --enable-datepick was given. +if test "${enable_datepick+set}" = set; then + enableval=$enable_datepick; if test "$enableval" = yes; then - ac_cv_use_listbox='wxUSE_LISTBOX=yes' + wx_cv_use_datepick='wxUSE_DATEPICKCTRL=yes' else - ac_cv_use_listbox='wxUSE_LISTBOX=no' + wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX + wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" fi - eval "$ac_cv_use_listbox" - if test "$no_cache" != 1; then - echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_datepick" + if test "x$cache" = xyes; then + echo "wxUSE_DATEPICKCTRL=$wxUSE_DATEPICKCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LISTBOX" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DATEPICKCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DATEPICKCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-dirpicker" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; } + # Check whether --enable-dirpicker was given. +if test "${enable_dirpicker+set}" = set; then + enableval=$enable_dirpicker; if test "$enableval" = yes; then - ac_cv_use_listctrl='wxUSE_LISTCTRL=yes' + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=yes' else - ac_cv_use_listctrl='wxUSE_LISTCTRL=no' + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL + wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" fi - eval "$ac_cv_use_listctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dirpicker" + if test "x$cache" = xyes; then + echo "wxUSE_DIRPICKERCTRL=$wxUSE_DIRPICKERCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LISTCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DIRPICKERCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DIRPICKERCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-display" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; } + # Check whether --enable-display was given. +if test "${enable_display+set}" = set; then + enableval=$enable_display; if test "$enableval" = yes; then - ac_cv_use_notebook='wxUSE_NOTEBOOK=yes' + wx_cv_use_display='wxUSE_DISPLAY=yes' else - ac_cv_use_notebook='wxUSE_NOTEBOOK=no' + wx_cv_use_display='wxUSE_DISPLAY=no' fi + cache=yes else - LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK + wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" fi - eval "$ac_cv_use_notebook" - if test "$no_cache" != 1; then - echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_display" + if test "x$cache" = xyes; then + echo "wxUSE_DISPLAY=$wxUSE_DISPLAY" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NOTEBOOK" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DISPLAY = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DISPLAY fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; } + # Check whether --enable-detect_sm was given. +if test "${enable_detect_sm+set}" = set; then + enableval=$enable_detect_sm; if test "$enableval" = yes; then - ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes' + wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes' else - ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no' + wx_cv_use_detect_sm='wxUSE_DETECT_SM=no' fi + cache=yes else - LINE=`grep "wxUSE_ODCOMBOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_odcombobox='wxUSE_ODCOMBOBOX='$DEFAULT_wxUSE_ODCOMBOBOX + wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" fi - eval "$ac_cv_use_odcombobox" - if test "$no_cache" != 1; then - echo $ac_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_detect_sm" + if test "x$cache" = xyes; then + echo "wxUSE_DETECT_SM=$wxUSE_DETECT_SM" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ODCOMBOBOX" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DETECT_SM = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DETECT_SM fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6; } + # Check whether --enable-editablebox was given. +if test "${enable_editablebox+set}" = set; then + enableval=$enable_editablebox; if test "$enableval" = yes; then - ac_cv_use_radiobox='wxUSE_RADIOBOX=yes' + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=yes' else - ac_cv_use_radiobox='wxUSE_RADIOBOX=no' + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX + wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" fi - eval "$ac_cv_use_radiobox" - if test "$no_cache" != 1; then - echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_editablebox" + if test "x$cache" = xyes; then + echo "wxUSE_EDITABLELISTBOX=$wxUSE_EDITABLELISTBOX" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_RADIOBOX" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_EDITABLELISTBOX = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_EDITABLELISTBOX fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; } + # Check whether --enable-filepicker was given. +if test "${enable_filepicker+set}" = set; then + enableval=$enable_filepicker; if test "$enableval" = yes; then - ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes' + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes' else - ac_cv_use_radiobtn='wxUSE_RADIOBTN=no' + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN + wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" fi - eval "$ac_cv_use_radiobtn" - if test "$no_cache" != 1; then - echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_filepicker" + if test "x$cache" = xyes; then + echo "wxUSE_FILEPICKERCTRL=$wxUSE_FILEPICKERCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_RADIOBTN" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILEPICKERCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FILEPICKERCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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 - ac_cv_use_sash='wxUSE_SASH=yes' + wx_cv_use_filectrl='wxUSE_FILECTRL=yes' else - ac_cv_use_sash='wxUSE_SASH=no' + wx_cv_use_filectrl='wxUSE_FILECTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILECTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH + wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}" fi - eval "$ac_cv_use_sash" - if test "$no_cache" != 1; then - echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_filectrl" + if test "x$cache" = xyes; then + echo "wxUSE_FILECTRL=$wxUSE_FILECTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SASH" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILECTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FILECTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-fontpicker" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6; } + # Check whether --enable-fontpicker was given. +if test "${enable_fontpicker+set}" = set; then + enableval=$enable_fontpicker; if test "$enableval" = yes; then - ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes' + wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=yes' else - ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no' + wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR + wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}" fi - eval "$ac_cv_use_scrollbar" - if test "$no_cache" != 1; then - echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fontpicker" + if test "x$cache" = xyes; then + echo "wxUSE_FONTPICKERCTRL=$wxUSE_FONTPICKERCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SCROLLBAR" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FONTPICKERCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FONTPICKERCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-gauge" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6; } + # Check whether --enable-gauge was given. +if test "${enable_gauge+set}" = set; then + enableval=$enable_gauge; if test "$enableval" = yes; then - ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes' + wx_cv_use_gauge='wxUSE_GAUGE=yes' else - ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=no' + wx_cv_use_gauge='wxUSE_GAUGE=no' fi + cache=yes else - LINE=`grep "wxUSE_SEARCHCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_searchctrl='wxUSE_SEARCHCTRL='$DEFAULT_wxUSE_SEARCHCTRL + wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}" fi - eval "$ac_cv_use_searchctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_gauge" + if test "x$cache" = xyes; then + echo "wxUSE_GAUGE=$wxUSE_GAUGE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SEARCHCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_GAUGE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_GAUGE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-grid" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6; } + # Check whether --enable-grid was given. +if test "${enable_grid+set}" = set; then + enableval=$enable_grid; if test "$enableval" = yes; then - ac_cv_use_slider='wxUSE_SLIDER=yes' + wx_cv_use_grid='wxUSE_GRID=yes' else - ac_cv_use_slider='wxUSE_SLIDER=no' + wx_cv_use_grid='wxUSE_GRID=no' fi + cache=yes else - LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER + wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}" fi - eval "$ac_cv_use_slider" - if test "$no_cache" != 1; then - echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_grid" + if test "x$cache" = xyes; then + echo "wxUSE_GRID=$wxUSE_GRID" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SLIDER" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_GRID = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_GRID fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; } + # Check whether --enable-dataviewctrl was given. +if test "${enable_dataviewctrl+set}" = set; then + enableval=$enable_dataviewctrl; if test "$enableval" = yes; then - ac_cv_use_spinbtn='wxUSE_SPINBTN=yes' + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes' else - ac_cv_use_spinbtn='wxUSE_SPINBTN=no' + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN + wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" fi - eval "$ac_cv_use_spinbtn" - if test "$no_cache" != 1; then - echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dataviewctrl" + if test "x$cache" = xyes; then + echo "wxUSE_DATAVIEWCTRL=$wxUSE_DATAVIEWCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPINBTN" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DATAVIEWCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DATAVIEWCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-hyperlink" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6; } + # Check whether --enable-hyperlink was given. +if test "${enable_hyperlink+set}" = set; then + enableval=$enable_hyperlink; if test "$enableval" = yes; then - ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes' + wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=yes' else - ac_cv_use_spinctrl='wxUSE_SPINCTRL=no' + wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL + wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}" fi - eval "$ac_cv_use_spinctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_hyperlink" + if test "x$cache" = xyes; then + echo "wxUSE_HYPERLINKCTRL=$wxUSE_HYPERLINKCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPINCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_HYPERLINKCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_HYPERLINKCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-imaglist" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6; } + # Check whether --enable-imaglist was given. +if test "${enable_imaglist+set}" = set; then + enableval=$enable_imaglist; if test "$enableval" = yes; then - ac_cv_use_splitter='wxUSE_SPLITTER=yes' + wx_cv_use_imaglist='wxUSE_IMAGLIST=yes' else - ac_cv_use_splitter='wxUSE_SPLITTER=no' + wx_cv_use_imaglist='wxUSE_IMAGLIST=no' fi + cache=yes else - LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER + wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}" fi - eval "$ac_cv_use_splitter" - if test "$no_cache" != 1; then - echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_imaglist" + if test "x$cache" = xyes; then + echo "wxUSE_IMAGLIST=$wxUSE_IMAGLIST" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPLITTER" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_IMAGLIST = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_IMAGLIST fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-listbook" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6; } + # Check whether --enable-listbook was given. +if test "${enable_listbook+set}" = set; then + enableval=$enable_listbook; if test "$enableval" = yes; then - ac_cv_use_statbmp='wxUSE_STATBMP=yes' + wx_cv_use_listbook='wxUSE_LISTBOOK=yes' else - ac_cv_use_statbmp='wxUSE_STATBMP=no' + wx_cv_use_listbook='wxUSE_LISTBOOK=no' fi + cache=yes else - LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP + wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}" fi - eval "$ac_cv_use_statbmp" - if test "$no_cache" != 1; then - echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_listbook" + if test "x$cache" = xyes; then + echo "wxUSE_LISTBOOK=$wxUSE_LISTBOOK" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STATBMP" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_LISTBOOK = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LISTBOOK fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-listbox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6; } + # Check whether --enable-listbox was given. +if test "${enable_listbox+set}" = set; then + enableval=$enable_listbox; if test "$enableval" = yes; then - ac_cv_use_statbox='wxUSE_STATBOX=yes' + wx_cv_use_listbox='wxUSE_LISTBOX=yes' else - ac_cv_use_statbox='wxUSE_STATBOX=no' + wx_cv_use_listbox='wxUSE_LISTBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX + wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}" fi - eval "$ac_cv_use_statbox" - if test "$no_cache" != 1; then - echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_listbox" + if test "x$cache" = xyes; then + echo "wxUSE_LISTBOX=$wxUSE_LISTBOX" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STATBOX" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_LISTBOX = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LISTBOX fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-listctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6; } + # Check whether --enable-listctrl was given. +if test "${enable_listctrl+set}" = set; then + enableval=$enable_listctrl; if test "$enableval" = yes; then - ac_cv_use_statline='wxUSE_STATLINE=yes' + wx_cv_use_listctrl='wxUSE_LISTCTRL=yes' else - ac_cv_use_statline='wxUSE_STATLINE=no' + wx_cv_use_listctrl='wxUSE_LISTCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE + wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}" fi - eval "$ac_cv_use_statline" - if test "$no_cache" != 1; then - echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_listctrl" + if test "x$cache" = xyes; then + echo "wxUSE_LISTCTRL=$wxUSE_LISTCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STATLINE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_LISTCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_LISTCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-notebook" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6; } + # Check whether --enable-notebook was given. +if test "${enable_notebook+set}" = set; then + enableval=$enable_notebook; if test "$enableval" = yes; then - ac_cv_use_stattext='wxUSE_STATTEXT=yes' + wx_cv_use_notebook='wxUSE_NOTEBOOK=yes' else - ac_cv_use_stattext='wxUSE_STATTEXT=no' + wx_cv_use_notebook='wxUSE_NOTEBOOK=no' fi + cache=yes else - LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT + wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}" fi - eval "$ac_cv_use_stattext" - if test "$no_cache" != 1; then - echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_notebook" + if test "x$cache" = xyes; then + echo "wxUSE_NOTEBOOK=$wxUSE_NOTEBOOK" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STATTEXT" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_NOTEBOOK = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_NOTEBOOK fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-odcombobox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6; } + # Check whether --enable-odcombobox was given. +if test "${enable_odcombobox+set}" = set; then + enableval=$enable_odcombobox; if test "$enableval" = yes; then - ac_cv_use_statusbar='wxUSE_STATUSBAR=yes' + wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=yes' else - ac_cv_use_statusbar='wxUSE_STATUSBAR=no' + wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR + wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}" fi - eval "$ac_cv_use_statusbar" - if test "$no_cache" != 1; then - echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_odcombobox" + if test "x$cache" = xyes; then + echo "wxUSE_ODCOMBOBOX=$wxUSE_ODCOMBOBOX" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STATUSBAR" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_ODCOMBOBOX = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_ODCOMBOBOX fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-radiobox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6; } + # Check whether --enable-radiobox was given. +if test "${enable_radiobox+set}" = set; then + enableval=$enable_radiobox; if test "$enableval" = yes; then - ac_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes' + wx_cv_use_radiobox='wxUSE_RADIOBOX=yes' else - ac_cv_use_tabdialog='wxUSE_TAB_DIALOG=no' + wx_cv_use_radiobox='wxUSE_RADIOBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_TAB_DIALOG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tabdialog='wxUSE_TAB_DIALOG='$DEFAULT_wxUSE_TAB_DIALOG + wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}" fi - eval "$ac_cv_use_tabdialog" - if test "$no_cache" != 1; then - echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_radiobox" + if test "x$cache" = xyes; then + echo "wxUSE_RADIOBOX=$wxUSE_RADIOBOX" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TAB_DIALOG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_RADIOBOX = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_RADIOBOX fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-radiobtn" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6; } + # Check whether --enable-radiobtn was given. +if test "${enable_radiobtn+set}" = set; then + enableval=$enable_radiobtn; if test "$enableval" = yes; then - ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes' + wx_cv_use_radiobtn='wxUSE_RADIOBTN=yes' else - ac_cv_use_textctrl='wxUSE_TEXTCTRL=no' + wx_cv_use_radiobtn='wxUSE_RADIOBTN=no' fi + cache=yes else - LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL + wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}" fi - eval "$ac_cv_use_textctrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_radiobtn" + if test "x$cache" = xyes; then + echo "wxUSE_RADIOBTN=$wxUSE_RADIOBTN" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TEXTCTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_RADIOBTN = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_RADIOBTN fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-sash" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6; } + # Check whether --enable-sash was given. +if test "${enable_sash+set}" = set; then + enableval=$enable_sash; if test "$enableval" = yes; then - ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' + wx_cv_use_sash='wxUSE_SASH=yes' else - ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' + wx_cv_use_sash='wxUSE_SASH=no' fi + cache=yes else - LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN + wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}" fi - eval "$ac_cv_use_togglebtn" - if test "$no_cache" != 1; then - echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_sash" + if test "x$cache" = xyes; then + echo "wxUSE_SASH=$wxUSE_SASH" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOGGLEBTN" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SASH = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SASH fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-scrollbar" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6; } + # Check whether --enable-scrollbar was given. +if test "${enable_scrollbar+set}" = set; then + enableval=$enable_scrollbar; if test "$enableval" = yes; then - ac_cv_use_toolbar='wxUSE_TOOLBAR=yes' + wx_cv_use_scrollbar='wxUSE_SCROLLBAR=yes' else - ac_cv_use_toolbar='wxUSE_TOOLBAR=no' + wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no' fi + cache=yes else - LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR + wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}" fi - eval "$ac_cv_use_toolbar" - if test "$no_cache" != 1; then - echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_scrollbar" + if test "x$cache" = xyes; then + echo "wxUSE_SCROLLBAR=$wxUSE_SCROLLBAR" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOOLBAR" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SCROLLBAR = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SCROLLBAR fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-searchctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6; } + # Check whether --enable-searchctrl was given. +if test "${enable_searchctrl+set}" = set; then + enableval=$enable_searchctrl; if test "$enableval" = yes; then - ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' + wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes' else - ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' + wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE + wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}" fi - eval "$ac_cv_use_tbarnative" - if test "$no_cache" != 1; then - echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_searchctrl" + if test "x$cache" = xyes; then + echo "wxUSE_SEARCHCTRL=$wxUSE_SEARCHCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOOLBAR_NATIVE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SEARCHCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SEARCHCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-slider" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6; } + # Check whether --enable-slider was given. +if test "${enable_slider+set}" = set; then + enableval=$enable_slider; if test "$enableval" = yes; then - ac_cv_use_treebook='wxUSE_TREEBOOK=yes' + wx_cv_use_slider='wxUSE_SLIDER=yes' else - ac_cv_use_treebook='wxUSE_TREEBOOK=no' + wx_cv_use_slider='wxUSE_SLIDER=no' fi + cache=yes else - LINE=`grep "wxUSE_TREEBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_treebook='wxUSE_TREEBOOK='$DEFAULT_wxUSE_TREEBOOK + wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}" fi - eval "$ac_cv_use_treebook" - if test "$no_cache" != 1; then - echo $ac_cv_use_treebook >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_slider" + if test "x$cache" = xyes; then + echo "wxUSE_SLIDER=$wxUSE_SLIDER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TREEBOOK" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SLIDER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SLIDER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-spinbtn" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6; } + # Check whether --enable-spinbtn was given. +if test "${enable_spinbtn+set}" = set; then + enableval=$enable_spinbtn; if test "$enableval" = yes; then - ac_cv_use_toolbook='wxUSE_TOOLBOOK=yes' + wx_cv_use_spinbtn='wxUSE_SPINBTN=yes' else - ac_cv_use_toolbook='wxUSE_TOOLBOOK=no' + wx_cv_use_spinbtn='wxUSE_SPINBTN=no' fi + cache=yes else - LINE=`grep "wxUSE_TOOLBOOK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_toolbook='wxUSE_TOOLBOOK='$DEFAULT_wxUSE_TOOLBOOK + wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}" fi - eval "$ac_cv_use_toolbook" - if test "$no_cache" != 1; then - echo $ac_cv_use_toolbook >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_spinbtn" + if test "x$cache" = xyes; then + echo "wxUSE_SPINBTN=$wxUSE_SPINBTN" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOOLBOOK" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPINBTN = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SPINBTN fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-spinctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6; } + # Check whether --enable-spinctrl was given. +if test "${enable_spinctrl+set}" = set; then + enableval=$enable_spinctrl; if test "$enableval" = yes; then - ac_cv_use_treectrl='wxUSE_TREECTRL=yes' + wx_cv_use_spinctrl='wxUSE_SPINCTRL=yes' else - ac_cv_use_treectrl='wxUSE_TREECTRL=no' + wx_cv_use_spinctrl='wxUSE_SPINCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL + wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}" fi - eval "$ac_cv_use_treectrl" - if test "$no_cache" != 1; then - echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_spinctrl" + if test "x$cache" = xyes; then + echo "wxUSE_SPINCTRL=$wxUSE_SPINCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TREECTRL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPINCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SPINCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-splitter" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6; } + # Check whether --enable-splitter was given. +if test "${enable_splitter+set}" = set; then + enableval=$enable_splitter; if test "$enableval" = yes; then - ac_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' + wx_cv_use_splitter='wxUSE_SPLITTER=yes' else - ac_cv_use_tipwindow='wxUSE_TIPWINDOW=no' + wx_cv_use_splitter='wxUSE_SPLITTER=no' fi + cache=yes else - LINE=`grep "wxUSE_TIPWINDOW" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tipwindow='wxUSE_TIPWINDOW='$DEFAULT_wxUSE_TIPWINDOW + wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}" fi - eval "$ac_cv_use_tipwindow" - if test "$no_cache" != 1; then - echo $ac_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_splitter" + if test "x$cache" = xyes; then + echo "wxUSE_SPLITTER=$wxUSE_SPLITTER" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TIPWINDOW" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPLITTER = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SPLITTER fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-statbmp" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6; } + # Check whether --enable-statbmp was given. +if test "${enable_statbmp+set}" = set; then + enableval=$enable_statbmp; if test "$enableval" = yes; then - ac_cv_use_popupwin='wxUSE_POPUPWIN=yes' + wx_cv_use_statbmp='wxUSE_STATBMP=yes' else - ac_cv_use_popupwin='wxUSE_POPUPWIN=no' + wx_cv_use_statbmp='wxUSE_STATBMP=no' fi + cache=yes else - LINE=`grep "wxUSE_POPUPWIN" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN + wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}" fi - eval "$ac_cv_use_popupwin" - if test "$no_cache" != 1; then - echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_statbmp" + if test "x$cache" = xyes; then + echo "wxUSE_STATBMP=$wxUSE_STATBMP" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_POPUPWIN" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STATBMP = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STATBMP fi - + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-statbox" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6; } + # Check whether --enable-statbox was given. +if test "${enable_statbox+set}" = set; then + enableval=$enable_statbox; if test "$enableval" = yes; then - ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes' + wx_cv_use_statbox='wxUSE_STATBOX=yes' else - ac_cv_use_commondlg='wxUSE_COMMONDLGS=no' + wx_cv_use_statbox='wxUSE_STATBOX=no' fi + cache=yes else - LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS + wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}" fi - eval "$ac_cv_use_commondlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_statbox" + if test "x$cache" = xyes; then + echo "wxUSE_STATBOX=$wxUSE_STATBOX" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COMMONDLGS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STATBOX = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STATBOX fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-statline" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6; } + # Check whether --enable-statline was given. +if test "${enable_statline+set}" = set; then + enableval=$enable_statline; if test "$enableval" = yes; then - ac_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes' + wx_cv_use_statline='wxUSE_STATLINE=yes' else - ac_cv_use_aboutdlg='wxUSE_ABOUTDLG=no' + wx_cv_use_statline='wxUSE_STATLINE=no' fi + cache=yes else - LINE=`grep "wxUSE_ABOUTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_aboutdlg='wxUSE_ABOUTDLG='$DEFAULT_wxUSE_ABOUTDLG + wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}" fi - eval "$ac_cv_use_aboutdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_statline" + if test "x$cache" = xyes; then + echo "wxUSE_STATLINE=$wxUSE_STATLINE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ABOUTDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STATLINE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STATLINE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-stattext" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6; } + # Check whether --enable-stattext was given. +if test "${enable_stattext+set}" = set; then + enableval=$enable_stattext; if test "$enableval" = yes; then - ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes' + wx_cv_use_stattext='wxUSE_STATTEXT=yes' else - ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no' + wx_cv_use_stattext='wxUSE_STATTEXT=no' fi + cache=yes else - LINE=`grep "wxUSE_CHOICEDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG + wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}" fi - eval "$ac_cv_use_choicedlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_stattext" + if test "x$cache" = xyes; then + echo "wxUSE_STATTEXT=$wxUSE_STATTEXT" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CHOICEDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STATTEXT = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STATTEXT fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-statusbar" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6; } + # Check whether --enable-statusbar was given. +if test "${enable_statusbar+set}" = set; then + enableval=$enable_statusbar; if test "$enableval" = yes; then - ac_cv_use_coldlg='wxUSE_COLOURDLG=yes' + wx_cv_use_statusbar='wxUSE_STATUSBAR=yes' else - ac_cv_use_coldlg='wxUSE_COLOURDLG=no' + wx_cv_use_statusbar='wxUSE_STATUSBAR=no' fi + cache=yes else - LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG + wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}" fi - eval "$ac_cv_use_coldlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_statusbar" + if test "x$cache" = xyes; then + echo "wxUSE_STATUSBAR=$wxUSE_STATUSBAR" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COLOURDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STATUSBAR = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STATUSBAR fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-tabdialog" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6; } + # Check whether --enable-tabdialog was given. +if test "${enable_tabdialog+set}" = set; then + enableval=$enable_tabdialog; if test "$enableval" = yes; then - ac_cv_use_filedlg='wxUSE_FILEDLG=yes' + wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes' else - ac_cv_use_filedlg='wxUSE_FILEDLG=no' + wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no' fi + cache=yes else - LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG + wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}" fi - eval "$ac_cv_use_filedlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tabdialog" + if test "x$cache" = xyes; then + echo "wxUSE_TAB_DIALOG=$wxUSE_TAB_DIALOG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FILEDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TAB_DIALOG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TAB_DIALOG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-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 - ac_cv_use_finddlg='wxUSE_FINDREPLDLG=yes' + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes' else - ac_cv_use_finddlg='wxUSE_FINDREPLDLG=no' + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no' fi + cache=yes else - LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_finddlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}" fi - eval "$ac_cv_use_finddlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_finddlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_taskbaricon" + if test "x$cache" = xyes; then + echo "wxUSE_TASKBARICON=$wxUSE_TASKBARICON" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FINDREPLDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TASKBARICON = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TASKBARICON fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-textctrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; } + # Check whether --enable-textctrl was given. +if test "${enable_textctrl+set}" = set; then + enableval=$enable_textctrl; if test "$enableval" = yes; then - ac_cv_use_fontdlg='wxUSE_FONTDLG=yes' + wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes' else - ac_cv_use_fontdlg='wxUSE_FONTDLG=no' + wx_cv_use_textctrl='wxUSE_TEXTCTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG + wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" fi - eval "$ac_cv_use_fontdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_textctrl" + if test "x$cache" = xyes; then + echo "wxUSE_TEXTCTRL=$wxUSE_TEXTCTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_FONTDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TEXTCTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TEXTCTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-togglebtn" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; } + # Check whether --enable-togglebtn was given. +if test "${enable_togglebtn+set}" = set; then + enableval=$enable_togglebtn; if test "$enableval" = yes; then - ac_cv_use_dirdlg='wxUSE_DIRDLG=yes' + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' else - ac_cv_use_dirdlg='wxUSE_DIRDLG=no' + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' fi + cache=yes else - LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG + wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" fi - eval "$ac_cv_use_dirdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_togglebtn" + if test "x$cache" = xyes; then + echo "wxUSE_TOGGLEBTN=$wxUSE_TOGGLEBTN" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DIRDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOGGLEBTN = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TOGGLEBTN fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; } + # Check whether --enable-toolbar was given. +if test "${enable_toolbar+set}" = set; then + enableval=$enable_toolbar; if test "$enableval" = yes; then - ac_cv_use_msgdlg='wxUSE_MSGDLG=yes' + wx_cv_use_toolbar='wxUSE_TOOLBAR=yes' else - ac_cv_use_msgdlg='wxUSE_MSGDLG=no' + wx_cv_use_toolbar='wxUSE_TOOLBAR=no' fi + cache=yes else - LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG + wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" fi - eval "$ac_cv_use_msgdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_toolbar" + if test "x$cache" = xyes; then + echo "wxUSE_TOOLBAR=$wxUSE_TOOLBAR" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MSGDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOOLBAR = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TOOLBAR fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-tbarnative" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; } + # Check whether --enable-tbarnative was given. +if test "${enable_tbarnative+set}" = set; then + enableval=$enable_tbarnative; if test "$enableval" = yes; then - ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes' + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' else - ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no' + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' fi + cache=yes else - LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG + wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" fi - eval "$ac_cv_use_numberdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tbarnative" + if test "x$cache" = xyes; then + echo "wxUSE_TOOLBAR_NATIVE=$wxUSE_TOOLBAR_NATIVE" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_NUMBERDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOOLBAR_NATIVE = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TOOLBAR_NATIVE fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-treebook" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; } + # Check whether --enable-treebook was given. +if test "${enable_treebook+set}" = set; then + enableval=$enable_treebook; if test "$enableval" = yes; then - ac_cv_use_splash='wxUSE_SPLASH=yes' + wx_cv_use_treebook='wxUSE_TREEBOOK=yes' else - ac_cv_use_splash='wxUSE_SPLASH=no' + wx_cv_use_treebook='wxUSE_TREEBOOK=no' fi + cache=yes else - LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH + wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" fi - eval "$ac_cv_use_splash" - if test "$no_cache" != 1; then - echo $ac_cv_use_splash >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_treebook" + if test "x$cache" = xyes; then + echo "wxUSE_TREEBOOK=$wxUSE_TREEBOOK" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPLASH" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TREEBOOK = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TREEBOOK fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-toolbook" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6; } + # Check whether --enable-toolbook was given. +if test "${enable_toolbook+set}" = set; then + enableval=$enable_toolbook; if test "$enableval" = yes; then - ac_cv_use_textdlg='wxUSE_TEXTDLG=yes' + wx_cv_use_toolbook='wxUSE_TOOLBOOK=yes' else - ac_cv_use_textdlg='wxUSE_TEXTDLG=no' + wx_cv_use_toolbook='wxUSE_TOOLBOOK=no' fi + cache=yes else - LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG + wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}" fi - eval "$ac_cv_use_textdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_toolbook" + if test "x$cache" = xyes; then + echo "wxUSE_TOOLBOOK=$wxUSE_TOOLBOOK" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TEXTDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOOLBOOK = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TOOLBOOK fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-treectrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; } + # Check whether --enable-treectrl was given. +if test "${enable_treectrl+set}" = set; then + enableval=$enable_treectrl; if test "$enableval" = yes; then - ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes' + wx_cv_use_treectrl='wxUSE_TREECTRL=yes' else - ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' + wx_cv_use_treectrl='wxUSE_TREECTRL=no' fi + cache=yes else - LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS + wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" fi - eval "$ac_cv_use_tipdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_treectrl" + if test "x$cache" = xyes; then + echo "wxUSE_TREECTRL=$wxUSE_TREECTRL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STARTUP_TIPS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TREECTRL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TREECTRL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; } + # Check whether --enable-tipwindow was given. +if test "${enable_tipwindow+set}" = set; then + enableval=$enable_tipwindow; if test "$enableval" = yes; then - ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes' + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes' else - ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' fi + cache=yes else - LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG + wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" fi - eval "$ac_cv_use_progressdlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tipwindow" + if test "x$cache" = xyes; then + echo "wxUSE_TIPWINDOW=$wxUSE_TIPWINDOW" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROGRESSDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TIPWINDOW = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TIPWINDOW fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - enablestring= - { 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; - if test "$enableval" = yes; then - ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes' - else - ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' - fi - -else - LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}` + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; } + # Check whether --enable-popupwin was given. +if test "${enable_popupwin+set}" = set; then + enableval=$enable_popupwin; + if test "$enableval" = yes; then + wx_cv_use_popupwin='wxUSE_POPUPWIN=yes' + else + wx_cv_use_popupwin='wxUSE_POPUPWIN=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG + wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" fi - eval "$ac_cv_use_wizarddlg" - if test "$no_cache" != 1; then - echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_popupwin" + if test "x$cache" = xyes; then + echo "wxUSE_POPUPWIN=$wxUSE_POPUPWIN" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_WIZARDDLG" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_POPUPWIN = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_POPUPWIN fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-commondlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6; } + # Check whether --enable-commondlg was given. +if test "${enable_commondlg+set}" = set; then + enableval=$enable_commondlg; if test "$enableval" = yes; then - ac_cv_use_menus='wxUSE_MENUS=yes' + wx_cv_use_commondlg='wxUSE_COMMONDLGS=yes' else - ac_cv_use_menus='wxUSE_MENUS=no' + wx_cv_use_commondlg='wxUSE_COMMONDLGS=no' fi + cache=yes else - LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS + wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}" fi - eval "$ac_cv_use_menus" - if test "$no_cache" != 1; then - echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_commondlg" + if test "x$cache" = xyes; then + echo "wxUSE_COMMONDLGS=$wxUSE_COMMONDLGS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MENUS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_COMMONDLGS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_COMMONDLGS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-aboutdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6; } + # Check whether --enable-aboutdlg was given. +if test "${enable_aboutdlg+set}" = set; then + enableval=$enable_aboutdlg; if test "$enableval" = yes; then - ac_cv_use_miniframe='wxUSE_MINIFRAME=yes' + wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=yes' else - ac_cv_use_miniframe='wxUSE_MINIFRAME=no' + wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME + wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}" fi - eval "$ac_cv_use_miniframe" - if test "$no_cache" != 1; then - echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_aboutdlg" + if test "x$cache" = xyes; then + echo "wxUSE_ABOUTDLG=$wxUSE_ABOUTDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MINIFRAME" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_ABOUTDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_ABOUTDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-choicedlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6; } + # Check whether --enable-choicedlg was given. +if test "${enable_choicedlg+set}" = set; then + enableval=$enable_choicedlg; if test "$enableval" = yes; then - ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes' + wx_cv_use_choicedlg='wxUSE_CHOICEDLG=yes' else - ac_cv_use_tooltips='wxUSE_TOOLTIPS=no' + wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS + wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}" fi - eval "$ac_cv_use_tooltips" - if test "$no_cache" != 1; then - echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_choicedlg" + if test "x$cache" = xyes; then + echo "wxUSE_CHOICEDLG=$wxUSE_CHOICEDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOOLTIPS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_CHOICEDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_CHOICEDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-coldlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6; } + # Check whether --enable-coldlg was given. +if test "${enable_coldlg+set}" = set; then + enableval=$enable_coldlg; if test "$enableval" = yes; then - ac_cv_use_splines='wxUSE_SPLINES=yes' + wx_cv_use_coldlg='wxUSE_COLOURDLG=yes' else - ac_cv_use_splines='wxUSE_SPLINES=no' + wx_cv_use_coldlg='wxUSE_COLOURDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES + wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}" fi - eval "$ac_cv_use_splines" - if test "$no_cache" != 1; then - echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_coldlg" + if test "x$cache" = xyes; then + echo "wxUSE_COLOURDLG=$wxUSE_COLOURDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPLINES" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_COLOURDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_COLOURDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-mousewheel was given. -if test "${enable_mousewheel+set}" = set; then - enableval=$enable_mousewheel; + 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}-filedlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6; } + # Check whether --enable-filedlg was given. +if test "${enable_filedlg+set}" = set; then + enableval=$enable_filedlg; if test "$enableval" = yes; then - ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes' + wx_cv_use_filedlg='wxUSE_FILEDLG=yes' else - ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no' + wx_cv_use_filedlg='wxUSE_FILEDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_MOUSEWHEEL" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_mousewheel='wxUSE_MOUSEWHEEL='$DEFAULT_wxUSE_MOUSEWHEEL + wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}" fi - eval "$ac_cv_use_mousewheel" - if test "$no_cache" != 1; then - echo $ac_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_filedlg" + if test "x$cache" = xyes; then + echo "wxUSE_FILEDLG=$wxUSE_FILEDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MOUSEWHEEL" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILEDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FILEDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-finddlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6; } + # Check whether --enable-finddlg was given. +if test "${enable_finddlg+set}" = set; then + enableval=$enable_finddlg; if test "$enableval" = yes; then - ac_cv_use_validators='wxUSE_VALIDATORS=yes' + wx_cv_use_finddlg='wxUSE_FINDREPLDLG=yes' else - ac_cv_use_validators='wxUSE_VALIDATORS=no' + wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS + wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}" fi - eval "$ac_cv_use_validators" - if test "$no_cache" != 1; then - echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_finddlg" + if test "x$cache" = xyes; then + echo "wxUSE_FINDREPLDLG=$wxUSE_FINDREPLDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_VALIDATORS" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FINDREPLDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FINDREPLDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-fontdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6; } + # Check whether --enable-fontdlg was given. +if test "${enable_fontdlg+set}" = set; then + enableval=$enable_fontdlg; if test "$enableval" = yes; then - ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes' + wx_cv_use_fontdlg='wxUSE_FONTDLG=yes' else - ac_cv_use_busyinfo='wxUSE_BUSYINFO=no' + wx_cv_use_fontdlg='wxUSE_FONTDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO + wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}" fi - eval "$ac_cv_use_busyinfo" - if test "$no_cache" != 1; then - echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_fontdlg" + if test "x$cache" = xyes; then + echo "wxUSE_FONTDLG=$wxUSE_FONTDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BUSYINFO" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_FONTDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_FONTDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-dirdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6; } + # Check whether --enable-dirdlg was given. +if test "${enable_dirdlg+set}" = set; then + enableval=$enable_dirdlg; if test "$enableval" = yes; then - ac_cv_use_joystick='wxUSE_JOYSTICK=yes' + wx_cv_use_dirdlg='wxUSE_DIRDLG=yes' else - ac_cv_use_joystick='wxUSE_JOYSTICK=no' + wx_cv_use_dirdlg='wxUSE_DIRDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK + wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}" fi - eval "$ac_cv_use_joystick" - if test "$no_cache" != 1; then - echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_dirdlg" + if test "x$cache" = xyes; then + echo "wxUSE_DIRDLG=$wxUSE_DIRDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_JOYSTICK" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_DIRDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_DIRDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-msgdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6; } + # Check whether --enable-msgdlg was given. +if test "${enable_msgdlg+set}" = set; then + enableval=$enable_msgdlg; if test "$enableval" = yes; then - ac_cv_use_metafile='wxUSE_METAFILE=yes' + wx_cv_use_msgdlg='wxUSE_MSGDLG=yes' else - ac_cv_use_metafile='wxUSE_METAFILE=no' + wx_cv_use_msgdlg='wxUSE_MSGDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE + wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}" fi - eval "$ac_cv_use_metafile" - if test "$no_cache" != 1; then - echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_msgdlg" + if test "x$cache" = xyes; then + echo "wxUSE_MSGDLG=$wxUSE_MSGDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_METAFILE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MSGDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_MSGDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-numberdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6; } + # Check whether --enable-numberdlg was given. +if test "${enable_numberdlg+set}" = set; then + enableval=$enable_numberdlg; if test "$enableval" = yes; then - ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes' + wx_cv_use_numberdlg='wxUSE_NUMBERDLG=yes' else - ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no' + wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE + wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}" fi - eval "$ac_cv_use_dragimage" - if test "$no_cache" != 1; then - echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_numberdlg" + if test "x$cache" = xyes; then + echo "wxUSE_NUMBERDLG=$wxUSE_NUMBERDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DRAGIMAGE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_NUMBERDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_NUMBERDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-splash" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6; } + # Check whether --enable-splash was given. +if test "${enable_splash+set}" = set; then + enableval=$enable_splash; if test "$enableval" = yes; then - ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes' + wx_cv_use_splash='wxUSE_SPLASH=yes' else - ac_cv_use_accessibility='wxUSE_ACCESSIBILITY=no' + wx_cv_use_splash='wxUSE_SPLASH=no' fi + cache=yes else - LINE=`grep "wxUSE_ACCESSIBILITY" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_accessibility='wxUSE_ACCESSIBILITY='$DEFAULT_wxUSE_ACCESSIBILITY + wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}" fi - eval "$ac_cv_use_accessibility" - if test "$no_cache" != 1; then - echo $ac_cv_use_accessibility >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_splash" + if test "x$cache" = xyes; then + echo "wxUSE_SPLASH=$wxUSE_SPLASH" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ACCESSIBILITY" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPLASH = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SPLASH fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } -if test "$wxUSE_MSW" = "1"; then enablestring= - { 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; + 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}-textdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6; } + # Check whether --enable-textdlg was given. +if test "${enable_textdlg+set}" = set; then + enableval=$enable_textdlg; if test "$enableval" = yes; then - ac_cv_use_dccache='wxUSE_DC_CACHEING=yes' + wx_cv_use_textdlg='wxUSE_TEXTDLG=yes' else - ac_cv_use_dccache='wxUSE_DC_CACHEING=no' + wx_cv_use_textdlg='wxUSE_TEXTDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_DC_CACHEING" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_dccache='wxUSE_DC_CACHEING='$DEFAULT_wxUSE_DC_CACHEING + wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}" fi - eval "$ac_cv_use_dccache" - if test "$no_cache" != 1; then - echo $ac_cv_use_dccache >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_textdlg" + if test "x$cache" = xyes; then + echo "wxUSE_TEXTDLG=$wxUSE_TEXTDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DC_CACHEING" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TEXTDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TEXTDLG fi -fi - + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-tipdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6; } + # Check whether --enable-tipdlg was given. +if test "${enable_tipdlg+set}" = set; then + enableval=$enable_tipdlg; if test "$enableval" = yes; then - ac_cv_use_palette='wxUSE_PALETTE=yes' + wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes' else - ac_cv_use_palette='wxUSE_PALETTE=no' + wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' fi + cache=yes else - LINE=`grep "wxUSE_PALETTE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_palette='wxUSE_PALETTE='$DEFAULT_wxUSE_PALETTE + wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}" fi - eval "$ac_cv_use_palette" - if test "$no_cache" != 1; then - echo $ac_cv_use_palette >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tipdlg" + if test "x$cache" = xyes; then + echo "wxUSE_STARTUP_TIPS=$wxUSE_STARTUP_TIPS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PALETTE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_STARTUP_TIPS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_STARTUP_TIPS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-progressdlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6; } + # Check whether --enable-progressdlg was given. +if test "${enable_progressdlg+set}" = set; then + enableval=$enable_progressdlg; if test "$enableval" = yes; then - ac_cv_use_image='wxUSE_IMAGE=yes' + wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes' else - ac_cv_use_image='wxUSE_IMAGE=no' + wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE + wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}" fi - eval "$ac_cv_use_image" - if test "$no_cache" != 1; then - echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_progressdlg" + if test "x$cache" = xyes; then + echo "wxUSE_PROGRESSDLG=$wxUSE_PROGRESSDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_IMAGE" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROGRESSDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_PROGRESSDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-wizarddlg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6; } + # Check whether --enable-wizarddlg was given. +if test "${enable_wizarddlg+set}" = set; then + enableval=$enable_wizarddlg; if test "$enableval" = yes; then - ac_cv_use_gif='wxUSE_GIF=yes' + wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes' else - ac_cv_use_gif='wxUSE_GIF=no' + wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' fi + cache=yes else - LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF + wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}" fi - eval "$ac_cv_use_gif" - if test "$no_cache" != 1; then - echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_wizarddlg" + if test "x$cache" = xyes; then + echo "wxUSE_WIZARDDLG=$wxUSE_WIZARDDLG" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GIF" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_WIZARDDLG = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_WIZARDDLG fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= - { 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; + 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}-menus" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6; } + # Check whether --enable-menus was given. +if test "${enable_menus+set}" = set; then + enableval=$enable_menus; if test "$enableval" = yes; then - ac_cv_use_pcx='wxUSE_PCX=yes' + wx_cv_use_menus='wxUSE_MENUS=yes' else - ac_cv_use_pcx='wxUSE_PCX=no' + wx_cv_use_menus='wxUSE_MENUS=no' fi + cache=yes else - LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX + wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}" fi - eval "$ac_cv_use_pcx" - if test "$no_cache" != 1; then - echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_menus" + if test "x$cache" = xyes; then + echo "wxUSE_MENUS=$wxUSE_MENUS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PCX" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MENUS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_MENUS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-miniframe" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6; } + # Check whether --enable-miniframe was given. +if test "${enable_miniframe+set}" = set; then + enableval=$enable_miniframe; if test "$enableval" = yes; then - ac_cv_use_tga='wxUSE_TGA=yes' + wx_cv_use_miniframe='wxUSE_MINIFRAME=yes' else - ac_cv_use_tga='wxUSE_TGA=no' + wx_cv_use_miniframe='wxUSE_MINIFRAME=no' fi + cache=yes else - LINE=`grep "wxUSE_TGA" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_tga='wxUSE_TGA='$DEFAULT_wxUSE_TGA + wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}" fi - eval "$ac_cv_use_tga" - if test "$no_cache" != 1; then - echo $ac_cv_use_tga >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_miniframe" + if test "x$cache" = xyes; then + echo "wxUSE_MINIFRAME=$wxUSE_MINIFRAME" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TGA" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MINIFRAME = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_MINIFRAME fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-tooltips" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6; } + # Check whether --enable-tooltips was given. +if test "${enable_tooltips+set}" = set; then + enableval=$enable_tooltips; if test "$enableval" = yes; then - ac_cv_use_iff='wxUSE_IFF=yes' + wx_cv_use_tooltips='wxUSE_TOOLTIPS=yes' else - ac_cv_use_iff='wxUSE_IFF=no' + wx_cv_use_tooltips='wxUSE_TOOLTIPS=no' fi + cache=yes else - LINE=`grep "wxUSE_IFF" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_iff='wxUSE_IFF='$DEFAULT_wxUSE_IFF + wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}" fi - eval "$ac_cv_use_iff" - if test "$no_cache" != 1; then - echo $ac_cv_use_iff >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_tooltips" + if test "x$cache" = xyes; then + echo "wxUSE_TOOLTIPS=$wxUSE_TOOLTIPS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_IFF" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_TOOLTIPS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_TOOLTIPS fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-splines" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6; } + # Check whether --enable-splines was given. +if test "${enable_splines+set}" = set; then + enableval=$enable_splines; if test "$enableval" = yes; then - ac_cv_use_pnm='wxUSE_PNM=yes' + wx_cv_use_splines='wxUSE_SPLINES=yes' else - ac_cv_use_pnm='wxUSE_PNM=no' + wx_cv_use_splines='wxUSE_SPLINES=no' fi + cache=yes else - LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM + wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}" fi - eval "$ac_cv_use_pnm" - if test "$no_cache" != 1; then - echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_splines" + if test "x$cache" = xyes; then + echo "wxUSE_SPLINES=$wxUSE_SPLINES" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PNM" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_SPLINES = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_SPLINES fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-mousewheel" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6; } + # Check whether --enable-mousewheel was given. +if test "${enable_mousewheel+set}" = set; then + enableval=$enable_mousewheel; if test "$enableval" = yes; then - ac_cv_use_xpm='wxUSE_XPM=yes' + wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=yes' else - ac_cv_use_xpm='wxUSE_XPM=no' + wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no' fi + cache=yes else - LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_xpm='wxUSE_XPM='$DEFAULT_wxUSE_XPM + wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}" fi - eval "$ac_cv_use_xpm" - if test "$no_cache" != 1; then - echo $ac_cv_use_xpm >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_mousewheel" + if test "x$cache" = xyes; then + echo "wxUSE_MOUSEWHEEL=$wxUSE_MOUSEWHEEL" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_XPM" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_MOUSEWHEEL = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_MOUSEWHEEL fi + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + enablestring= - { 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; + 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}-validators" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6; } + # Check whether --enable-validators was given. +if test "${enable_validators+set}" = set; then + enableval=$enable_validators; if test "$enableval" = yes; then - ac_cv_use_ico_cur='wxUSE_ICO_CUR=yes' + wx_cv_use_validators='wxUSE_VALIDATORS=yes' else - ac_cv_use_ico_cur='wxUSE_ICO_CUR=no' + wx_cv_use_validators='wxUSE_VALIDATORS=no' fi + cache=yes else - LINE=`grep "wxUSE_ICO_CUR" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_ico_cur='wxUSE_ICO_CUR='$DEFAULT_wxUSE_ICO_CUR + wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}" fi - eval "$ac_cv_use_ico_cur" - if test "$no_cache" != 1; then - echo $ac_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_validators" + if test "x$cache" = xyes; then + echo "wxUSE_VALIDATORS=$wxUSE_VALIDATORS" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ICO_CUR" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_VALIDATORS = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_VALIDATORS fi - -fi - - - -# Check whether --with-flavour was given. -if test "${with_flavour+set}" = set; then - withval=$with_flavour; WX_FLAVOUR="$withval" -fi - - + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } enablestring= - { 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; + 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}-busyinfo" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6; } + # Check whether --enable-busyinfo was given. +if test "${enable_busyinfo+set}" = set; then + enableval=$enable_busyinfo; if test "$enableval" = yes; then - ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes' + wx_cv_use_busyinfo='wxUSE_BUSYINFO=yes' else - ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' + wx_cv_use_busyinfo='wxUSE_BUSYINFO=no' fi + cache=yes else - LINE=`grep "wxUSE_OFFICIAL_BUILD" ${wx_arg_cache_file}` + LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD='$DEFAULT_wxUSE_OFFICIAL_BUILD + wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}" fi - eval "$ac_cv_use_official_build" - if test "$no_cache" != 1; then - echo $ac_cv_use_official_build >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_busyinfo" + if test "x$cache" = xyes; then + echo "wxUSE_BUSYINFO=$wxUSE_BUSYINFO" >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_OFFICIAL_BUILD" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + if test x"$enablestring" = xdisable; then + if test $wxUSE_BUSYINFO = yes; then + result=no + else + result=yes + fi else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + result=$wxUSE_BUSYINFO fi -# Check whether --enable-vendor was given. -if test "${enable_vendor+set}" = set; then - enableval=$enable_vendor; VENDOR="$enableval" + { 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}-joystick" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6; } + # Check whether --enable-joystick was given. +if test "${enable_joystick+set}" = set; then + enableval=$enable_joystick; + if test "$enableval" = yes; then + wx_cv_use_joystick='wxUSE_JOYSTICK=yes' + else + wx_cv_use_joystick='wxUSE_JOYSTICK=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}" + fi -if test "x$VENDOR" = "x"; then - VENDOR="custom" + + eval "$wx_cv_use_joystick" + if test "x$cache" = xyes; then + echo "wxUSE_JOYSTICK=$wxUSE_JOYSTICK" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_JOYSTICK = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_JOYSTICK + 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}-metafile" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; } + # Check whether --enable-metafile was given. +if test "${enable_metafile+set}" = set; then + enableval=$enable_metafile; + if test "$enableval" = yes; then + wx_cv_use_metafile='wxUSE_METAFILE=yes' + else + wx_cv_use_metafile='wxUSE_METAFILE=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" + +fi + + + eval "$wx_cv_use_metafile" + if test "x$cache" = xyes; then + echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_METAFILE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_METAFILE + 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}-dragimage" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6; } + # Check whether --enable-dragimage was given. +if test "${enable_dragimage+set}" = set; then + enableval=$enable_dragimage; + if test "$enableval" = yes; then + wx_cv_use_dragimage='wxUSE_DRAGIMAGE=yes' + else + wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}" + +fi + + + eval "$wx_cv_use_dragimage" + if test "x$cache" = xyes; then + echo "wxUSE_DRAGIMAGE=$wxUSE_DRAGIMAGE" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DRAGIMAGE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DRAGIMAGE + 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}-accessibility" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6; } + # Check whether --enable-accessibility was given. +if test "${enable_accessibility+set}" = set; then + enableval=$enable_accessibility; + if test "$enableval" = yes; then + wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=yes' + else + wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}" + +fi + + + eval "$wx_cv_use_accessibility" + if test "x$cache" = xyes; then + echo "wxUSE_ACCESSIBILITY=$wxUSE_ACCESSIBILITY" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_ACCESSIBILITY = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_ACCESSIBILITY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6; } + # Check whether --enable-palette was given. +if test "${enable_palette+set}" = set; then + enableval=$enable_palette; + if test "$enableval" = yes; then + wx_cv_use_palette='wxUSE_PALETTE=yes' + else + wx_cv_use_palette='wxUSE_PALETTE=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}" + +fi + + + eval "$wx_cv_use_palette" + if test "x$cache" = xyes; then + echo "wxUSE_PALETTE=$wxUSE_PALETTE" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PALETTE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_PALETTE + 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}-image" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6; } + # Check whether --enable-image was given. +if test "${enable_image+set}" = set; then + enableval=$enable_image; + if test "$enableval" = yes; then + wx_cv_use_image='wxUSE_IMAGE=yes' + else + wx_cv_use_image='wxUSE_IMAGE=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}" + +fi + + + eval "$wx_cv_use_image" + if test "x$cache" = xyes; then + echo "wxUSE_IMAGE=$wxUSE_IMAGE" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_IMAGE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_IMAGE + 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}-gif" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6; } + # Check whether --enable-gif was given. +if test "${enable_gif+set}" = set; then + enableval=$enable_gif; + if test "$enableval" = yes; then + wx_cv_use_gif='wxUSE_GIF=yes' + else + wx_cv_use_gif='wxUSE_GIF=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}" + +fi + + + eval "$wx_cv_use_gif" + if test "x$cache" = xyes; then + echo "wxUSE_GIF=$wxUSE_GIF" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_GIF = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_GIF + 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}-pcx" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6; } + # Check whether --enable-pcx was given. +if test "${enable_pcx+set}" = set; then + enableval=$enable_pcx; + if test "$enableval" = yes; then + wx_cv_use_pcx='wxUSE_PCX=yes' + else + wx_cv_use_pcx='wxUSE_PCX=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}" + +fi + + + eval "$wx_cv_use_pcx" + if test "x$cache" = xyes; then + echo "wxUSE_PCX=$wxUSE_PCX" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PCX = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_PCX + 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}-tga" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6; } + # Check whether --enable-tga was given. +if test "${enable_tga+set}" = set; then + enableval=$enable_tga; + if test "$enableval" = yes; then + wx_cv_use_tga='wxUSE_TGA=yes' + else + wx_cv_use_tga='wxUSE_TGA=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}" + +fi + + + eval "$wx_cv_use_tga" + if test "x$cache" = xyes; then + echo "wxUSE_TGA=$wxUSE_TGA" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_TGA = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_TGA + 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}-iff" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6; } + # Check whether --enable-iff was given. +if test "${enable_iff+set}" = set; then + enableval=$enable_iff; + if test "$enableval" = yes; then + wx_cv_use_iff='wxUSE_IFF=yes' + else + wx_cv_use_iff='wxUSE_IFF=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}" + +fi + + + eval "$wx_cv_use_iff" + if test "x$cache" = xyes; then + echo "wxUSE_IFF=$wxUSE_IFF" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_IFF = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_IFF + 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}-pnm" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6; } + # Check whether --enable-pnm was given. +if test "${enable_pnm+set}" = set; then + enableval=$enable_pnm; + if test "$enableval" = yes; then + wx_cv_use_pnm='wxUSE_PNM=yes' + else + wx_cv_use_pnm='wxUSE_PNM=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}" + +fi + + + eval "$wx_cv_use_pnm" + if test "x$cache" = xyes; then + echo "wxUSE_PNM=$wxUSE_PNM" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PNM = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_PNM + 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}-xpm" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6; } + # Check whether --enable-xpm was given. +if test "${enable_xpm+set}" = set; then + enableval=$enable_xpm; + if test "$enableval" = yes; then + wx_cv_use_xpm='wxUSE_XPM=yes' + else + wx_cv_use_xpm='wxUSE_XPM=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}" + +fi + + + eval "$wx_cv_use_xpm" + if test "x$cache" = xyes; then + echo "wxUSE_XPM=$wxUSE_XPM" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_XPM = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_XPM + 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}-ico_cur" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6; } + # Check whether --enable-ico_cur was given. +if test "${enable_ico_cur+set}" = set; then + enableval=$enable_ico_cur; + if test "$enableval" = yes; then + wx_cv_use_ico_cur='wxUSE_ICO_CUR=yes' + else + wx_cv_use_ico_cur='wxUSE_ICO_CUR=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}" + +fi + + + eval "$wx_cv_use_ico_cur" + if test "x$cache" = xyes; then + echo "wxUSE_ICO_CUR=$wxUSE_ICO_CUR" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_ICO_CUR = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_ICO_CUR + 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}-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 + cache=yes + +else + + LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" + +fi + + + eval "$wx_cv_use_dccache" + if test "x$cache" = xyes; then + echo "wxUSE_DC_CACHEING=$wxUSE_DC_CACHEING" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DC_CACHEING = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DC_CACHEING + 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}-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 + cache=yes + +else + + LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}" + +fi + + + eval "$wx_cv_use_ps_in_msw" + if test "x$cache" = xyes; then + echo "wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW + 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}-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 + cache=yes + +else + + LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}" + fi + eval "$wx_cv_use_ownerdrawn" + if test "x$cache" = xyes; then + echo "wxUSE_OWNER_DRAWN=$wxUSE_OWNER_DRAWN" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_OWNER_DRAWN = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_OWNER_DRAWN + 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}-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 + cache=yes + +else + + LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}" + +fi + + + eval "$wx_cv_use_uxtheme" + if test "x$cache" = xyes; then + echo "wxUSE_UXTHEME=$wxUSE_UXTHEME" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_UXTHEME = yes; then + 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 + cache=yes + +else + + LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}" + +fi + + + eval "$wx_cv_use_wxdib" + if test "x$cache" = xyes; then + echo "wxUSE_DIB=$wxUSE_DIB" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DIB = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DIB + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + +fi echo "saving argument cache $wx_arg_cache_file" @@ -13547,236 +17464,238 @@ 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_prog_cc_g=yes -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 -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_c_werror_flag=$ac_save_c_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -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 -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - 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_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; - xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -esac - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - { echo "$as_me:$LINENO: checking whether we are using the Intel C compiler" >&5 -echo $ECHO_N "checking whether we are using the Intel C compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_c_compiler___INTEL_COMPILER+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 - 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=yes + ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_cv_c_compiler___INTEL_COMPILER=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_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +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 +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + 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_prog_cc_c89=$ac_arg +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; +esac + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + { echo "$as_me:$LINENO: checking whether we are using the Intel C compiler" >&5 +echo $ECHO_N "checking whether we are using the Intel C compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_c_compiler___INTEL_COMPILER+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 + 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=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + bakefile_cv_c_compiler___INTEL_COMPILER=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" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; } if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then :; INTELCC=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 + + if test "x$GCC" != "xyes"; then @@ -14000,15 +17919,17 @@ fi case `uname -s` in AIX*) - 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' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 + { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_c_compiler_xlc+set}" = set; then +if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14021,9 +17942,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -14046,41 +17968,48 @@ 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 - bakefile_compiler_xlc=yes + bakefile_cv_c_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_compiler_xlc=no + bakefile_cv_c_compiler___xlC__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_xlc=$bakefile_compiler_xlc -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_xlc" >&6; } -XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes` -ac_ext=c +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6; } + if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then + :; XLCC=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 + ;; Darwin) - 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' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking whether we are using the Metrowerks C compiler" >&5 + { echo "$as_me:$LINENO: checking whether we are using the Metrowerks C compiler" >&5 echo $ECHO_N "checking whether we are using the Metrowerks C compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_c_compiler_mwerks+set}" = set; then +if test "${bakefile_cv_c_compiler___MWERKS__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14093,9 +18022,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __MWERKS__ - choke me -#endif + + #ifndef __MWERKS__ + choke me + #endif ; return 0; @@ -14118,38 +18048,45 @@ 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 - bakefile_compiler_mwerks=yes + bakefile_cv_c_compiler___MWERKS__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_compiler_mwerks=no + bakefile_cv_c_compiler___MWERKS__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_mwerks=$bakefile_compiler_mwerks -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_mwerks" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_mwerks" >&6; } -MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes` -ac_ext=c +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___MWERKS__" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___MWERKS__" >&6; } + if test "x$bakefile_cv_c_compiler___MWERKS__" = "xyes"; then + :; MWCC=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_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 + { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C compiler" >&5 echo $ECHO_N "checking whether we are using the IBM xlC C compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_c_compiler_xlc+set}" = set; then +if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14162,9 +18099,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -14187,29 +18125,34 @@ 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 - bakefile_compiler_xlc=yes + bakefile_cv_c_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_compiler_xlc=no + bakefile_cv_c_compiler___xlC__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_c_compiler_xlc=$bakefile_compiler_xlc -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_c_compiler_xlc" >&6; } -XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes` -ac_ext=c +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___xlC__" >&6; } + if test "x$bakefile_cv_c_compiler___xlC__" = "xyes"; then + :; XLCC=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 + ;; IRIX*) @@ -14277,17 +18220,97 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5 echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6; } + if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then + :; SGICC=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 - if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then - :; SGICC=yes + + + ;; + + Linux*) + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { echo "$as_me:$LINENO: checking whether we are using the Sun C compiler" >&5 +echo $ECHO_N "checking whether we are using the Sun C compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_c_compiler___SUNPRO_C+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 __SUNPRO_C + 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___SUNPRO_C=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + bakefile_cv_c_compiler___SUNPRO_C=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 +echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; } + if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then + :; SUNCC=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 + ;; @@ -14357,17 +18380,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5 echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6; } + if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then + :; HPCC=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 - if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then - :; HPCC=yes - else - :; - fi ;; @@ -14437,17 +18460,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5 echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6; } + if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then + :; COMPAQCC=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 - if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then - :; COMPAQCC=yes - else - :; - fi ;; @@ -14517,17 +18540,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5 echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; } + if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then + :; SUNCC=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 - if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then - :; SUNCC=yes - else - :; - fi ;; @@ -15350,6 +19373,7 @@ 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' @@ -15412,17 +19436,18 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5 echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; } + if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then + :; INTELCXX=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 - if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then - :; INTELCXX=yes - else - :; - fi + if test "x$GCXX" != "xyes"; then @@ -15646,15 +19671,17 @@ fi case `uname -s` in AIX*) - 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 -{ echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 + { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_cxx_compiler_xlc+set}" = set; then +if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15667,9 +19694,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -15692,41 +19720,48 @@ 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 - bakefile_compiler_xlc=yes + bakefile_cv_cxx_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_compiler_xlc=no + bakefile_cv_cxx_compiler___xlC__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_cxx_compiler_xlc=$bakefile_compiler_xlc -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler_xlc" >&6; } -XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes` -ac_ext=c +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6; } + if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then + :; XLCXX=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 + ;; Darwin) - 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 -{ echo "$as_me:$LINENO: checking whether we are using the Metrowerks C++ compiler" >&5 + { echo "$as_me:$LINENO: checking whether we are using the Metrowerks C++ compiler" >&5 echo $ECHO_N "checking whether we are using the Metrowerks C++ compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_cxx_compiler_mwerks+set}" = set; then +if test "${bakefile_cv_cxx_compiler___MWERKS__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15739,9 +19774,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __MWERKS__ - choke me -#endif + + #ifndef __MWERKS__ + choke me + #endif ; return 0; @@ -15764,38 +19800,45 @@ 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 - bakefile_compiler_mwerks=yes + bakefile_cv_cxx_compiler___MWERKS__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_compiler_mwerks=no + bakefile_cv_cxx_compiler___MWERKS__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_cxx_compiler_mwerks=$bakefile_compiler_mwerks -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_mwerks" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler_mwerks" >&6; } -MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes` -ac_ext=c +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___MWERKS__" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___MWERKS__" >&6; } + if test "x$bakefile_cv_cxx_compiler___MWERKS__" = "xyes"; then + :; MWCXX=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_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 the IBM xlC C++ compiler" >&5 + { echo "$as_me:$LINENO: checking whether we are using the IBM xlC C++ compiler" >&5 echo $ECHO_N "checking whether we are using the IBM xlC C++ compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_cxx_compiler_xlc+set}" = set; then +if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15808,9 +19851,10 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -#ifndef __xlC__ - choke me -#endif + + #ifndef __xlC__ + choke me + #endif ; return 0; @@ -15833,29 +19877,34 @@ 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 - bakefile_compiler_xlc=yes + bakefile_cv_cxx_compiler___xlC__=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_compiler_xlc=no + bakefile_cv_cxx_compiler___xlC__=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - bakefile_cv_cxx_compiler_xlc=$bakefile_compiler_xlc -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler_xlc" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler_xlc" >&6; } -XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes` -ac_ext=c +fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___xlC__" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___xlC__" >&6; } + if test "x$bakefile_cv_cxx_compiler___xlC__" = "xyes"; then + :; XLCXX=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 + ;; IRIX*) @@ -15923,22 +19972,22 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5 echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6; } + if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then + :; SGICXX=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 - if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then - :; SGICXX=yes - else - :; - fi ;; - HP-UX*) + Linux*) ac_ext=cpp @@ -15947,9 +19996,9 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { echo "$as_me:$LINENO: checking whether we are using the HP C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the HP C++ compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_cxx_compiler___HP_aCC+set}" = set; then + { echo "$as_me:$LINENO: checking whether we are using the Sun C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15963,7 +20012,7 @@ int main () { - #ifndef __HP_aCC + #ifndef __SUNPRO_CC choke me #endif @@ -15988,12 +20037,12 @@ 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 - bakefile_cv_cxx_compiler___HP_aCC=yes + bakefile_cv_cxx_compiler___SUNPRO_CC=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_cv_cxx_compiler___HP_aCC=no + bakefile_cv_cxx_compiler___SUNPRO_CC=no fi @@ -16001,24 +20050,24 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6; } +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } + if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then + :; SUNCXX=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 - if test "x$bakefile_cv_c_compiler___HP_aCC" = "xyes"; then - :; HPCXX=yes - else - :; - fi ;; - OSF1) + HP-UX*) ac_ext=cpp @@ -16027,9 +20076,9 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { echo "$as_me:$LINENO: checking whether we are using the Compaq C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the Compaq C++ compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_cxx_compiler___DECCXX+set}" = set; then + { echo "$as_me:$LINENO: checking whether we are using the HP C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the HP C++ compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_cxx_compiler___HP_aCC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -16043,7 +20092,7 @@ int main () { - #ifndef __DECCXX + #ifndef __HP_aCC choke me #endif @@ -16068,12 +20117,12 @@ 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 - bakefile_cv_cxx_compiler___DECCXX=yes + bakefile_cv_cxx_compiler___HP_aCC=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - bakefile_cv_cxx_compiler___DECCXX=no + bakefile_cv_cxx_compiler___HP_aCC=no fi @@ -16081,24 +20130,24 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6; } +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6; } + if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then + :; HPCXX=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 - if test "x$bakefile_cv_c_compiler___DECCXX" = "xyes"; then - :; COMPAQCXX=yes - else - :; - fi ;; - SunOS) + OSF1) ac_ext=cpp @@ -16107,9 +20156,9 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { echo "$as_me:$LINENO: checking whether we are using the Sun C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then + { echo "$as_me:$LINENO: checking whether we are using the Compaq C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the Compaq C++ compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_cxx_compiler___DECCXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -16123,7 +20172,7 @@ int main () { - #ifndef __SUNPRO_CC + #ifndef __DECCXX choke me #endif @@ -16148,647 +20197,137 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - bakefile_cv_cxx_compiler___SUNPRO_CC=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - bakefile_cv_cxx_compiler___SUNPRO_CC=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 -echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } - 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$bakefile_cv_c_compiler___SUNPRO_CC" = "xyes"; then - :; SUNCXX=yes - else - :; - fi - - - ;; - esac - 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. -set dummy ${ac_tool_prefix}ar; 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_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # 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_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; 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_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_AR="ar" - 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_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_AR" = x; then - AR="" - 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 - AR=$ac_ct_AR - fi -else - AR="$ac_cv_prog_AR" -fi - - if test "x$AR" = "x" ; then - { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5 -echo "$as_me: error: ar is needed to build wxWidgets" >&2;} - { (exit 1); exit 1; }; } - 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; } + bakefile_cv_cxx_compiler___DECCXX=yes else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + bakefile_cv_cxx_compiler___DECCXX=no 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 -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; } -fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + - 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 +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6; } + if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then + :; COMPAQCXX=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 -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 -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 + ;; + SunOS) -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 + + 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 the Sun C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the Sun C++ compiler... $ECHO_C" >&6; } +if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+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 + 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 ;; + #ifndef __SUNPRO_CC + 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 - WINDRES=$ac_ct_WINDRES - fi +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___SUNPRO_CC=yes else - WINDRES="$ac_cv_prog_WINDRES" -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - 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 + bakefile_cv_cxx_compiler___SUNPRO_CC=no 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 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_WINDRES="windres" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS fi -fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -echo "${ECHO_T}$ac_ct_WINDRES" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi +{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5 +echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; } + if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then + :; SUNCXX=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 - 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" + + + ;; + esac + fi + + + +if test "$CXX" = "g++" -a "$GXX" != "yes"; then + { { echo "$as_me:$LINENO: error: C++ compiler is needed to build wxWidgets" >&5 +echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;} + { (exit 1); exit 1; }; } 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 +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. +set dummy ${ac_tool_prefix}ar; 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 +if test "${ac_cv_prog_AR+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. + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -16797,7 +20336,7 @@ do 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" + ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -16807,10 +20346,10 @@ IFS=$as_save_IFS fi fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6; } +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } @@ -16818,17 +20357,17 @@ fi fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; 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 +if test "${ac_cv_prog_ac_ct_AR+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. + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -16837,7 +20376,7 @@ do 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" + ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -16847,17 +20386,17 @@ 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; } +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="" + if test "x$ac_ct_AR" = x; then + AR="" else case $cross_compiling:$ac_tool_warned in yes:) @@ -16869,109 +20408,269 @@ 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 + AR=$ac_ct_AR fi else - DLLTOOL="$ac_cv_prog_DLLTOOL" + AR="$ac_cv_prog_AR" fi - ;; - esac + if test "x$AR" = "x" ; then + { { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5 +echo "$as_me: error: ar is needed to build wxWidgets" >&2;} + { (exit 1); exit 1; }; } + fi fi -{ echo "$as_me:$LINENO: checking if make is GNU make" >&5 -echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6; } -if test "${wx_cv_prog_makeisgnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +retest_macosx_linking=no - 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" +#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" + LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS" + retest_macosx_linking=yes + + { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5 +echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} + bk_use_pch=no fi +#fi +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 -{ echo "$as_me:$LINENO: result: $wx_cv_prog_makeisgnu" >&5 -echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6; } -if test "x$wx_cv_prog_makeisgnu" = "xyes"; then - IF_GNU_MAKE="" -else - IF_GNU_MAKE="#" -fi +if test "x$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 "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; } -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 + 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/'` -cat - << EOF > confMake -check : file - cp \$? \$@ - cp \$? final_file -EOF + # If that failed, try again with the new key + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then + + MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` + + fi + + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then + wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN + { echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5 +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 +fi -if test ! -d sub ; then - mkdir sub +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 -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" + +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 + + { 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. */ + +int +main () +{ + + ; + 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 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - wx_cv_prog_makevpath="no" -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + { { 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 -{ 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 +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 + + + 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 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. */ + +int +main () +{ + + ; + 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:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { { 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 +case "${host}" in + + *-*-darwin* ) + INSTALL_PROGRAM="cp -fp" + INSTALL_DATA="cp -fp" + ;; + *) + ;; +esac if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then @@ -17814,33 +21513,22 @@ 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` -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 @@ -17860,99 +21548,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 @@ -17968,26 +21576,19 @@ if test "$ac_cv_header_wchar_h" != "yes"; then for ac_header in wcstr.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 @@ -18007,99 +21608,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 @@ -18127,26 +21648,19 @@ if test "$USE_UNIX" = 1 ; then 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 @@ -18166,99 +21680,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 @@ -18357,370 +21791,45 @@ 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_c_const=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6; } -if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_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_c_inline=$ac_kw -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 - test "$ac_cv_c_inline" != no && break -done - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6; } - - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - - -{ echo "$as_me:$LINENO: checking for char" >&5 -echo $ECHO_N "checking for char... $ECHO_C" >&6; } -if test "${ac_cv_type_char+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 -typedef char 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_char=yes + ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_char=no + ac_cv_c_const=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 -echo "${ECHO_T}$ac_cv_type_char" >&6; } - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of char" >&5 -echo $ECHO_N "checking size of char... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_char+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef char ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 +{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6; } +if test $ac_cv_c_const = no; then - ; - 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_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<\_ACEOF +#define const _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef char ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 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_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef char ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; -test_array [0] = 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_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - typedef char ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; -test_array [0] = 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_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done +{ echo "$as_me:$LINENO: checking for inline" >&5 +echo $ECHO_N "checking for inline... $ECHO_C" >&6; } +if test "${ac_cv_c_inline+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_lo= ac_hi= -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do 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 - typedef char ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; -test_array [0] = 0 +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -18739,117 +21848,37 @@ 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_hi=$ac_mid + ac_cv_c_inline=$ac_kw else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_lo=`expr '(' $ac_mid ')' + 1` + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break done -case $ac_lo in -?*) ac_cv_sizeof_char=$ac_lo;; -'') if test "$ac_cv_type_char" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (char) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_char=0 - fi ;; -esac -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 - typedef char ac__type_sizeof_; -static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { - long int i = longval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%ld\n", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ((long int) (sizeof (ac__type_sizeof_)))) - return 1; - fprintf (f, "%lu\n", i); - } - return ferror (f) || fclose (f) != 0; - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_char=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -if test "$ac_cv_type_char" = yes; then - { { echo "$as_me:$LINENO: error: cannot compute sizeof (char) -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char) -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } - else - ac_cv_sizeof_char=0 - fi -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.val fi -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 -echo "${ECHO_T}$ac_cv_sizeof_char" >&6; } - +{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +echo "${ECHO_T}$ac_cv_c_inline" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_CHAR $ac_cv_sizeof_char +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif _ACEOF + ;; +esac { echo "$as_me:$LINENO: checking for short" >&5 @@ -22640,6 +25669,12 @@ if test "${wx_cv_func_va_copy+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 #include @@ -22671,7 +25706,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 @@ -22686,6 +25721,12 @@ 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 @@ -23388,233 +26429,6 @@ _ACEOF fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6; } -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - ac_ext=cpp @@ -23628,26 +26442,19 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu for ac_header in iostream 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 @@ -23667,99 +26474,19 @@ 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_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_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi ac_res=`eval echo '${'$as_ac_Header'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } - -fi if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -24522,194 +27249,70 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_std__ostream=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_std__ostream=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_std__ostream" >&5 -echo "${ECHO_T}$ac_cv_type_std__ostream" >&6; } -if test $ac_cv_type_std__ostream = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STD__OSTREAM 1 -_ACEOF - - -else - wxUSE_STD_IOSTREAM=no -fi - - - if test "$wxUSE_STD_IOSTREAM" != "yes"; then - if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then - { { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5 -echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5 -echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;} - fi - fi -fi - -if test "$wxUSE_STL" = "yes"; then - { echo "$as_me:$LINENO: checking for basic STL functionality" >&5 -echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6; } -if test "${wx_cv_lib_stl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #include - #include - #include - #include -int -main () -{ -std::vector moo; - std::list foo; - std::vector::iterator it = - std::find_if(moo.begin(), moo.end(), - std::bind2nd(std::less(), 3)); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - wx_cv_lib_stl=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_lib_stl=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5 -echo "${ECHO_T}$wx_cv_lib_stl" >&6; } - - if test "$wx_cv_lib_stl" != yes; then - { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5 -echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missing" >&2;} - { (exit 1); exit 1; }; } - fi - - { echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5 -echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6; } -if test "${wx_cv_func_stdstring_compare+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -std::string foo, bar; - foo.compare(bar); - foo.compare(1, 1, bar); - foo.compare(1, 1, bar, 1, 1); - foo.compare(""); - foo.compare(1, 1, ""); - foo.compare(1, 1, "", 2); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - wx_cv_func_stdstring_compare=yes + ac_cv_type_std__ostream=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_func_stdstring_compare=no - + ac_cv_type_std__ostream=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5 -echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_type_std__ostream" >&5 +echo "${ECHO_T}$ac_cv_type_std__ostream" >&6; } +if test $ac_cv_type_std__ostream = yes; then - if test "$wx_cv_func_stdstring_compare" = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STD_STRING_COMPARE 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_STD__OSTREAM 1 _ACEOF + +else + wxUSE_STD_IOSTREAM=no +fi + + + if test "$wxUSE_STD_IOSTREAM" != "yes"; then + if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then + { { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5 +echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5 +echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;} + fi fi +fi - if test "${ac_cv_header_hash_map+set}" = set; then - { echo "$as_me:$LINENO: checking for hash_map" >&5 -echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_hash_map+set}" = set; then +if test "$wxUSE_STL" = "yes"; then + { echo "$as_me:$LINENO: checking for basic STL functionality" >&5 +echo $ECHO_N "checking for basic STL functionality... $ECHO_C" >&6; } +if test "${wx_cv_lib_stl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_hash_map" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking hash_map usability" >&5 -echo $ECHO_N "checking hash_map 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 +#include + #include + #include + #include + #include +int +main () +{ +std::vector moo; + std::list foo; + std::vector::iterator it = + std::find_if(moo.begin(), moo.end(), + std::bind2nd(std::less(), 3)); + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -24728,98 +27331,137 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + wx_cv_lib_stl=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + wx_cv_lib_stl=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 hash_map presence" >&5 -echo $ECHO_N "checking hash_map presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF +fi +{ echo "$as_me:$LINENO: result: $wx_cv_lib_stl" >&5 +echo "${ECHO_T}$wx_cv_lib_stl" >&6; } + + if test "$wx_cv_lib_stl" != yes; then + { { echo "$as_me:$LINENO: error: Can't use --enable-stl as basic STL functionality is missing" >&5 +echo "$as_me: error: Can't use --enable-stl as basic STL functionality is missing" >&2;} + { (exit 1); exit 1; }; } + fi + + { echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5 +echo $ECHO_N "checking for compliant std::string::compare... $ECHO_C" >&6; } +if test "${wx_cv_func_stdstring_compare+set}" = set; then + echo $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::string foo, bar; + foo.compare(bar); + foo.compare(1, 1, bar); + foo.compare(1, 1, bar, 1, 1); + foo.compare(""); + foo.compare(1, 1, ""); + foo.compare(1, 1, "", 2); + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 2>conftest.er1 + (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); } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes + } && test -s conftest.$ac_objext; then + wx_cv_func_stdstring_compare=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + wx_cv_func_stdstring_compare=no + fi -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: hash_map: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: hash_map: present but cannot be compiled" >&5 -echo "$as_me: WARNING: hash_map: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: hash_map: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: hash_map: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: hash_map: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: hash_map: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: hash_map: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: hash_map: 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 hash_map" >&5 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5 +echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; } + + if test "$wx_cv_func_stdstring_compare" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_STRING_COMPARE 1 +_ACEOF + + fi + + { echo "$as_me:$LINENO: checking for hash_map" >&5 echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; } if test "${ac_cv_header_hash_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_hash_map=$ac_header_preproc + 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_hash_map=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_hash_map=no fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_hash_map" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 +echo "${ECHO_T}$ac_cv_header_hash_map" >&6; } if test $ac_cv_header_hash_map = yes; then { echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5 echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6; } @@ -24874,7 +27516,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5 echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; } - fi @@ -24890,25 +27531,20 @@ _ACEOF fi - if test "${ac_cv_header_ext_hash_map+set}" = set; then - { 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 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 -echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking ext/hash_map usability" >&5 -echo $ECHO_N "checking ext/hash_map 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 @@ -24928,98 +27564,18 @@ 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_header_compiler=yes + ac_cv_header_ext_hash_map=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_ext_hash_map=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 ext/hash_map presence" >&5 -echo $ECHO_N "checking ext/hash_map 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_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ext/hash_map: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ext/hash_map: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ext/hash_map: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ext/hash_map: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ext/hash_map: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ext/hash_map: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ext/hash_map: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ext/hash_map: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ext/hash_map: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ext/hash_map: 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 ext/hash_map" >&5 -echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; } -if test "${ac_cv_header_ext_hash_map+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_ext_hash_map=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5 echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; } - -fi if test $ac_cv_header_ext_hash_map = yes; then { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5 echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; } @@ -25074,7 +27630,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5 echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; } - fi @@ -25091,6 +27646,74 @@ _ACEOF fi fi + + + if test -n "$GCC"; then + { echo "$as_me:$LINENO: checking for __sync_fetch_* builtins" >&5 +echo $ECHO_N "checking for __sync_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. */ + +int +main () +{ + + int value=0; + __sync_fetch_and_add(&value, 1); + __sync_sub_and_fetch(&value, 1); + + ; + 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_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.$ac_ext + +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' @@ -25905,7 +28528,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 @@ -25987,7 +28610,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 @@ -26020,25 +28643,19 @@ echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode b fi if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then - if test "${ac_cv_header_regex_h+set}" = set; then - { echo "$as_me:$LINENO: checking for regex.h" >&5 + { echo "$as_me:$LINENO: checking for regex.h" >&5 echo $ECHO_N "checking for regex.h... $ECHO_C" >&6; } if test "${ac_cv_header_regex_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5 -echo "${ECHO_T}$ac_cv_header_regex_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking regex.h usability" >&5 -echo $ECHO_N "checking regex.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 @@ -26058,98 +28675,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_regex_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_regex_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 regex.h presence" >&5 -echo $ECHO_N "checking regex.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: regex.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: regex.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: regex.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: regex.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: regex.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: regex.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: regex.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: regex.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: regex.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: regex.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: regex.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 regex.h" >&5 -echo $ECHO_N "checking for regex.h... $ECHO_C" >&6; } -if test "${ac_cv_header_regex_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_regex_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_regex_h" >&5 echo "${ECHO_T}$ac_cv_header_regex_h" >&6; } - -fi if test $ac_cv_header_regex_h = yes; then @@ -26351,25 +28888,19 @@ fi fi { echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } - if test "${ac_cv_header_zlib_h+set}" = set; then - { echo "$as_me:$LINENO: checking for zlib.h" >&5 + { echo "$as_me:$LINENO: checking for zlib.h" >&5 echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } if test "${ac_cv_header_zlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking zlib.h usability" >&5 -echo $ECHO_N "checking zlib.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 @@ -26389,99 +28920,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 + ac_cv_header_zlib_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_zlib_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 zlib.h presence" >&5 -echo $ECHO_N "checking zlib.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: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: zlib.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 zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_zlib_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; } -fi - system_zlib_h_ok=$ac_cv_header_zlib_h @@ -26659,25 +29110,19 @@ fi fi { echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 echo "${ECHO_T}$ac_cv_header_png_h" >&6; } - if test "${ac_cv_header_png_h+set}" = set; then - { echo "$as_me:$LINENO: checking for png.h" >&5 + { echo "$as_me:$LINENO: checking for png.h" >&5 echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } if test "${ac_cv_header_png_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking png.h usability" >&5 -echo $ECHO_N "checking png.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 @@ -26697,99 +29142,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 + ac_cv_header_png_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_png_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 png.h presence" >&5 -echo $ECHO_N "checking png.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: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: png.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 png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_png_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 echo "${ECHO_T}$ac_cv_header_png_h" >&6; } -fi - if test "$ac_cv_header_png_h" = "yes"; then @@ -26875,8 +29240,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 @@ -27565,25 +29928,20 @@ _ACEOF if test "$wxUSE_ZLIB" = "sys"; then TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" fi - if test "${ac_cv_header_tiffio_h+set}" = set; then - { echo "$as_me:$LINENO: checking for tiffio.h" >&5 + { echo "$as_me:$LINENO: checking for tiffio.h" >&5 echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } if test "${ac_cv_header_tiffio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -echo $ECHO_N "checking tiffio.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 @@ -27603,98 +29961,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_tiffio_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_tiffio_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 tiffio.h presence" >&5 -echo $ECHO_N "checking tiffio.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: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tiffio.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 tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tiffio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_tiffio_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } - -fi if test $ac_cv_header_tiffio_h = yes; then { echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5 @@ -27763,7 +30041,6 @@ if test $ac_cv_lib_tiff_TIFFError = yes; then fi - fi @@ -27781,6 +30058,10 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead" else wxUSE_LIBTIFF=sys fi + if test "$wxUSE_LIBTIFF" = "builtin" ; then + subdirs="$subdirs src/tiff" + + fi fi fi @@ -27810,25 +30091,19 @@ _ACEOF if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then - if test "${ac_cv_header_expat_h+set}" = set; then - { echo "$as_me:$LINENO: checking for expat.h" >&5 + { echo "$as_me:$LINENO: checking for expat.h" >&5 echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; } if test "${ac_cv_header_expat_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 -echo "${ECHO_T}$ac_cv_header_expat_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking expat.h usability" >&5 -echo $ECHO_N "checking expat.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 @@ -27848,98 +30123,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_expat_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_expat_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 expat.h presence" >&5 -echo $ECHO_N "checking expat.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: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: expat.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 expat.h" >&5 -echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; } -if test "${ac_cv_header_expat_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_expat_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 echo "${ECHO_T}$ac_cv_header_expat_h" >&6; } - -fi if test $ac_cv_header_expat_h = yes; then found_expat_h=1 fi @@ -28102,25 +30297,19 @@ fi if test "$wxUSE_LIBMSPACK" != "no"; then - if test "${ac_cv_header_mspack_h+set}" = set; then - { echo "$as_me:$LINENO: checking for mspack.h" >&5 + { echo "$as_me:$LINENO: checking for mspack.h" >&5 echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6; } if test "${ac_cv_header_mspack_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 -echo "${ECHO_T}$ac_cv_header_mspack_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking mspack.h usability" >&5 -echo $ECHO_N "checking mspack.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 @@ -28140,98 +30329,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_mspack_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_mspack_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 mspack.h presence" >&5 -echo $ECHO_N "checking mspack.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: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: mspack.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: mspack.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: mspack.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: mspack.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 mspack.h" >&5 -echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6; } -if test "${ac_cv_header_mspack_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_mspack_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5 echo "${ECHO_T}$ac_cv_header_mspack_h" >&6; } - -fi if test $ac_cv_header_mspack_h = yes; then found_mspack_h=1 fi @@ -28330,26 +30439,19 @@ if test "$USE_WIN32" = 1 ; then for ac_header in w32api.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 @@ -28369,99 +30471,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 @@ -28471,25 +30493,19 @@ fi done - if test "${ac_cv_header_windows_h+set}" = set; then - { echo "$as_me:$LINENO: checking for windows.h" >&5 + { echo "$as_me:$LINENO: checking for windows.h" >&5 echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; } if test "${ac_cv_header_windows_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -echo "${ECHO_T}$ac_cv_header_windows_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking windows.h usability" >&5 -echo $ECHO_N "checking windows.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 @@ -28509,98 +30525,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_windows_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_windows_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 windows.h presence" >&5 -echo $ECHO_N "checking windows.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: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: windows.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: windows.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: windows.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 windows.h" >&5 -echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; } -if test "${ac_cv_header_windows_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_windows_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 echo "${ECHO_T}$ac_cv_header_windows_h" >&6; } - -fi if test $ac_cv_header_windows_h = yes; then : else @@ -28642,31 +30578,20 @@ _ACEOF WIN32INSTALL=win32install - -for ac_header in pbt.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 $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for pbt.h" >&5 +echo $ECHO_N "checking for pbt.h... $ECHO_C" >&6; } +if test "${ac_cv_header_pbt_h+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> + + +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -28685,104 +30610,20 @@ 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_pbt_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_pbt_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 $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 -_ACEOF - +{ echo "$as_me:$LINENO: result: $ac_cv_header_pbt_h" >&5 +echo "${ECHO_T}$ac_cv_header_pbt_h" >&6; } +if test $ac_cv_header_pbt_h = yes; then + : else cat >>confdefs.h <<\_ACEOF #define NEED_PBT_H 1 @@ -28790,7 +30631,6 @@ _ACEOF fi -done fi @@ -28856,7 +30696,7 @@ echo "${ECHO_T}" >&6; } case "${host}" in *-*-solaris2* ) if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then - enable_gtktest=no + enable_gtktest=no fi esac @@ -29175,11 +31015,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ case "${host}" in *-*-solaris2* ) - if test "$wxUSE_THREADS" = "yes" -a "$GCC" = yes; then - GTK_CFLAGS=`echo $GTK_CFLAGS | sed 's/-mt//'` - GTK_LIBS=`echo $GTK_LIBS | sed 's/-mt//'` - fi - if test "$wxUSE_SHARED" != "yes"; then + if test "$wxUSE_SHARED" != "yes"; then GTK_LIBS="$GTK_LIBS -lX11" fi esac @@ -32543,12 +34379,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; } @@ -33425,32 +35255,37 @@ else fi + +if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then + if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then + wxUSE_UNICODE_UTF8=yes + elif test "$USE_OS2" = "1" ; then + wxUSE_UNICODE_UTF8=yes + else + wxUSE_UNICODE_UTF8=no + fi +fi + + if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then for ac_header in X11/Xlib.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 @@ -33470,99 +35305,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 @@ -33646,25 +35401,19 @@ if test "$TOOLKIT" != "MSW" ; then if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then - if test "${ac_cv_header_sql_h+set}" = set; then - { echo "$as_me:$LINENO: checking for sql.h" >&5 + { echo "$as_me:$LINENO: checking for sql.h" >&5 echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; } if test "${ac_cv_header_sql_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5 -echo "${ECHO_T}$ac_cv_header_sql_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking sql.h usability" >&5 -echo $ECHO_N "checking sql.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 @@ -33684,98 +35433,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_sql_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_sql_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 sql.h presence" >&5 -echo $ECHO_N "checking sql.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: sql.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: sql.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: sql.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: sql.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: sql.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: sql.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: sql.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: sql.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: sql.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: sql.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: sql.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 sql.h" >&5 -echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sql_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_sql_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5 echo "${ECHO_T}$ac_cv_header_sql_h" >&6; } - -fi if test $ac_cv_header_sql_h = yes; then found_sql_h=1 fi @@ -34149,13 +35818,9 @@ echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} wxUSE_DISPLAY="no" fi elif test "$wxUSE_MSW" = 1; then - -for ac_header in ddraw.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 "$as_me:$LINENO: checking for ddraw.h" >&5 +echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ddraw_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -34166,7 +35831,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include <$ac_header> +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -34185,27 +35850,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 - eval "$as_ac_Header=yes" + ac_cv_header_ddraw_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + ac_cv_header_ddraw_h=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5 +echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; } -done fi fi @@ -34305,25 +35962,19 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; } echo "${ECHO_T}not found" >&6; } fi - if test "${ac_cv_header_GL_gl_h+set}" = set; then - { echo "$as_me:$LINENO: checking for GL/gl.h" >&5 + { echo "$as_me:$LINENO: checking for GL/gl.h" >&5 echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; } if test "${ac_cv_header_GL_gl_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 -echo $ECHO_N "checking GL/gl.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 @@ -34343,119 +35994,33 @@ 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_gl_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_GL_gl_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/gl.h presence" >&5 -echo $ECHO_N "checking GL/gl.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/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: GL/gl.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/gl.h" >&5 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6; } -if test "${ac_cv_header_GL_gl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_GL_gl_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } - -fi 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 @@ -34475,98 +36040,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 @@ -34825,6 +36310,281 @@ echo "${ECHO_T}$wx_cv_version_script" >&6; } esac + if test "$wxUSE_VISIBILITY" != "no"; then + + + if test -n "$GCC"; then + CFLAGS_VISIBILITY="-fvisibility=hidden" + CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden" + { echo "$as_me:$LINENO: checking for symbols visibility support" >&5 +echo $ECHO_N "checking for symbols visibility support... $ECHO_C" >&6; } + if test "${wx_cv_cc_visibility+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + wx_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" + 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. */ + + /* we need gcc >= 4.0, older versions with visibility support + didn't have class visibility: */ + #if defined(__GNUC__) && __GNUC__ < 4 + 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); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + class __attribute__((__visibility__("default"))) Foo { + Foo() {} + }; + +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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_cc_visibility=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_cc_visibility=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 + + CXXFLAGS="$wx_save_CXXFLAGS" +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="" + fi + + + fi + + fi + + if test "x$SUNCXX" = xyes; then + SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib" + WXCONFIG_RPATH="-R\$libdir" + else case "${host}" in *-*-linux* | *-*-gnu* ) SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" @@ -34832,14 +36592,14 @@ echo "${ECHO_T}$wx_cv_version_script" >&6; } ;; *-*-solaris2* ) - if test "$GCC" = yes ; then - CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS" - saveLdflags="$LDFLAGS" - LDFLAGS="$saveLdflags -Wl,-rpath,/" - { echo "$as_me:$LINENO: checking if the linker accepts -rpath" >&5 + CPPFLAGS="-isystem /usr/openwin/include $CPPFLAGS" + + saveLdflags="$LDFLAGS" + LDFLAGS="$saveLdflags -Wl,-rpath,/" + { echo "$as_me:$LINENO: checking if the linker accepts -rpath" >&5 echo $ECHO_N "checking if the linker accepts -rpath... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -34873,22 +36633,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-Wl,-rpath,\$libdir" + SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(wx_top_builddir)/lib" + WXCONFIG_RPATH="-Wl,-rpath,\$libdir" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: no" >&5 + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: checking if the linker accepts -R" >&5 + { echo "$as_me:$LINENO: checking if the linker accepts -R" >&5 echo $ECHO_N "checking if the linker accepts -R... $ECHO_C" >&6; } - LDFLAGS="$saveLdflags -Wl,-R,/" - cat >conftest.$ac_ext <<_ACEOF + LDFLAGS="$saveLdflags -Wl,-R,/" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -34922,17 +36682,17 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - { echo "$as_me:$LINENO: result: yes" >&5 + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-Wl,-R,\$libdir" + SAMPLES_RPATH_FLAG="-Wl,-R,\$(wx_top_builddir)/lib" + WXCONFIG_RPATH="-Wl,-R,\$libdir" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - { echo "$as_me:$LINENO: result: no" >&5 + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi @@ -34944,11 +36704,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$saveLdflags" - else - SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib" - WXCONFIG_RPATH="-R\$libdir" - fi + LDFLAGS="$saveLdflags" ;; *-*-darwin* ) @@ -34978,6 +36734,7 @@ EOF ;; esac + fi if test $wxUSE_RPATH = "no"; then SAMPLES_RPATH_FLAG='' @@ -35165,154 +36922,6 @@ 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; } @@ -35805,6 +37414,79 @@ _ACEOF fi fi +{ echo "$as_me:$LINENO: checking if wchar_t is separate type" >&5 +echo $ECHO_N "checking if wchar_t is separate type... $ECHO_C" >&6; } +if test "${wx_cv_wchar_t_is_separate_type+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 () +{ + + return 0; } + + struct Foo { void foo(wchar_t); + void foo(unsigned short); + void foo(unsigned int); + void foo(unsigned long); }; + + int bar() { + + ; + 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_wchar_t_is_separate_type=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_wchar_t_is_separate_type=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_wchar_t_is_separate_type" >&5 +echo "${ECHO_T}$wx_cv_wchar_t_is_separate_type" >&6; } + +if test "$wx_cv_wchar_t_is_separate_type" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxWCHAR_T_IS_REAL_TYPE 1 +_ACEOF + +else + cat >>confdefs.h <<\_ACEOF +#define wxWCHAR_T_IS_REAL_TYPE 0 +_ACEOF + +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -36131,6 +37813,101 @@ _ACEOF fi + +for ac_func in wcsdup +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 "$USE_HPUX" = 1 -a "$GCC" != "yes"; then CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" fi @@ -36615,80 +38392,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 @@ -36778,172 +38481,6 @@ 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 - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - #include - #include - -int -main () -{ - - wchar_t *buf; - const wchar_t *fmt = L"test"; - swprintf(buf, 10u, fmt); - - ; - 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_swprintf_decl=no -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_func_broken_swprintf_decl=yes - -fi - -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; } - - if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_BROKEN_SWPRINTF_DECL 1 -_ACEOF - - fi - fi - wchar_headers="#include #include " case "${host}" in @@ -36952,26 +38489,19 @@ _ACEOF for ac_header in widec.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 @@ -36991,99 +38521,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 @@ -37100,7 +38550,7 @@ done esac - for wx_func in wputc wputchar putws fputws wprintf vswprintf + for wx_func in putws fputws wprintf vswprintf do { echo "$as_me:$LINENO: checking for $wx_func" >&5 echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } @@ -37170,7 +38620,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 @@ -37232,9 +38682,9 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext; fi -if test "x$ac_cv_header_fnmatch_h" = "xyes"; then +if test "$wxUSE_FILE" = "yes"; then - for wx_func in fnmatch + for wx_func in fsync do { echo "$as_me:$LINENO: checking for $wx_func" >&5 echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } @@ -37250,7 +38700,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + $ac_includes_default int @@ -37304,7 +38754,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 @@ -37316,9 +38766,14 @@ _ACEOF fi -if test "$wxUSE_FILE" = "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 - for wx_func in fsync + + for wx_func in round do { echo "$as_me:$LINENO: checking for $wx_func" >&5 echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } @@ -37334,7 +38789,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - + #include $ac_includes_default int @@ -37365,7 +38820,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 @@ -37388,7 +38843,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 @@ -37398,88 +38853,11 @@ _ACEOF fi done -fi - - - for wx_func in round - 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 +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 "$TOOLKIT" != "MSW"; then @@ -38606,7 +39984,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 @@ -38695,14 +40074,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 @@ -38791,10 +40169,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 @@ -39053,7 +40432,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 @@ -39147,7 +40526,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 @@ -39229,7 +40608,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 @@ -39312,7 +40691,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 @@ -39774,375 +41153,83 @@ 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 - eval "$as_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Lib=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 -ac_res=`eval echo '${'$as_ac_Lib'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_INET_ATON 1 -_ACEOF - -fi - - -fi -done - - -if test "x$INET_LINK" != "x"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_INET_ADDR 1 -_ACEOF - - INET_LINK=" -l$INET_LINK" -fi - - - for wx_func in fdopen - 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 HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 -_ACEOF - - - else - : - - fi - done - - -fi - - - - -EXTRALIBS_ESD= -{ echo "$as_me:$LINENO: checking for esd_close in -lesd" >&5 -echo $ECHO_N "checking for esd_close in -lesd... $ECHO_C" >&6; } -if test "${ac_cv_lib_esd_esd_close+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lesd $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 esd_close (); -int -main () -{ -return esd_close (); - ; - 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_esd_esd_close=yes + eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_esd_esd_close=no + eval "$as_ac_Lib=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_esd_esd_close" >&5 -echo "${ECHO_T}$ac_cv_lib_esd_esd_close" >&6; } -if test $ac_cv_lib_esd_esd_close = yes; then - - -for ac_header in esd.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 $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'}'` +ac_res=`eval echo '${'$as_ac_Lib'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +if test `eval echo '${'$as_ac_Lib'}'` = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_INET_ATON 1 _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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_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 +done -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 +if test "x$INET_LINK" != "x"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_INET_ADDR 1 _ACEOF - EXTRALIBS_ESD="-lesd" - + INET_LINK=" -l$INET_LINK" fi -done - - -fi + for wx_func in fdopen + 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 -{ echo "$as_me:$LINENO: checking for known CD-ROM interface" >&5 -echo $ECHO_N "checking for known CD-ROM interface... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ + /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#ifdef __linux__ - #include - #else - /* For Solaris */ - #include - #endif + + + $ac_includes_default int main () { -struct cdrom_tocentry entry, old_entry; + + #ifndef $wx_func + &$wx_func; + #endif + + ; return 0; } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -40151,22 +41238,40 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - cat >>confdefs.h <<\_ACEOF -#define HAVE_KNOWN_CDROM_INTERFACE 1 -_ACEOF - + } && 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 - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + 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 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >confcache <<\_ACEOF @@ -40262,12 +41367,14 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} THREAD_OPTS="-pthread" + if test "x$SUNCXX" = xyes; then + THREAD_OPTS="-mt lthread $THREAD_OPTS" + fi + case "${host}" in *-*-solaris2* | *-*-sunos4* ) if test "x$GCC" = "xyes"; then THREAD_OPTS="-pthreads $THREAD_OPTS" - else - THREAD_OPTS="-mt $THREAD_OPTS" fi ;; *-*-freebsd*) @@ -40527,6 +41634,12 @@ if test "${wx_cv_func_pthread_cleanup+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 @@ -40562,7 +41675,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 @@ -40579,6 +41692,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi { echo "$as_me:$LINENO: result: $wx_cv_func_pthread_cleanup" >&5 @@ -40594,26 +41713,19 @@ _ACEOF for ac_header in sched.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 @@ -40633,99 +41745,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 @@ -41135,113 +42167,205 @@ 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_sched_get_priority_max=yes + ac_cv_func_sched_get_priority_max=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_sched_get_priority_max=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_sched_get_priority_max" >&5 +echo "${ECHO_T}$ac_cv_func_sched_get_priority_max" >&6; } +if test $ac_cv_func_sched_get_priority_max = yes; then + HAVE_PRIOR_FUNCS=1 +else + { echo "$as_me:$LINENO: checking for sched_get_priority_max in -lposix4" >&5 +echo $ECHO_N "checking for sched_get_priority_max in -lposix4... $ECHO_C" >&6; } +if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lposix4 $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 sched_get_priority_max (); +int +main () +{ +return sched_get_priority_max (); + ; + 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_posix4_sched_get_priority_max=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_posix4_sched_get_priority_max=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_posix4_sched_get_priority_max" >&5 +echo "${ECHO_T}$ac_cv_lib_posix4_sched_get_priority_max" >&6; } +if test $ac_cv_lib_posix4_sched_get_priority_max = yes; then + + HAVE_PRIOR_FUNCS=1 + POSIX4_LINK=" -lposix4" + +fi + + +fi + + +fi + + +fi + + + if test "$HAVE_PRIOR_FUNCS" = 1; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: Setting thread priority will not work" >&5 +echo "$as_me: WARNING: Setting thread priority will not work" >&2;} + fi + + { echo "$as_me:$LINENO: checking for pthread_cancel" >&5 +echo $ECHO_N "checking for pthread_cancel... $ECHO_C" >&6; } +if test "${ac_cv_func_pthread_cancel+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 pthread_cancel to an innocuous variant, in case declares pthread_cancel. + For example, HP-UX 11i declares gettimeofday. */ +#define pthread_cancel innocuous_pthread_cancel + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char pthread_cancel (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef pthread_cancel + +/* 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 pthread_cancel (); +/* 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_pthread_cancel || defined __stub___pthread_cancel +choke me +#endif + +int +main () +{ +return pthread_cancel (); + ; + 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_pthread_cancel=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_sched_get_priority_max=no + ac_cv_func_pthread_cancel=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_sched_get_priority_max" >&5 -echo "${ECHO_T}$ac_cv_func_sched_get_priority_max" >&6; } -if test $ac_cv_func_sched_get_priority_max = yes; then - HAVE_PRIOR_FUNCS=1 -else - { echo "$as_me:$LINENO: checking for sched_get_priority_max in -lposix4" >&5 -echo $ECHO_N "checking for sched_get_priority_max in -lposix4... $ECHO_C" >&6; } -if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_cancel" >&5 +echo "${ECHO_T}$ac_cv_func_pthread_cancel" >&6; } +if test $ac_cv_func_pthread_cancel = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_PTHREAD_CANCEL 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 sched_get_priority_max (); -int -main () -{ -return sched_get_priority_max (); - ; - 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_posix4_sched_get_priority_max=yes else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_posix4_sched_get_priority_max=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_posix4_sched_get_priority_max" >&5 -echo "${ECHO_T}$ac_cv_lib_posix4_sched_get_priority_max" >&6; } -if test $ac_cv_lib_posix4_sched_get_priority_max = yes; then - - HAVE_PRIOR_FUNCS=1 - POSIX4_LINK=" -lposix4" - -fi - - -fi - - -fi - - + { echo "$as_me:$LINENO: WARNING: wxThread::Kill() will not work properly" >&5 +echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;} fi - if test "$HAVE_PRIOR_FUNCS" = 1; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 -_ACEOF - - else - { echo "$as_me:$LINENO: WARNING: Setting thread priority will not work" >&5 -echo "$as_me: WARNING: Setting thread priority will not work" >&2;} - fi - - { echo "$as_me:$LINENO: checking for pthread_cancel" >&5 -echo $ECHO_N "checking for pthread_cancel... $ECHO_C" >&6; } -if test "${ac_cv_func_pthread_cancel+set}" = set; then + { echo "$as_me:$LINENO: checking for pthread_mutex_timedlock" >&5 +echo $ECHO_N "checking for pthread_mutex_timedlock... $ECHO_C" >&6; } +if test "${ac_cv_func_pthread_mutex_timedlock+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -41250,12 +42374,12 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define pthread_cancel to an innocuous variant, in case declares pthread_cancel. +/* Define pthread_mutex_timedlock to an innocuous variant, in case declares pthread_mutex_timedlock. For example, HP-UX 11i declares gettimeofday. */ -#define pthread_cancel innocuous_pthread_cancel +#define pthread_mutex_timedlock innocuous_pthread_mutex_timedlock /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_cancel (); below. + which can conflict with char pthread_mutex_timedlock (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -41265,7 +42389,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif -#undef pthread_cancel +#undef pthread_mutex_timedlock /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -41273,18 +42397,18 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char pthread_cancel (); +char pthread_mutex_timedlock (); /* 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_pthread_cancel || defined __stub___pthread_cancel +#if defined __stub_pthread_mutex_timedlock || defined __stub___pthread_mutex_timedlock choke me #endif int main () { -return pthread_cancel (); +return pthread_mutex_timedlock (); ; return 0; } @@ -41307,27 +42431,27 @@ 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_cancel=yes + ac_cv_func_pthread_mutex_timedlock=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_pthread_cancel=no + ac_cv_func_pthread_mutex_timedlock=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_cancel" >&5 -echo "${ECHO_T}$ac_cv_func_pthread_cancel" >&6; } -if test $ac_cv_func_pthread_cancel = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_pthread_mutex_timedlock" >&5 +echo "${ECHO_T}$ac_cv_func_pthread_mutex_timedlock" >&6; } +if test $ac_cv_func_pthread_mutex_timedlock = yes; then cat >>confdefs.h <<\_ACEOF -#define HAVE_PTHREAD_CANCEL 1 +#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1 _ACEOF else - { echo "$as_me:$LINENO: WARNING: wxThread::Kill() will not work properly" >&5 -echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;} + { echo "$as_me:$LINENO: WARNING: wxMutex::LockTimeout() will not work" >&5 +echo "$as_me: WARNING: wxMutex::LockTimeout() will not work" >&2;} fi @@ -41866,94 +42990,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for readdir_r" >&5 -echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6; } -if test "${ac_cv_func_readdir_r+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define readdir_r to an innocuous variant, in case declares readdir_r. - For example, HP-UX 11i declares gettimeofday. */ -#define readdir_r innocuous_readdir_r - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char readdir_r (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef readdir_r - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char readdir_r (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_readdir_r || defined __stub___readdir_r -choke me -#endif - -int -main () -{ -return readdir_r (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_readdir_r=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_readdir_r=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5 -echo "${ECHO_T}$ac_cv_func_readdir_r" >&6; } -if test $ac_cv_func_readdir_r = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_READDIR_R 1 -_ACEOF - -fi - @@ -43418,6 +44454,13 @@ _ACEOF fi +if test "$wxUSE_EXTENDED_RTTI" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_EXTENDED_RTTI 1 +_ACEOF + +fi + if test "$wxUSE_APPLE_IEEE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_APPLE_IEEE 1 @@ -43555,8 +44598,6 @@ echo "${ECHO_T}$ac_cv_header_sys_soundcard" >&6; } #define HAVE_SYS_SOUNDCARD_H 1 _ACEOF - else - DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia" fi fi @@ -44022,6 +45063,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 @@ -44573,6 +45705,13 @@ _ACEOF fi +if test "$wxUSE_BASE64" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_BASE64 1 +_ACEOF + +fi + if test "$wxUSE_STREAMS" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_STREAMS 1 @@ -44587,11 +45726,104 @@ _ACEOF fi +if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OBJC_UNIQUIFYING 1 +_ACEOF + +fi -if test "$wxUSE_DATETIME" = "yes"; then +if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_CONSOLE_EVENTLOOP 1 +_ACEOF -for ac_func in strptime + + 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 @@ -44680,23 +45912,18 @@ 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_strptime" = "yes"; then - { echo "$as_me:$LINENO: checking for strptime declaration" >&5 -echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6; } -if test "${wx_cv_func_strptime_decl+set}" = set; then + +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 - 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 @@ -44704,14 +45931,15 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include + #include int main () { - struct tm t; - strptime("foo", "bar", &t); + struct timeval tv; + gettimeofday(&tv, NULL); ; return 0; @@ -44731,110 +45959,194 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_func_strptime_decl=yes + wx_cv_func_gettimeofday_has_2_args=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_func_strptime_decl=no + 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 - 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 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_decl" >&5 -echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6; } - fi - if test "$wx_cv_func_strptime_decl" = "yes"; then +{ 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 HAVE_STRPTIME_DECL 1 +#define WX_GETTIMEOFDAY_NO_TZ 1 _ACEOF fi +fi - { echo "$as_me:$LINENO: checking for timezone variable in " >&5 -echo $ECHO_N "checking for timezone variable in ... $ECHO_C" >&6; } -if test "${wx_cv_var_timezone+set}" = set; then +if test "$wxUSE_DATETIME" = "yes"; then + { echo "$as_me:$LINENO: checking for strptime" >&5 +echo $ECHO_N "checking for strptime... $ECHO_C" >&6; } +if test "${ac_cv_func_strptime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - 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. */ +/* Define strptime to an innocuous variant, in case declares strptime. + For example, HP-UX 11i declares gettimeofday. */ +#define strptime innocuous_strptime - #include +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char strptime (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef strptime + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char strptime (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_strptime || defined __stub___strptime +choke me +#endif int main () { - - int tz; - tz = timezone; - +return strptime (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 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_var_timezone=timezone - + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_strptime=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + ac_cv_func_strptime=no +fi - cat >conftest.$ac_ext <<_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5 +echo "${ECHO_T}$ac_cv_func_strptime" >&6; } + + if test "$ac_cv_func_strptime" = "yes"; then + { echo "$as_me:$LINENO: checking for strptime declaration" >&5 +echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6; } +if test "${wx_cv_func_strptime_decl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main () { - int tz; - tz = _timezone; + struct tm t; + strptime("foo", "bar", &t); ; return 0; @@ -44857,29 +46169,134 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then + wx_cv_func_strptime_decl=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_var_timezone=_timezone + wx_cv_func_strptime_decl=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_decl" >&5 +echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6; } + fi + if test "$wx_cv_func_strptime_decl" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STRPTIME_DECL 1 +_ACEOF + else + wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);" + fi + if test "$ac_cv_func_strptime" = "yes"; then + { echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5 +echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6; } +if test "${wx_cv_func_strptime_ok+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 + if test "$cross_compiling" = yes; then + wx_cv_func_strptime_ok=no + +else + cat >conftest.$ac_ext <<_ACEOF + + #include + #include + #include "confdefs.h" + + $wx_strptime_decl + + int main() + { + struct tm t; + return !!strptime("", "%x", &t); + } + +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + wx_cv_func_strptime_ok=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +( exit $ac_status ) +wx_cv_func_strptime_ok=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + - cat >conftest.$ac_ext <<_ACEOF + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5 +echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; } + + if test "$wx_cv_func_strptime_ok" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STRPTIME 1 +_ACEOF + + fi + fi + + { echo "$as_me:$LINENO: checking for timezone variable in " >&5 +echo $ECHO_N "checking for timezone variable in ... $ECHO_C" >&6; } +if test "${wx_cv_var_timezone+set}" = set; then + 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 () { - int tz; - tz = __timezone; + int tz; + tz = timezone; ; return 0; @@ -44903,168 +46320,73 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_var_timezone=__timezone + wx_cv_var_timezone=timezone else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - if test "$USE_DOS" = 0 ; then - { echo "$as_me:$LINENO: WARNING: no timezone variable" >&5 -echo "$as_me: WARNING: no timezone variable" >&2;} - fi - - -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_var_timezone" >&5 -echo "${ECHO_T}$wx_cv_var_timezone" >&6; } - - if test "x$wx_cv_var_timezone" != x ; then - cat >>confdefs.h <<_ACEOF -#define WX_TIMEZONE $wx_cv_var_timezone -_ACEOF - - fi - - -for ac_func in localtime -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 + 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 + #include int main () { -return $ac_func (); + + int tz; + tz = _timezone; + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" +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_link") 2>conftest.er1 + (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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" + } && test -s conftest.$ac_objext; then + + wx_cv_var_timezone=_timezone + 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_localtime" = "yes"; then - { echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5 -echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; } -if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include int main () { - struct tm tm; - tm.tm_gmtoff++; + int tz; + tz = __timezone; ; return 0; @@ -45084,37 +46406,57 @@ 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_struct_tm_has_gmtoff=yes + wx_cv_var_timezone=__timezone else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_struct_tm_has_gmtoff=no + + if test "$USE_DOS" = 0 ; then + { echo "$as_me:$LINENO: WARNING: no timezone variable" >&5 +echo "$as_me: WARNING: no timezone variable" >&2;} + fi + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -{ echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5 -echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6; } - fi - if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define WX_GMTOFF_IN_TM 1 +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_var_timezone" >&5 +echo "${ECHO_T}$wx_cv_var_timezone" >&6; } + + if test "x$wx_cv_var_timezone" != x ; then + cat >>confdefs.h <<_ACEOF +#define WX_TIMEZONE $wx_cv_var_timezone _ACEOF fi - -for ac_func in gettimeofday ftime +for ac_func in localtime do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -45203,34 +46545,33 @@ 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 + if test "$ac_cv_func_localtime" = "yes"; then + { echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5 +echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; } +if test "${wx_cv_struct_tm_has_gmtoff+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 int main () { - struct timeval tv; - gettimeofday(&tv, NULL); + struct tm tm; + tm.tm_gmtoff++; ; return 0; @@ -45253,78 +46594,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 - 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); + wx_cv_struct_tm_has_gmtoff=yes - ; - 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 + wx_cv_struct_tm_has_gmtoff=no 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; } +{ echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5 +echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6; } + fi - if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then - cat >>confdefs.h <<\_ACEOF -#define WX_GETTIMEOFDAY_NO_TZ 1 + if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define WX_GMTOFF_IN_TM 1 _ACEOF - fi fi SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" @@ -45699,6 +46991,12 @@ 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 @@ -45734,7 +47032,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_type_getsockopt5=socklen_t @@ -45743,12 +47041,6 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - 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 @@ -45844,17 +47136,17 @@ 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 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 @@ -46022,9 +47314,13 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; } 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 + +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 @@ -46033,9 +47329,9 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +$ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -46054,22 +47350,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 @@ -46088,6 +47389,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 @@ -46181,31 +47489,20 @@ fi fi fi -if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_EXPERIMENTAL_PRINTF 1 +if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UNICODE_UTF8 1 _ACEOF -fi - -if test "$wxUSE_POSTSCRIPT" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_POSTSCRIPT 1 + if test "$wxUSE_UNICODE_UTF8_LOCALE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UTF8_LOCALE_ONLY 1 _ACEOF + fi fi -cat >>confdefs.h <<\_ACEOF -#define wxUSE_AFM_FOR_POSTSCRIPT 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define wxUSE_NORMALIZED_PS_FONTS 1 -_ACEOF - - if test "$wxUSE_CONSTRAINTS" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -46284,10 +47581,23 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" fi -if test "$wxUSE_PROLOGIO" = "yes" -o "$wxUSE_RESOURCES" = "yes"; then - { { echo "$as_me:$LINENO: error: wxExpr and old-style resources are now available in contrib only" >&5 -echo "$as_me: error: wxExpr and old-style resources are now available in contrib only" >&2;} - { (exit 1); exit 1; }; } +if test "$wxUSE_POSTSCRIPT" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_POSTSCRIPT 1 +_ACEOF + +fi + +cat >>confdefs.h <<\_ACEOF +#define wxUSE_AFM_FOR_POSTSCRIPT 1 +_ACEOF + + +if test "$wxUSE_SVG" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_SVG 1 +_ACEOF + fi @@ -46304,31 +47614,20 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ -o "$wxUSE_CLIPBOARD" = "yes" \ -o "$wxUSE_OLE" = "yes" \ -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then - -for ac_header in ole2.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 $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for ole2.h" >&5 +echo $ECHO_N "checking for ole2.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ole2_h+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> + + +#include _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -46347,107 +47646,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 + ac_cv_header_ole2_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_ole2_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 $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 -_ACEOF - fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ole2_h" >&5 +echo "${ECHO_T}$ac_cv_header_ole2_h" >&6; } -done if test "$ac_cv_header_ole2_h" = "yes" ; then @@ -46750,7 +47961,6 @@ if test "$wxUSE_CHECKLST" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then @@ -46777,6 +47987,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 @@ -46803,7 +48021,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 @@ -46877,7 +48095,6 @@ if test "$wxUSE_LISTBOX" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox" fi if test "$wxUSE_LISTCTRL" = "yes"; then @@ -46894,6 +48111,15 @@ echo "$as_me: WARNING: wxListCtrl requires wxImageList and won't be compiled wit fi fi +if test "$wxUSE_EDITABLELISTBOX" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_EDITABLELISTBOX 1 +_ACEOF + + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox" +fi + if test "$wxUSE_NOTEBOOK" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_NOTEBOOK 1 @@ -46912,7 +48138,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo" fi - if test "$wxUSE_RADIOBOX" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_RADIOBOX 1 @@ -47192,13 +48417,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 @@ -47337,6 +48555,16 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui" fi +USE_STC=0 +if test "$wxUSE_STC" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_STC 1 +_ACEOF + + USE_STC=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc" +fi + if test "$wxUSE_MENUS" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_MENUS 1 @@ -47364,7 +48592,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 @@ -47372,10 +48599,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 @@ -47588,6 +48819,63 @@ _ACEOF 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_OWNER_DRAWN" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OWNER_DRAWN 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 "$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_GRAPHICS_CONTEXT" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then cat >>confdefs.h <<\_ACEOF @@ -47860,14 +49148,6 @@ fi if test "$wxUSE_GSTREAMER" = "yes"; then - case "${host}" in - *-*-solaris2* ) - if "$GCC" = yes; then - GST_CFLAGS=`echo $GST_CFLAGS | sed 's/-mt//'` - GST_LIBS=`echo $GST_LIBS | sed 's/-mt//'` - fi - esac - CPPFLAGS="$GST_CFLAGS $CPPFLAGS" LIBS="$GST_LIBS $LIBS" @@ -47916,31 +49196,54 @@ _ACEOF -CORE_BASE_LIBS="net base" -CORE_GUI_LIBS="adv core" +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" -if test "$wxUSE_XML" = "yes" ; then - CORE_BASE_LIBS="xml $CORE_BASE_LIBS" +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 - CORE_BASE_LIBS="odbc $CORE_BASE_LIBS" - CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS" -fi -if test "$wxUSE_HTML" = "yes" ; then - CORE_GUI_LIBS="html $CORE_GUI_LIBS" -fi -if test "$wxUSE_DEBUGREPORT" = "yes" ; then - CORE_GUI_LIBS="qa $CORE_GUI_LIBS" -fi -if test "$wxUSE_XRC" = "yes" ; then - CORE_GUI_LIBS="xrc $CORE_GUI_LIBS" + BUILT_WX_LIBS="odbc $BUILT_WX_LIBS" fi -if test "$wxUSE_AUI" = "yes" ; then - CORE_GUI_LIBS="aui $CORE_GUI_LIBS" +if test "$wxUSE_XML" = "yes" ; then + STD_BASE_LIBS="xml $STD_BASE_LIBS" + BUILT_WX_LIBS="xml $BUILT_WX_LIBS" fi -if test "$wxUSE_GUI" != "yes"; then - CORE_GUI_LIBS="" +if test "$wxUSE_GUI" = "yes"; then + STD_GUI_LIBS="adv core" + BUILT_WX_LIBS="$STD_GUI_LIBS $BUILT_WX_LIBS" + + if test "$wxUSE_DEBUGREPORT" = "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" + fi + if test "$wxUSE_MEDIACTRL" = "yes" ; then + BUILT_WX_LIBS="media $BUILT_WX_LIBS" + fi + if test "$wxUSE_OPENGL" = "yes" ; then + BUILT_WX_LIBS="gl $BUILT_WX_LIBS" + fi + if test "$wxUSE_AUI" = "yes" ; then + BUILT_WX_LIBS="aui $BUILT_WX_LIBS" + fi + if test "$wxUSE_STC" = "yes" ; then + BUILT_WX_LIBS="stc $BUILT_WX_LIBS" + fi + if test "$wxUSE_XRC" = "yes" ; then + STD_GUI_LIBS="xrc $STD_GUI_LIBS" + BUILT_WX_LIBS="xrc $BUILT_WX_LIBS" + fi fi @@ -47948,6 +49251,8 @@ fi + + if test "$wxUSE_MAC" = 1 ; then if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then if test "$USE_DARWIN" = 1; then @@ -47978,9 +49283,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 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" @@ -47996,6 +49301,9 @@ if test "$wxUSE_GUI" = "yes"; then fi else SAMPLES_SUBDIRS="console" + if test "$wxUSE_SOCKETS" = "yes" ; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" + fi fi @@ -48023,7 +49331,7 @@ 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 $CXXWARNINGS $C_AND_CXX_FLAGS $CXXFLAGS ` +CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS ` WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS` @@ -48040,6 +49348,7 @@ EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_ODBC="$ODBC_LINK" +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` fi @@ -48160,6 +49469,8 @@ fi + + @@ -48177,6 +49488,9 @@ case "$TOOLKIT" in TOOLKIT_DESC="GTK+" if test "$WXGTK20" = 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 @@ -48206,23 +49520,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 @@ -49051,71 +50348,17 @@ fi ;; *-*-linux* ) - if test "x$GCC" != "xyes"; then - { echo "$as_me:$LINENO: checking for Intel compiler" >&5 -echo $ECHO_N "checking for Intel compiler... $ECHO_C" >&6; } -if test "${bakefile_cv_prog_icc+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 - This is not ICC - #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_prog_icc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - bakefile_cv_prog_icc=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $bakefile_cv_prog_icc" >&5 -echo "${ECHO_T}$bakefile_cv_prog_icc" >&6; } - if test "$bakefile_cv_prog_icc" = "yes"; then - PIC_FLAG="-KPIC" - fi + if test "$INTELCC" = "yes"; then + PIC_FLAG="-KPIC" + elif test "x$SUNCXX" = "xyes"; then + SHARED_LD_CC="${CC} -G -o" + SHARED_LD_CXX="${CXX} -G -o" + PIC_FLAG="-KPIC" fi ;; *-*-solaris2* ) - if test "x$GCC" != xyes ; then + if test "x$SUNCXX" = xyes ; then SHARED_LD_CC="${CC} -G -o" SHARED_LD_CXX="${CXX} -G -o" PIC_FLAG="-KPIC" @@ -49905,7 +51148,11 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;} case "${BAKEFILE_HOST}" in *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) - SONAME_FLAG="-Wl,-soname," + if test "x$SUNCXX" = "xyes"; then + SONAME_FLAG="-h " + else + SONAME_FLAG="-Wl,-soname," + fi USE_SOVERSION=1 USE_SOVERLINUX=1 USE_SOSYMLINKS=1 @@ -50647,6 +51894,11 @@ EOF COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="" fi + COND_MONOLITHIC_0_SHARED_0_USE_STC_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_STC" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_STC_1="" + fi + COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="" @@ -50697,11 +51949,41 @@ EOF COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="" fi + COND_MONOLITHIC_0_SHARED_1_USE_STC_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_STC" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_STC_1="" + fi + COND_MONOLITHIC_0_SHARED_1_USE_XRC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_XRC_1="" fi + COND_MONOLITHIC_0_USE_AUI_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_AUI" = "x1" ; then + COND_MONOLITHIC_0_USE_AUI_1="" + fi + + COND_MONOLITHIC_0_USE_GUI_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" ; then + COND_MONOLITHIC_0_USE_GUI_1="" + fi + + COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_MEDIA" = "x1" ; then + 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="" + fi + COND_MONOLITHIC_0_USE_MEDIA_1="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then COND_MONOLITHIC_0_USE_MEDIA_1="" @@ -50712,6 +51994,26 @@ EOF COND_MONOLITHIC_0_USE_ODBC_1="" fi + COND_MONOLITHIC_0_USE_QA_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then + COND_MONOLITHIC_0_USE_QA_1="" + fi + + COND_MONOLITHIC_0_USE_RICHTEXT_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then + COND_MONOLITHIC_0_USE_RICHTEXT_1="" + fi + + COND_MONOLITHIC_0_USE_STC_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_STC" = "x1" ; then + COND_MONOLITHIC_0_USE_STC_1="" + fi + + COND_MONOLITHIC_0_USE_XRC_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then + COND_MONOLITHIC_0_USE_XRC_1="" + fi + COND_MONOLITHIC_1="#" if test "x$MONOLITHIC" = "x1" ; then COND_MONOLITHIC_1="" @@ -50902,6 +52204,11 @@ EOF COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" fi + COND_SHARED_0_USE_STC_1="#" + if test "x$SHARED" = "x0" -a "x$USE_STC" = "x1" ; then + 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="" @@ -51142,6 +52449,11 @@ EOF COND_USE_GUI_1="" fi + COND_USE_GUI_1_USE_OPENGL_1="#" + if test "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_USE_GUI_1_USE_OPENGL_1="" + fi + COND_USE_GUI_1_WXUNIV_0="#" if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_USE_GUI_1_WXUNIV_0="" @@ -51222,6 +52534,11 @@ EOF COND_USE_SOVERSOLARIS_1="" fi + COND_USE_STC_1="#" + if test "x$USE_STC" = "x1" ; then + COND_USE_STC_1="" + fi + COND_USE_THREADS_0="#" if test "x$USE_THREADS" = "x0" ; then COND_USE_THREADS_0="" @@ -51307,6 +52624,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_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="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 @@ -51360,6 +52771,28 @@ fi WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS" + +case "${host}" in + *-*-solaris2* ) + if "$GCC" = yes; then + CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'` + LIBS=`echo $LIBS | sed 's/-mt//'` + EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'` + fi + ;; + + *-*-linux* ) + if test "x$SUNCXX" = xyes; then + CPPFLAGS=`echo $CPPFLAGS | sed 's/-pthread//'` + LIBS=`echo $LIBS | sed 's/-pthread//'` + EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-pthread//'` + fi + ;; +esac + +CFLAGS="$CFLAGS $CFLAGS_VISIBILITY" +CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" + SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" @@ -51483,7 +52916,7 @@ ac_config_commands="$ac_config_commands wx-config" if test "$wxWITH_SUBDIRS" != "no"; then if test "$wxUSE_GUI" = "yes"; then - SUBDIRS="samples demos utils contrib" + SUBDIRS="samples demos utils" else SUBDIRS="samples utils" fi @@ -51617,10 +53050,6 @@ echo "${ECHO_T}no" >&6; } -if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then - DISABLED_CONTRIB="$DISABLED_CONTRIB net" -fi - for subdir in `echo $SUBDIRS`; do if test -d ${srcdir}/${subdir} ; then if test "$wxUSE_GUI" = "yes"; then @@ -51638,7 +53067,12 @@ for subdir in `echo $SUBDIRS`; do 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" + 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 @@ -52365,17 +53799,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 -CXXCPP!$CXXCPP$ac_delim subdirs!$subdirs$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim GTK_CFLAGS!$GTK_CFLAGS$ac_delim @@ -52394,11 +53818,21 @@ PANGOFT2_CFLAGS!$PANGOFT2_CFLAGS$ac_delim PANGOFT2_LIBS!$PANGOFT2_LIBS$ac_delim PANGOXFT_CFLAGS!$PANGOXFT_CFLAGS$ac_delim PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim -REZ!$REZ$ac_delim -DEREZ!$DEREZ$ac_delim -SETFILE!$SETFILE$ac_delim +CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim +CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim LIBICONV!$LIBICONV$ac_delim -EXTRALIBS_ESD!$EXTRALIBS_ESD$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 +CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52440,21 +53874,13 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -SDL_CONFIG!$SDL_CONFIG$ac_delim -SDL_CFLAGS!$SDL_CFLAGS$ac_delim -SDL_LIBS!$SDL_LIBS$ac_delim -LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim -LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim -GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim -GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim -HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim -HILDON_LIBS!$HILDON_LIBS$ac_delim -CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim CAIRO_LIBS!$CAIRO_LIBS$ac_delim GST_CFLAGS!$GST_CFLAGS$ac_delim GST_LIBS!$GST_LIBS$ac_delim -CORE_BASE_LIBS!$CORE_BASE_LIBS$ac_delim -CORE_GUI_LIBS!$CORE_GUI_LIBS$ac_delim +ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim +BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim +STD_BASE_LIBS!$STD_BASE_LIBS$ac_delim +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 @@ -52469,6 +53895,7 @@ WX_LIB_FLAVOUR!$WX_LIB_FLAVOUR$ac_delim WXUNIV!$WXUNIV$ac_delim MONOLITHIC!$MONOLITHIC$ac_delim USE_PLUGINS!$USE_PLUGINS$ac_delim +CXXWARNINGS!$CXXWARNINGS$ac_delim EXTRALIBS!$EXTRALIBS$ac_delim EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim @@ -52477,6 +53904,7 @@ EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim EXTRALIBS_SDL!$EXTRALIBS_SDL$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 @@ -52491,12 +53919,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 @@ -52529,14 +53964,13 @@ 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 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 -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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52578,6 +54012,10 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -52599,6 +54037,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_ 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_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 COND_MONOLITHIC_0_SHARED_1!$COND_MONOLITHIC_0_SHARED_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_AUI_1$ac_delim @@ -52609,9 +54048,19 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_ 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_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_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 +COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim COND_MONOLITHIC_1!$COND_MONOLITHIC_1$ac_delim COND_MONOLITHIC_1_SHARED_0!$COND_MONOLITHIC_1_SHARED_0$ac_delim COND_MONOLITHIC_1_SHARED_1!$COND_MONOLITHIC_1_SHARED_1$ac_delim @@ -52650,6 +54099,7 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_de 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 @@ -52659,22 +54109,6 @@ 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_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 -COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim -COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim -COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim -COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim -COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim -COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim -COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim -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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52716,6 +54150,22 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 +COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim +COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim +COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim +COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim +COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim +COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim +COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim +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 @@ -52739,6 +54189,7 @@ COND_USE_EXCEPTIONS_0!$COND_USE_EXCEPTIONS_0$ac_delim COND_USE_EXCEPTIONS_1!$COND_USE_EXCEPTIONS_1$ac_delim COND_USE_GUI_0!$COND_USE_GUI_0$ac_delim COND_USE_GUI_1!$COND_USE_GUI_1$ac_delim +COND_USE_GUI_1_USE_OPENGL_1!$COND_USE_GUI_1_USE_OPENGL_1$ac_delim COND_USE_GUI_1_WXUNIV_0!$COND_USE_GUI_1_WXUNIV_0$ac_delim 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 @@ -52755,6 +54206,7 @@ COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$a COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim +COND_USE_STC_1!$COND_USE_STC_1$ac_delim COND_USE_THREADS_0!$COND_USE_THREADS_0$ac_delim COND_USE_THREADS_1!$COND_USE_THREADS_1$ac_delim COND_USE_XRC_1!$COND_USE_XRC_1$ac_delim @@ -52769,6 +54221,7 @@ 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 +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 @@ -52794,6 +54247,47 @@ 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 +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF GUIDIST!$GUIDIST$ac_delim DISTDIR!$DISTDIR$ac_delim SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim @@ -52810,12 +54304,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` = 97; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -52833,8 +54328,8 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g @@ -52847,6 +54342,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g CEOF$ac_eof _ACEOF @@ -53094,7 +54591,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed 's/|#_!!_#|//g' >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && @@ -53446,13 +54943,23 @@ 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 " Should wxWidgets be compiled in Unicode mode? ${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)" + else + echo " (using wchar_t)" + fi +else + echo +fi echo " What level of wxWidgets compatibility should be enabled?" echo " wxWidgets 2.6 ${WXWIN_COMPATIBILITY_2_6:-no}" 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}"